history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-17 00:45:47 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

dep/libchdr: Update to a03e693

Browse Source
This commit is contained in:
Connor McLaughlin
2022-04-03 20:27:06 +10:00
parent ef6e18a1b2
commit 6b8486674f
12 changed files with 12610 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
dep/libchdr/src/libchdr_chd.c
View File

@ -50,6 +50,9 @@
#include "LzmaEnc.h"
#include "LzmaDec.h"
#if defined(__PS3__) || defined(__PSL1GHT__)
#define __MACTYPES__
#endif
#include "zlib.h"
#undef TRUE
@ -430,7 +433,7 @@ static void *lzma_fast_alloc(void *p, size_t size)
addr = (uint32_t *)malloc(size + sizeof(uint32_t) + LZMA_MIN_ALIGNMENT_BYTES);
if (addr==NULL)
return NULL;
for (int scan = 0; scan < MAX_LZMA_ALLOCS; scan++)
for (scan = 0; scan < MAX_LZMA_ALLOCS; scan++)
{
if (codec->allocptr[scan] == NULL)
{
@ -794,8 +797,7 @@ static chd_error cdfl_codec_init(void *codec, uint32_t hunkbytes)
#endif
/* flac decoder init */
flac_decoder_init(&cdfl->decoder);
if (cdfl->decoder.decoder == NULL)
if (flac_decoder_init(&cdfl->decoder))
return CHDERR_OUT_OF_MEMORY;
return CHDERR_NONE;
@ -1161,7 +1163,7 @@ static inline int chd_compressed(chd_header* header) {
static chd_error decompress_v5_map(chd_file* chd, chd_header* header)
{
int result = 0;
int hunknum;
uint32_t hunknum;
int repcount = 0;
uint8_t lastcomp = 0;
uint32_t last_self = 0;
@ -1383,8 +1385,15 @@ CHD_EXPORT chd_error chd_open_file(core_file *file, int mode, chd_file *parent,
EARLY_EXIT(err = CHDERR_UNSUPPORTED_VERSION);
/* if we need a parent, make sure we have one */
if (parent == NULL && (newchd->header.flags & CHDFLAGS_HAS_PARENT))
EARLY_EXIT(err = CHDERR_REQUIRES_PARENT);
if (parent == NULL)
{
/* Detect parent requirement for versions below 5 */
if (newchd->header.version < 5 && newchd->header.flags & CHDFLAGS_HAS_PARENT)
EARLY_EXIT(err = CHDERR_REQUIRES_PARENT);
/* Detection for version 5 and above - if parentsha1 != 0, we have a parent */
else if (newchd->header.version >= 5 && memcmp(nullsha1, newchd->header.parentsha1, sizeof(newchd->header.parentsha1)) != 0)
EARLY_EXIT(err = CHDERR_REQUIRES_PARENT);
}
/* make sure we have a valid parent */
if (parent != NULL)
@ -1561,6 +1570,12 @@ CHD_EXPORT chd_error chd_open(const char *filename, int mode, chd_file *parent,
chd_error err;
core_file *file = NULL;
if (filename == NULL)
{
err = CHDERR_INVALID_PARAMETER;
goto cleanup;
}
/* choose the proper mode */
switch(mode)
{
@ -1677,6 +1692,9 @@ CHD_EXPORT void chd_close(chd_file *chd)
if (chd->file_cache)
free(chd->file_cache);
if (chd->parent)
chd_close(chd->parent);
/* free our memory */
free(chd);
}
@ -1750,6 +1768,41 @@ CHD_EXPORT const chd_header *chd_get_header(chd_file *chd)
return &chd->header;
}
/*-------------------------------------------------
chd_read_header - read CHD header data
from file into the pointed struct
-------------------------------------------------*/
CHD_EXPORT chd_error chd_read_header(const char *filename, chd_header *header)
{
chd_error err = CHDERR_NONE;
chd_file chd;
/* punt if NULL */
if (filename == NULL || header == NULL)
EARLY_EXIT(err = CHDERR_INVALID_PARAMETER);
/* open the file */
chd.file = core_fopen(filename);
if (chd.file == NULL)
EARLY_EXIT(err = CHDERR_FILE_NOT_FOUND);
/* attempt to read the header */
err = header_read(&chd, header);
if (err != CHDERR_NONE)
EARLY_EXIT(err);
/* validate the header */
err = header_validate(header);
if (err != CHDERR_NONE)
EARLY_EXIT(err);
cleanup:
if (chd.file != NULL)
core_fclose(chd.file);
return err;
}
/***************************************************************************
CORE DATA READ/WRITE
***************************************************************************/
@ -2124,9 +2177,9 @@ static UINT8* hunk_read_compressed(chd_file *chd, UINT64 offset, size_t size)
static chd_error hunk_read_uncompressed(chd_file *chd, UINT64 offset, size_t size, UINT8 *dest)
{
#ifdef _MSC_VER
size_t bytes;
size_t bytes;
#else
ssize_t bytes;
ssize_t bytes;
#endif
if (chd->file_cache != NULL)
{
@ -2344,13 +2397,33 @@ static chd_error hunk_read_into_memory(chd_file *chd, UINT32 hunknum, UINT8 *des
return hunk_read_into_memory(chd, blockoffs, dest);
case COMPRESSION_PARENT:
#if 0
/* TODO */
if (m_parent_missing)
if (chd->parent == NULL)
return CHDERR_REQUIRES_PARENT;
return m_parent->read_bytes(uint64_t(blockoffs) * uint64_t(m_parent->unit_bytes()), dest, m_hunkbytes);
#endif
return CHDERR_DECOMPRESSION_ERROR;
UINT8 units_in_hunk = chd->header.hunkbytes / chd->header.unitbytes;
/* blockoffs is aligned to units_in_hunk */
if (blockoffs % units_in_hunk == 0) {
return hunk_read_into_memory(chd->parent, blockoffs / units_in_hunk, dest);
/* blockoffs is not aligned to units_in_hunk */
} else {
UINT32 unit_in_hunk = blockoffs % units_in_hunk;
UINT8 *buf = malloc(chd->header.hunkbytes);
/* Read first half of hunk which contains blockoffs */
err = hunk_read_into_memory(chd->parent, blockoffs / units_in_hunk, buf);
if (err != CHDERR_NONE) {
free(buf);
return err;
}
memcpy(dest, buf + unit_in_hunk * chd->header.unitbytes, (units_in_hunk - unit_in_hunk) * chd->header.unitbytes);
/* Read second half of hunk which contains blockoffs */
err = hunk_read_into_memory(chd->parent, (blockoffs / units_in_hunk) + 1, buf);
if (err != CHDERR_NONE) {
free(buf);
return err;
}
memcpy(dest + (units_in_hunk - unit_in_hunk) * chd->header.unitbytes, buf, unit_in_hunk * chd->header.unitbytes);
free(buf);
}
}
return CHDERR_NONE;
}
@ -2375,7 +2448,7 @@ static chd_error map_read(chd_file *chd)
UINT8 cookie[MAP_ENTRY_SIZE];
UINT32 count;
chd_error err;
int i;
UINT32 i;
/* first allocate memory */
chd->map = (map_entry *)malloc(sizeof(chd->map[0]) * chd->header.totalhunks);
@ -2545,8 +2618,6 @@ static void zlib_codec_free(void *codec)
/* deinit the streams */
if (data != NULL)
{
int i;
inflateEnd(&data->inflater);
/* free our fast memory */