mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-13 16:11:34 -06:00
4.20
This commit is contained in:
Igor Pavlov
committed by
Kornel Lesiński
Kornel Lesiński
parent
8c1b5c7b7e
commit
3c510ba80b
@@ -4,122 +4,402 @@
|
||||
|
||||
#include "BZip2Decoder.h"
|
||||
|
||||
#include "Windows/Defs.h"
|
||||
#include "Original/bzlib.h"
|
||||
#include "../../../Common/Alloc.h"
|
||||
#include "../../../Common/Defs.h"
|
||||
#include "../BWT/Mtf8.h"
|
||||
#include "BZip2CRC.h"
|
||||
|
||||
namespace NCompress {
|
||||
namespace NBZip2 {
|
||||
|
||||
static const UINT32 kBufferSize = (1 << 20);
|
||||
static const UInt32 kBufferSize = (1 << 17);
|
||||
|
||||
CDecoder::CDecoder()
|
||||
{
|
||||
m_InBuffer = new BYTE[kBufferSize];
|
||||
m_OutBuffer = new BYTE[kBufferSize];
|
||||
}
|
||||
|
||||
CDecoder::~CDecoder()
|
||||
{
|
||||
delete []m_OutBuffer;
|
||||
delete []m_InBuffer;
|
||||
}
|
||||
|
||||
struct CBZip2Decompressor: public bz_stream
|
||||
{
|
||||
// bz_stream m_Object;
|
||||
public:
|
||||
int Init(int verbosity, int small) { return BZ2_bzDecompressInit(this, verbosity, small); }
|
||||
int Decompress() { return BZ2_bzDecompress(this); }
|
||||
int End() { return BZ2_bzDecompressEnd(this); }
|
||||
UINT64 GetTotalIn() const { return (UINT64(total_in_hi32) << 32) + total_in_lo32; }
|
||||
UINT64 GetTotalOut() const { return (UINT64(total_out_hi32) << 32) + total_out_lo32; }
|
||||
static Int16 kRandNums[512] = {
|
||||
619, 720, 127, 481, 931, 816, 813, 233, 566, 247,
|
||||
985, 724, 205, 454, 863, 491, 741, 242, 949, 214,
|
||||
733, 859, 335, 708, 621, 574, 73, 654, 730, 472,
|
||||
419, 436, 278, 496, 867, 210, 399, 680, 480, 51,
|
||||
878, 465, 811, 169, 869, 675, 611, 697, 867, 561,
|
||||
862, 687, 507, 283, 482, 129, 807, 591, 733, 623,
|
||||
150, 238, 59, 379, 684, 877, 625, 169, 643, 105,
|
||||
170, 607, 520, 932, 727, 476, 693, 425, 174, 647,
|
||||
73, 122, 335, 530, 442, 853, 695, 249, 445, 515,
|
||||
909, 545, 703, 919, 874, 474, 882, 500, 594, 612,
|
||||
641, 801, 220, 162, 819, 984, 589, 513, 495, 799,
|
||||
161, 604, 958, 533, 221, 400, 386, 867, 600, 782,
|
||||
382, 596, 414, 171, 516, 375, 682, 485, 911, 276,
|
||||
98, 553, 163, 354, 666, 933, 424, 341, 533, 870,
|
||||
227, 730, 475, 186, 263, 647, 537, 686, 600, 224,
|
||||
469, 68, 770, 919, 190, 373, 294, 822, 808, 206,
|
||||
184, 943, 795, 384, 383, 461, 404, 758, 839, 887,
|
||||
715, 67, 618, 276, 204, 918, 873, 777, 604, 560,
|
||||
951, 160, 578, 722, 79, 804, 96, 409, 713, 940,
|
||||
652, 934, 970, 447, 318, 353, 859, 672, 112, 785,
|
||||
645, 863, 803, 350, 139, 93, 354, 99, 820, 908,
|
||||
609, 772, 154, 274, 580, 184, 79, 626, 630, 742,
|
||||
653, 282, 762, 623, 680, 81, 927, 626, 789, 125,
|
||||
411, 521, 938, 300, 821, 78, 343, 175, 128, 250,
|
||||
170, 774, 972, 275, 999, 639, 495, 78, 352, 126,
|
||||
857, 956, 358, 619, 580, 124, 737, 594, 701, 612,
|
||||
669, 112, 134, 694, 363, 992, 809, 743, 168, 974,
|
||||
944, 375, 748, 52, 600, 747, 642, 182, 862, 81,
|
||||
344, 805, 988, 739, 511, 655, 814, 334, 249, 515,
|
||||
897, 955, 664, 981, 649, 113, 974, 459, 893, 228,
|
||||
433, 837, 553, 268, 926, 240, 102, 654, 459, 51,
|
||||
686, 754, 806, 760, 493, 403, 415, 394, 687, 700,
|
||||
946, 670, 656, 610, 738, 392, 760, 799, 887, 653,
|
||||
978, 321, 576, 617, 626, 502, 894, 679, 243, 440,
|
||||
680, 879, 194, 572, 640, 724, 926, 56, 204, 700,
|
||||
707, 151, 457, 449, 797, 195, 791, 558, 945, 679,
|
||||
297, 59, 87, 824, 713, 663, 412, 693, 342, 606,
|
||||
134, 108, 571, 364, 631, 212, 174, 643, 304, 329,
|
||||
343, 97, 430, 751, 497, 314, 983, 374, 822, 928,
|
||||
140, 206, 73, 263, 980, 736, 876, 478, 430, 305,
|
||||
170, 514, 364, 692, 829, 82, 855, 953, 676, 246,
|
||||
369, 970, 294, 750, 807, 827, 150, 790, 288, 923,
|
||||
804, 378, 215, 828, 592, 281, 565, 555, 710, 82,
|
||||
896, 831, 547, 261, 524, 462, 293, 465, 502, 56,
|
||||
661, 821, 976, 991, 658, 869, 905, 758, 745, 193,
|
||||
768, 550, 608, 933, 378, 286, 215, 979, 792, 961,
|
||||
61, 688, 793, 644, 986, 403, 106, 366, 905, 644,
|
||||
372, 567, 466, 434, 645, 210, 389, 550, 919, 135,
|
||||
780, 773, 635, 389, 707, 100, 626, 958, 165, 504,
|
||||
920, 176, 193, 713, 857, 265, 203, 50, 668, 108,
|
||||
645, 990, 626, 197, 510, 357, 358, 850, 858, 364,
|
||||
936, 638
|
||||
};
|
||||
|
||||
class CBZip2DecompressorReleaser
|
||||
CState::~CState()
|
||||
{
|
||||
CBZip2Decompressor *m_Decompressor;
|
||||
public:
|
||||
CBZip2DecompressorReleaser(CBZip2Decompressor *aDecompressor): m_Decompressor(aDecompressor) {}
|
||||
void Diable() { m_Decompressor = NULL; }
|
||||
~CBZip2DecompressorReleaser() { if (m_Decompressor != NULL) m_Decompressor->End(); }
|
||||
};
|
||||
::BigFree(tt);
|
||||
}
|
||||
|
||||
STDMETHODIMP CDecoder::CodeReal(ISequentialInStream *inStream,
|
||||
ISequentialOutStream *outStream, const UINT64 *inSize, const UINT64 *outSize,
|
||||
ICompressProgressInfo *progress)
|
||||
bool CState::Alloc()
|
||||
{
|
||||
CBZip2Decompressor bzStream;
|
||||
bzStream.bzalloc = NULL;
|
||||
bzStream.bzfree = NULL;
|
||||
bzStream.opaque = NULL;
|
||||
if (tt == 0)
|
||||
tt = (UInt32 *)BigAlloc(kBlockSizeMax * sizeof(UInt32));
|
||||
return (tt != 0);
|
||||
}
|
||||
|
||||
UInt32 CDecoder::ReadBits(int numBits) { return m_InStream.ReadBits(numBits); }
|
||||
Byte CDecoder::ReadByte() {return (Byte)ReadBits(8); }
|
||||
bool CDecoder::ReadBit() { return ReadBits(1) != 0; }
|
||||
|
||||
int result = bzStream.Init(0, 0);
|
||||
switch(result)
|
||||
UInt32 CDecoder::ReadCRC()
|
||||
{
|
||||
UInt32 crc = 0;
|
||||
for (int i = 0; i < 4; i++)
|
||||
{
|
||||
case BZ_OK:
|
||||
break;
|
||||
case BZ_MEM_ERROR:
|
||||
return E_OUTOFMEMORY;
|
||||
default:
|
||||
return E_FAIL;
|
||||
crc <<= 8;
|
||||
crc |= ReadByte();
|
||||
}
|
||||
CBZip2DecompressorReleaser releaser(&bzStream);
|
||||
bzStream.avail_in = 0;
|
||||
while (true)
|
||||
return crc;
|
||||
}
|
||||
|
||||
HRESULT CDecoder::ReadBlock(UInt32 blockSizeMax, CState &state)
|
||||
{
|
||||
state.BlockRandomised = ReadBit();
|
||||
state.OrigPtr = ReadBits(kNumOrigBits);
|
||||
|
||||
// in original code it compares OrigPtr to (UInt32)(10 + blockSizeMax)) : why ?
|
||||
if (state.OrigPtr >= blockSizeMax)
|
||||
return S_FALSE;
|
||||
|
||||
CMtf8Decoder mtf;
|
||||
int numInUse = 0;
|
||||
{
|
||||
if (bzStream.avail_in == 0)
|
||||
{
|
||||
bzStream.next_in = (char *)m_InBuffer;
|
||||
UINT32 processedSize;
|
||||
RINOK(inStream->Read(m_InBuffer, kBufferSize, &processedSize));
|
||||
bzStream.avail_in = processedSize;
|
||||
}
|
||||
bool inUse16[16];
|
||||
int i;
|
||||
for (i = 0; i < 16; i++)
|
||||
inUse16[i] = ReadBit();
|
||||
for (i = 0; i < 256; i++)
|
||||
if (inUse16[i >> 4])
|
||||
if (ReadBit())
|
||||
mtf.Buffer[numInUse++] = (Byte)i;
|
||||
if (numInUse == 0)
|
||||
return S_FALSE;
|
||||
mtf.Init(numInUse);
|
||||
}
|
||||
int alphaSize = numInUse + 2;
|
||||
|
||||
bzStream.next_out = (char *)m_OutBuffer;
|
||||
bzStream.avail_out = kBufferSize;
|
||||
result = bzStream.Decompress();
|
||||
UINT32 numBytesToWrite = kBufferSize - bzStream.avail_out;
|
||||
if (numBytesToWrite > 0)
|
||||
{
|
||||
UINT32 processedSize;
|
||||
RINOK(outStream->Write(m_OutBuffer, numBytesToWrite, &processedSize));
|
||||
if (numBytesToWrite != processedSize)
|
||||
return E_FAIL;
|
||||
}
|
||||
int numTables = ReadBits(kNumTablesBits);
|
||||
if (numTables < kNumTablesMin || numTables > kNumTablesMax)
|
||||
return S_FALSE;
|
||||
|
||||
UInt32 numSelectors = ReadBits(kNumSelectorsBits);
|
||||
if (numSelectors < 1 || numSelectors > kNumSelectorsMax)
|
||||
return S_FALSE;
|
||||
|
||||
if (result == BZ_STREAM_END)
|
||||
break;
|
||||
switch(result)
|
||||
{
|
||||
Byte mtfPos[kNumTablesMax];
|
||||
int t = 0;
|
||||
do
|
||||
mtfPos[t] = (Byte)t;
|
||||
while(++t < numTables);
|
||||
UInt32 i = 0;
|
||||
do
|
||||
{
|
||||
case BZ_DATA_ERROR:
|
||||
case BZ_DATA_ERROR_MAGIC:
|
||||
return S_FALSE;
|
||||
case BZ_OK:
|
||||
int j = 0;
|
||||
while (ReadBit())
|
||||
if (++j >= numTables)
|
||||
return S_FALSE;
|
||||
Byte tmp = mtfPos[j];
|
||||
for (;j > 0; j--)
|
||||
mtfPos[j] = mtfPos[j - 1];
|
||||
state.m_Selectors[i] = mtfPos[0] = tmp;
|
||||
}
|
||||
while(++i < numSelectors);
|
||||
}
|
||||
|
||||
int t = 0;
|
||||
do
|
||||
{
|
||||
Byte lens[kMaxAlphaSize];
|
||||
int len = (int)ReadBits(kNumLevelsBits);
|
||||
int i;
|
||||
for (i = 0; i < alphaSize; i++)
|
||||
{
|
||||
while (true)
|
||||
{
|
||||
if (len < 1 || len > kMaxHuffmanLen)
|
||||
return S_FALSE;
|
||||
if (!ReadBit())
|
||||
break;
|
||||
if (ReadBit())
|
||||
len--;
|
||||
else
|
||||
len++;
|
||||
}
|
||||
lens[i] = (Byte)len;
|
||||
}
|
||||
for (; i < kMaxAlphaSize; i++)
|
||||
lens[i] = 0;
|
||||
m_HuffmanDecoders[t].SetCodeLengths(lens);
|
||||
}
|
||||
while(++t < numTables);
|
||||
|
||||
{
|
||||
for (int i = 0; i < 256; i++)
|
||||
state.CharCounters[i] = 0;
|
||||
}
|
||||
|
||||
UInt32 blockSize = 0;
|
||||
{
|
||||
UInt32 groupIndex = 0;
|
||||
UInt32 groupSize = 0;
|
||||
CHuffmanDecoder *huffmanDecoder = 0;
|
||||
int runPower = 0;
|
||||
UInt32 runCounter = 0;
|
||||
|
||||
while (true)
|
||||
{
|
||||
if (groupSize == 0)
|
||||
{
|
||||
if (groupIndex >= numSelectors)
|
||||
return S_FALSE;
|
||||
groupSize = kGroupSize;
|
||||
huffmanDecoder = &m_HuffmanDecoders[state.m_Selectors[groupIndex++]];
|
||||
}
|
||||
groupSize--; \
|
||||
|
||||
int nextSym = (int)huffmanDecoder->DecodeSymbol(&m_InStream);
|
||||
|
||||
if (nextSym < 2)
|
||||
{
|
||||
runCounter += ((UInt32)(nextSym + 1) << runPower++);
|
||||
if (blockSizeMax - blockSize < runCounter)
|
||||
return S_FALSE;
|
||||
continue;
|
||||
}
|
||||
if (runCounter != 0)
|
||||
{
|
||||
Byte b = mtf.GetHead();
|
||||
state.CharCounters[b] += runCounter;
|
||||
do
|
||||
state.tt[blockSize++] = (UInt32)b;
|
||||
while(--runCounter != 0);
|
||||
runPower = 0;
|
||||
}
|
||||
if (nextSym > numInUse)
|
||||
break;
|
||||
case BZ_MEM_ERROR:
|
||||
return E_OUTOFMEMORY;
|
||||
default:
|
||||
return E_FAIL;
|
||||
}
|
||||
if (progress != NULL)
|
||||
{
|
||||
UINT64 totalIn = bzStream.GetTotalIn();
|
||||
UINT64 totalOut = bzStream.GetTotalOut();
|
||||
RINOK(progress->SetRatioInfo(&totalIn, &totalOut));
|
||||
Byte b = mtf.GetAndMove(nextSym - 1);
|
||||
if (blockSize >= blockSizeMax)
|
||||
return S_FALSE;
|
||||
state.CharCounters[b]++;
|
||||
state.tt[blockSize++] = (UInt32)b;
|
||||
}
|
||||
}
|
||||
// result = bzStream.End();
|
||||
|
||||
if (state.OrigPtr >= blockSize)
|
||||
return S_FALSE;
|
||||
state.BlockSize = blockSize;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
HRESULT CState::DecodeBlock(COutBuffer &m_OutStream)
|
||||
{
|
||||
UInt32 *charCounters = this->CharCounters;
|
||||
{
|
||||
UInt32 sum = 0;
|
||||
for (UInt32 i = 0; i < 256; i++)
|
||||
{
|
||||
sum += charCounters[i];
|
||||
charCounters[i] = sum - charCounters[i];
|
||||
}
|
||||
}
|
||||
|
||||
// Compute the T^(-1) vector
|
||||
UInt32 blockSize = this->BlockSize;
|
||||
UInt32 i = 0;
|
||||
do
|
||||
tt[charCounters[tt[i] & 0xFF]++] |= (i << 8);
|
||||
while(++i < blockSize);
|
||||
|
||||
// Decode
|
||||
|
||||
CBZip2CRC crc;
|
||||
|
||||
UInt32 randIndex = 1;
|
||||
UInt32 randToGo = kRandNums[0] - 2;
|
||||
|
||||
int numReps = 0;
|
||||
|
||||
// it's for speed optimization: prefetch & prevByte_init;
|
||||
UInt32 tPos = tt[tt[OrigPtr] >> 8];
|
||||
Byte prevByte = (Byte)(tPos & 0xFF);
|
||||
|
||||
do
|
||||
{
|
||||
Byte b = (Byte)(tPos & 0xFF);
|
||||
tPos = tt[tPos >> 8];
|
||||
|
||||
if (BlockRandomised)
|
||||
{
|
||||
if (randToGo == 0)
|
||||
{
|
||||
b ^= 1;
|
||||
randToGo = kRandNums[randIndex++];
|
||||
randIndex &= 0x1FF;
|
||||
}
|
||||
randToGo--;
|
||||
}
|
||||
|
||||
if (numReps == kRleModeRepSize)
|
||||
{
|
||||
for (; b > 0; b--)
|
||||
{
|
||||
crc.UpdateByte(prevByte);
|
||||
m_OutStream.WriteByte(prevByte);
|
||||
}
|
||||
numReps = 0;
|
||||
continue;
|
||||
}
|
||||
if (prevByte == b)
|
||||
numReps++;
|
||||
else
|
||||
{
|
||||
numReps = 1;
|
||||
prevByte = b;
|
||||
}
|
||||
crc.UpdateByte(b);
|
||||
m_OutStream.WriteByte(b);
|
||||
}
|
||||
while(--blockSize != 0);
|
||||
return (StoredCRC == crc.GetDigest()) ? S_OK : S_FALSE;
|
||||
}
|
||||
|
||||
HRESULT CDecoder::DecodeFile(bool &isBZ, ICompressProgressInfo *progress)
|
||||
{
|
||||
isBZ = false;
|
||||
Byte s[6];
|
||||
int i;
|
||||
for (i = 0; i < 4; i++)
|
||||
s[i] = ReadByte();
|
||||
if (s[0] != kArSig0 ||
|
||||
s[1] != kArSig1 ||
|
||||
s[2] != kArSig2 ||
|
||||
s[3] <= kArSig3 ||
|
||||
s[3] > kArSig3 + kBlockSizeMultMax)
|
||||
return S_OK;
|
||||
isBZ = true;
|
||||
UInt32 dicSize = (UInt32)(s[3] - kArSig3) * kBlockSizeStep;
|
||||
|
||||
if (!m_State.Alloc())
|
||||
return E_OUTOFMEMORY;
|
||||
|
||||
CBZip2CombinedCRC computedCombinedCRC;
|
||||
while (true)
|
||||
{
|
||||
if (progress)
|
||||
{
|
||||
UInt64 packSize = m_InStream.GetProcessedSize();
|
||||
UInt64 unpackSize = m_OutStream.GetProcessedSize();
|
||||
RINOK(progress->SetRatioInfo(&packSize, &unpackSize));
|
||||
}
|
||||
|
||||
for (i = 0; i < 6; i++)
|
||||
s[i] = ReadByte();
|
||||
UInt32 crc = ReadCRC();
|
||||
if (s[0] == kFinSig0)
|
||||
{
|
||||
if (s[1] != kFinSig1 ||
|
||||
s[2] != kFinSig2 ||
|
||||
s[3] != kFinSig3 ||
|
||||
s[4] != kFinSig4 ||
|
||||
s[5] != kFinSig5)
|
||||
return S_FALSE;
|
||||
|
||||
return (crc == computedCombinedCRC.GetDigest()) ? S_OK : S_FALSE;
|
||||
}
|
||||
if (s[0] != kBlockSig0 ||
|
||||
s[1] != kBlockSig1 ||
|
||||
s[2] != kBlockSig2 ||
|
||||
s[3] != kBlockSig3 ||
|
||||
s[4] != kBlockSig4 ||
|
||||
s[5] != kBlockSig5)
|
||||
return S_FALSE;
|
||||
m_State.StoredCRC = crc;
|
||||
computedCombinedCRC.Update(crc);
|
||||
RINOK(ReadBlock(dicSize, m_State));
|
||||
RINOK(m_State.DecodeBlock(m_OutStream));
|
||||
}
|
||||
}
|
||||
|
||||
HRESULT CDecoder::CodeReal(ISequentialInStream *inStream,
|
||||
ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize,
|
||||
ICompressProgressInfo *progress)
|
||||
{
|
||||
if (!m_InStream.Create(kBufferSize))
|
||||
return E_OUTOFMEMORY;
|
||||
if (!m_OutStream.Create(kBufferSize))
|
||||
return E_OUTOFMEMORY;
|
||||
|
||||
m_InStream.SetStream(inStream);
|
||||
m_InStream.Init();
|
||||
|
||||
m_OutStream.SetStream(outStream);
|
||||
m_OutStream.Init();
|
||||
|
||||
CDecoderFlusher flusher(this);
|
||||
|
||||
bool isBZ;
|
||||
RINOK(DecodeFile(isBZ, progress));
|
||||
return isBZ ? S_OK: S_FALSE;
|
||||
}
|
||||
|
||||
STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream,
|
||||
ISequentialOutStream *outStream, const UINT64 *inSize, const UINT64 *outSize,
|
||||
ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize,
|
||||
ICompressProgressInfo *progress)
|
||||
{
|
||||
try { return CodeReal(inStream, outStream, inSize, outSize, progress); }
|
||||
catch(...) { return S_FALSE; }
|
||||
}
|
||||
|
||||
STDMETHODIMP CDecoder::GetInStreamProcessedSize(UInt64 *value)
|
||||
{
|
||||
if (value == NULL)
|
||||
return E_INVALIDARG;
|
||||
*value = m_InStream.GetProcessedSize();
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
}}
|
||||
|
||||
Reference in New Issue
Block a user