mirror of
https://github.com/diasurgical/DevilutionX.git
synced 2026-10-12 02:13:06 +00:00
Merge branch 'master' of github.com:diasurgical/devilution
This commit is contained in:
+29
-29
@@ -75,6 +75,35 @@ void InitHash()
|
||||
}
|
||||
}
|
||||
|
||||
static unsigned int PkwareBufferRead(char *buf, unsigned int *size, void *param)
|
||||
{
|
||||
TDataInfo *pInfo;
|
||||
DWORD sSize;
|
||||
|
||||
pInfo = (TDataInfo *)param;
|
||||
|
||||
if (*size >= pInfo->size - pInfo->srcOffset) {
|
||||
sSize = pInfo->size - pInfo->srcOffset;
|
||||
} else {
|
||||
sSize = *size;
|
||||
}
|
||||
|
||||
memcpy(buf, pInfo->srcData + pInfo->srcOffset, sSize);
|
||||
pInfo->srcOffset += sSize;
|
||||
|
||||
return sSize;
|
||||
}
|
||||
|
||||
static void PkwareBufferWrite(char *buf, unsigned int *size, void *param)
|
||||
{
|
||||
TDataInfo *pInfo;
|
||||
|
||||
pInfo = (TDataInfo *)param;
|
||||
|
||||
memcpy(pInfo->destData + pInfo->destOffset, buf, *size);
|
||||
pInfo->destOffset += *size;
|
||||
}
|
||||
|
||||
int PkwareCompress(BYTE *srcData, int size)
|
||||
{
|
||||
BYTE *destData;
|
||||
@@ -111,35 +140,6 @@ int PkwareCompress(BYTE *srcData, int size)
|
||||
return size;
|
||||
}
|
||||
|
||||
unsigned int PkwareBufferRead(char *buf, unsigned int *size, void *param)
|
||||
{
|
||||
TDataInfo *pInfo;
|
||||
DWORD sSize;
|
||||
|
||||
pInfo = (TDataInfo *)param;
|
||||
|
||||
if (*size >= pInfo->size - pInfo->srcOffset) {
|
||||
sSize = pInfo->size - pInfo->srcOffset;
|
||||
} else {
|
||||
sSize = *size;
|
||||
}
|
||||
|
||||
memcpy(buf, pInfo->srcData + pInfo->srcOffset, sSize);
|
||||
pInfo->srcOffset += sSize;
|
||||
|
||||
return sSize;
|
||||
}
|
||||
|
||||
void PkwareBufferWrite(char *buf, unsigned int *size, void *param)
|
||||
{
|
||||
TDataInfo *pInfo;
|
||||
|
||||
pInfo = (TDataInfo *)param;
|
||||
|
||||
memcpy(pInfo->destData + pInfo->destOffset, buf, *size);
|
||||
pInfo->destOffset += *size;
|
||||
}
|
||||
|
||||
void PkwareDecompress(BYTE *pbInBuff, int recv_size, int dwMaxBytes)
|
||||
{
|
||||
char *ptr;
|
||||
|
||||
Reference in New Issue
Block a user