libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 23:31:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: PKWARE data comp. lib. mask dictionary xs

Browse Source 
added masking of dictionary offsets when copying from dictionary
issues should now all be fixed
This commit is contained in:
Martin Kiewitz 2015-07-04 03:10:26 +02:00
parent 4fb32647ad
commit 614162e5fc
1 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
common/dcl.cpp
View File

@ -338,6 +338,7 @@ bool DecompressorDCL::unpack(SeekableReadStream *sourceStream, WriteStream *targ
byte dictionary[MIDI_SETUP_BUNDLE_FILE_MAXIMUM_DICTIONARY_SIZE]; byte dictionary[MIDI_SETUP_BUNDLE_FILE_MAXIMUM_DICTIONARY_SIZE];
uint16 dictionaryPos = 0; uint16 dictionaryPos = 0;
uint16 dictionarySize = 0; uint16 dictionarySize = 0;
uint16 dictionaryMask = 0;
int value; int value;
uint16 tokenOffset = 0; uint16 tokenOffset = 0;
uint16 tokenLength = 0; uint16 tokenLength = 0;
@ -369,6 +370,7 @@ bool DecompressorDCL::unpack(SeekableReadStream *sourceStream, WriteStream *targ
warning("DCL-INFLATE: Error: unsupported dictionary type %02x", dictionaryType); warning("DCL-INFLATE: Error: unsupported dictionary type %02x", dictionaryType);
return false; return false;
} }
dictionaryMask = dictionarySize - 1;
while ((!targetFixedSize) || (_bytesWritten < _targetSize)) { while ((!targetFixedSize) || (_bytesWritten < _targetSize)) {
if (getBitsLSB(1)) { // (length,distance) pair if (getBitsLSB(1)) { // (length,distance) pair
@ -408,47 +410,29 @@ bool DecompressorDCL::unpack(SeekableReadStream *sourceStream, WriteStream *targ
return false; return false;
} }
if (!targetPtr) { uint16 dictionaryBaseIndex = (dictionaryPos - tokenOffset) & dictionaryMask;
// FIXME: there is some issue in this code that causes some graphics glitches in SCI uint16 dictionaryIndex = dictionaryBaseIndex;
// will figure this out tomorrow. For now the old code is called for those cases and uint16 dictionaryNextIndex = dictionaryPos;
// that makes it work.
uint16 dictionaryBaseIndex = (dictionaryPos - tokenOffset) & (dictionarySize - 1);
uint16 dictionaryIndex = dictionaryBaseIndex;
uint16 dictionaryNextIndex = dictionaryPos;
while (tokenLength) { while (tokenLength) {
// Write byte from dictionary // Write byte from dictionary
putByte(dictionary[dictionaryIndex]); putByte(dictionary[dictionaryIndex]);
debug(9, "\33[32;31m%02x\33[37;37m ", dictionary[dictionaryIndex]); debug(9, "\33[32;31m%02x\33[37;37m ", dictionary[dictionaryIndex]);
dictionary[dictionaryNextIndex] = dictionary[dictionaryIndex]; dictionary[dictionaryNextIndex] = dictionary[dictionaryIndex];
dictionaryNextIndex++; dictionaryIndex++;
if (dictionaryIndex == dictionaryPos) dictionaryNextIndex = (dictionaryNextIndex + 1) & dictionaryMask;
dictionaryIndex = dictionaryBaseIndex; dictionaryIndex = (dictionaryIndex + 1) & dictionaryMask;
if (dictionaryNextIndex == dictionarySize)
dictionaryNextIndex = 0;
tokenLength--; if (dictionaryIndex == dictionaryPos)
} dictionaryIndex = dictionaryBaseIndex;
dictionaryPos = dictionaryNextIndex; if (dictionaryNextIndex == dictionarySize)
debug(9, "\n"); dictionaryNextIndex = 0;
} else {
while (tokenLength) {
uint32 copy_length = (tokenLength > tokenOffset) ? tokenOffset : tokenLength;
assert(tokenLength >= copy_length);
uint32 pos = _bytesWritten - tokenOffset;
for (uint32 i = 0; i < copy_length; i++)
putByte(targetPtr[pos + i]);
for (uint32 i = 0; i < copy_length; i++) tokenLength--;
debug(9, "\33[32;31m%02x\33[37;37m ", targetPtr[pos + i]);
debug(9, "\n");
tokenLength -= copy_length;
tokenOffset += copy_length;
}
} }
dictionaryPos = dictionaryNextIndex;
debug(9, "\n");
} else { // Copy byte verbatim } else { // Copy byte verbatim
value = (mode == DCL_ASCII_MODE) ? huffman_lookup(ascii_tree) : getByteLSB(); value = (mode == DCL_ASCII_MODE) ? huffman_lookup(ascii_tree) : getByteLSB();