seven-zip 1.4.2 → 1.7.0.rc1

data/ext/p7zip/CPP/7zip/Compress/Rar/makefile.list

@@ -1,64 +1,113 @@
+
+
+# WARNING : automatically generated by utils/generate.py
+
+PROG=../../../../bin/Codecs/Rar.so
+
+all: $(PCH_NAME) $(PROG)
+
+LOCAL_FLAGS=$(TARGET_FLAGS) \
+  -DEXTERNAL_CODECS \
+  -D_FILE_OFFSET_BITS=64 \
+  -D_LARGEFILE_SOURCE \
+  -D_REENTRANT \
+  -DENV_UNIX \
+  -DBREAK_HANDLER \
+  -DUNICODE \
+  -D_UNICODE \
+  -DUNIX_USE_WIN_FILE \
+
 SRCS=\
- ../../../Common/CRC.cpp \
- ../../../Common/MyWindows.cpp \
- ../../../Common/MyVector.cpp \
- ../../Common/InBuffer.cpp \
- ../../Common/StreamUtils.cpp \
- ../../Common/OutBuffer.cpp \
-../LzOutWindow.cpp \
-../CodecExports.cpp \
-../DllExports.cpp \
-../Rar1Decoder.cpp \
-../Rar2Decoder.cpp \
-../Rar3Decoder.cpp \
-../Rar3Vm.cpp \
-../RarCodecsRegister.cpp
+  ../../../../CPP/7zip/Common/InBuffer.cpp \
+  ../../../../CPP/7zip/Common/OutBuffer.cpp \
+  ../../../../CPP/7zip/Common/StreamUtils.cpp \
+  ../../../../CPP/7zip/Compress/CodecExports.cpp \
+  ../../../../CPP/7zip/Compress/DllExportsCompress.cpp \
+  ../../../../CPP/7zip/Compress/LzOutWindow.cpp \
+  ../../../../CPP/7zip/Compress/Rar1Decoder.cpp \
+  ../../../../CPP/7zip/Compress/Rar2Decoder.cpp \
+  ../../../../CPP/7zip/Compress/Rar3Decoder.cpp \
+  ../../../../CPP/7zip/Compress/Rar3Vm.cpp \
+  ../../../../CPP/7zip/Compress/Rar5Decoder.cpp \
+  ../../../../CPP/7zip/Compress/RarCodecsRegister.cpp \
+  ../../../../CPP/Common/CRC.cpp \
+  ../../../../CPP/Common/MyVector.cpp \
+  ../../../../CPP/Common/MyWindows.cpp \
 
 SRCS_C=\
- ../../../../C/Alloc.c \
- ../../../../C/Ppmd7.c \
- ../../../../C/Ppmd7Dec.c
+  ../../../../C/7zCrc.c \
+  ../../../../C/7zCrcOpt.c \
+  ../../../../C/Alloc.c \
+  ../../../../C/CpuArch.c \
+  ../../../../C/Ppmd7.c \
+  ../../../../C/Ppmd7Dec.c \
 
-CRC.o : ../../../Common/CRC.cpp
-	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../../../Common/CRC.cpp
-MyWindows.o : ../../../Common/MyWindows.cpp
-	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../../../Common/MyWindows.cpp
-MyVector.o : ../../../Common/MyVector.cpp
-	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../../../Common/MyVector.cpp
-DllExports.o : ../DllExports.cpp
-	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../DllExports.cpp
-CodecExports.o : ../CodecExports.cpp
-	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../CodecExports.cpp
-InBuffer.o : ../../Common/InBuffer.cpp
-	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../../Common/InBuffer.cpp
-LzOutWindow.o : ../LzOutWindow.cpp
-	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../LzOutWindow.cpp
-StreamUtils.o : ../../Common/StreamUtils.cpp
-	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../../Common/StreamUtils.cpp
-OutBuffer.o : ../../Common/OutBuffer.cpp
-	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../../Common/OutBuffer.cpp
-Rar1Decoder.o : ../Rar1Decoder.cpp
-	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../Rar1Decoder.cpp
-Rar2Decoder.o : ../Rar2Decoder.cpp
-	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../Rar2Decoder.cpp
-Rar3Decoder.o : ../Rar3Decoder.cpp
-	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../Rar3Decoder.cpp
-Rar3Vm.o : ../Rar3Vm.cpp
-	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../Rar3Vm.cpp
-RarCodecsRegister.o : ../RarCodecsRegister.cpp
-	$(CXX) $(CC_SHARED) $(CXXFLAGS) ../RarCodecsRegister.cpp
+StdAfx.h.gch : ../../../myWindows/StdAfx.h
+	rm -f StdAfx.h.gch
+	$(CXX) $(CXXFLAGS) ../../../myWindows/StdAfx.h -o StdAfx.h.gch
+7zCrc.o : ../../../../C/7zCrc.c
+	$(CC) $(CFLAGS) ../../../../C/7zCrc.c
+7zCrcOpt.o : ../../../../C/7zCrcOpt.c
+	$(CC) $(CFLAGS) ../../../../C/7zCrcOpt.c
 Alloc.o : ../../../../C/Alloc.c
-	$(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/Alloc.c
+	$(CC) $(CFLAGS) ../../../../C/Alloc.c
+CpuArch.o : ../../../../C/CpuArch.c
+	$(CC) $(CFLAGS) ../../../../C/CpuArch.c
 Ppmd7.o : ../../../../C/Ppmd7.c
-	$(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/Ppmd7.c
+	$(CC) $(CFLAGS) ../../../../C/Ppmd7.c
 Ppmd7Dec.o : ../../../../C/Ppmd7Dec.c
-	$(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/Ppmd7Dec.c
+	$(CC) $(CFLAGS) ../../../../C/Ppmd7Dec.c
+InBuffer.o : ../../../../CPP/7zip/Common/InBuffer.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Common/InBuffer.cpp
+OutBuffer.o : ../../../../CPP/7zip/Common/OutBuffer.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Common/OutBuffer.cpp
+StreamUtils.o : ../../../../CPP/7zip/Common/StreamUtils.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Common/StreamUtils.cpp
+CodecExports.o : ../../../../CPP/7zip/Compress/CodecExports.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/CodecExports.cpp
+DllExportsCompress.o : ../../../../CPP/7zip/Compress/DllExportsCompress.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/DllExportsCompress.cpp
+LzOutWindow.o : ../../../../CPP/7zip/Compress/LzOutWindow.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/LzOutWindow.cpp
+Rar1Decoder.o : ../../../../CPP/7zip/Compress/Rar1Decoder.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Rar1Decoder.cpp
+Rar2Decoder.o : ../../../../CPP/7zip/Compress/Rar2Decoder.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Rar2Decoder.cpp
+Rar3Decoder.o : ../../../../CPP/7zip/Compress/Rar3Decoder.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Rar3Decoder.cpp
+Rar3Vm.o : ../../../../CPP/7zip/Compress/Rar3Vm.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Rar3Vm.cpp
+Rar5Decoder.o : ../../../../CPP/7zip/Compress/Rar5Decoder.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Rar5Decoder.cpp
+RarCodecsRegister.o : ../../../../CPP/7zip/Compress/RarCodecsRegister.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/RarCodecsRegister.cpp
+CRC.o : ../../../../CPP/Common/CRC.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/Common/CRC.cpp
+MyVector.o : ../../../../CPP/Common/MyVector.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/Common/MyVector.cpp
+MyWindows.o : ../../../../CPP/Common/MyWindows.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/Common/MyWindows.cpp
+
+OBJS=\
+ 7zCrc.o \
+ $(OBJ_CRC32) \
+ Alloc.o \
+ CpuArch.o \
+ Ppmd7.o \
+ Ppmd7Dec.o \
+ InBuffer.o \
+ OutBuffer.o \
+ StreamUtils.o \
+ CodecExports.o \
+ DllExportsCompress.o \
+ LzOutWindow.o \
+ Rar1Decoder.o \
+ Rar2Decoder.o \
+ Rar3Decoder.o \
+ Rar3Vm.o \
+ Rar5Decoder.o \
+ RarCodecsRegister.o \
+ CRC.o \
+ MyVector.o \
+ MyWindows.o \
 
-# CRC32, C version
-7zCrc.o : ../../../../C/7zCrc.c
-	$(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/7zCrc.c
-7zCrcOpt.o : ../../../../C/7zCrcOpt.c
-	$(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/7zCrcOpt.c
-# CRC32, ASM version
-7zCrcT8.o : ../../../../C/7zCrcT8.c
-	$(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/7zCrcT8.c

data/ext/p7zip/CPP/7zip/Compress/Rar1Decoder.cpp

@@ -9,16 +9,17 @@
 namespace NCompress {
 namespace NRar1 {
 
-static UInt32 PosL1[]={0,0,0,2,3,5,7,11,16,20,24,32,32, 256};
-static UInt32 PosL2[]={0,0,0,0,5,7,9,13,18,22,26,34,36, 256};
-static UInt32 PosHf0[]={0,0,0,0,0,8,16,24,33,33,33,33,33, 257};
-static UInt32 PosHf1[]={0,0,0,0,0,0,4,44,60,76,80,80,127, 257};
-static UInt32 PosHf2[]={0,0,0,0,0,0,2,7,53,117,233, 257,0};
-static UInt32 PosHf3[]={0,0,0,0,0,0,0,2,16,218,251, 257,0};
-static UInt32 PosHf4[]={0,0,0,0,0,0,0,0,0,255, 257,0,0};
+static const UInt32 PosL1[] = {0,0,0,2,3,5,7,11,16,20,24,32,32, 256};
+static const UInt32 PosL2[] = {0,0,0,0,5,7,9,13,18,22,26,34,36, 256};
+static const UInt32 PosHf0[] = {0,0,0,0,0,8,16,24,33,33,33,33,33, 257};
+static const UInt32 PosHf1[] = {0,0,0,0,0,0,4,44,60,76,80,80,127, 257};
+static const UInt32 PosHf2[] = {0,0,0,0,0,0,2,7,53,117,233, 257,0};
+static const UInt32 PosHf3[] = {0,0,0,0,0,0,0,2,16,218,251, 257,0};
+static const UInt32 PosHf4[] = {0,0,0,0,0,0,0,0,0,255, 257,0,0};
 
 static const UInt32 kHistorySize = (1 << 16);
 
+/*
 class CCoderReleaser
 {
   CDecoder *m_Coder;
@@ -26,12 +27,13 @@ public:
   CCoderReleaser(CDecoder *coder): m_Coder(coder) {}
   ~CCoderReleaser() { m_Coder->ReleaseStreams(); }
 };
+*/
 
 CDecoder::CDecoder(): m_IsSolid(false) { }
 
 void CDecoder::InitStructures()
 {
-  for(int i = 0; i < kNumRepDists; i++)
+  for (int i = 0; i < kNumRepDists; i++)
     m_RepDists[i] = 0;
   m_RepDistPtr = 0;
   LastLength = 0;
@@ -65,18 +67,18 @@ UInt32 CDecoder::DecodeNum(const UInt32 *posTab)
   return((num >> (12 - startPos)) + posTab[startPos]);
 }
 
-static Byte kShortLen1[]  = {1,3,4,4,5,6,7,8,8,4,4,5,6,6 };
-static Byte kShortLen1a[] = {1,4,4,4,5,6,7,8,8,4,4,5,6,6,4 };
-static Byte kShortLen2[]  = {2,3,3,3,4,4,5,6,6,4,4,5,6,6 };
-static Byte kShortLen2a[] = {2,3,3,4,4,4,5,6,6,4,4,5,6,6,4 };
-static UInt32 kShortXor1[] = {0,0xa0,0xd0,0xe0,0xf0,0xf8,0xfc,0xfe,0xff,0xc0,0x80,0x90,0x98,0x9c,0xb0};
-static UInt32 kShortXor2[] = {0,0x40,0x60,0xa0,0xd0,0xe0,0xf0,0xf8,0xfc,0xc0,0x80,0x90,0x98,0x9c,0xb0};
+static const Byte kShortLen1 [] = {1,3,4,4,5,6,7,8,8,4,4,5,6,6 };
+static const Byte kShortLen1a[] = {1,4,4,4,5,6,7,8,8,4,4,5,6,6,4 };
+static const Byte kShortLen2 [] = {2,3,3,3,4,4,5,6,6,4,4,5,6,6 };
+static const Byte kShortLen2a[] = {2,3,3,4,4,4,5,6,6,4,4,5,6,6,4 };
+static const UInt32 kShortXor1[] = {0,0xa0,0xd0,0xe0,0xf0,0xf8,0xfc,0xfe,0xff,0xc0,0x80,0x90,0x98,0x9c,0xb0};
+static const UInt32 kShortXor2[] = {0,0x40,0x60,0xa0,0xd0,0xe0,0xf0,0xf8,0xfc,0xc0,0x80,0x90,0x98,0x9c,0xb0};
 
 HRESULT CDecoder::ShortLZ()
 {
   UInt32 len, saveLen, dist;
   int distancePlace;
-  Byte *kShortLen;
+  const Byte *kShortLen;
   const UInt32 *kShortXor;
   NumHuf = 0;
 
@@ -141,17 +143,18 @@ HRESULT CDecoder::ShortLZ()
     AvrLn1 -= AvrLn1 >> 4;
     
     distancePlace = DecodeNum(PosHf2) & 0xff;
-    dist = ChSetA[distancePlace];
+    dist = ChSetA[(unsigned)distancePlace];
     if (--distancePlace != -1)
     {
       PlaceA[dist]--;
-      UInt32 lastDistance = ChSetA[distancePlace];
+      UInt32 lastDistance = ChSetA[(unsigned)distancePlace];
       PlaceA[lastDistance]++;
-      ChSetA[distancePlace + 1] = lastDistance;
-      ChSetA[distancePlace] = dist;
+      ChSetA[(unsigned)distancePlace + 1] = lastDistance;
+      ChSetA[(unsigned)distancePlace] = dist;
     }
     len += 2;
   }
+
   m_RepDists[m_RepDistPtr++] = dist;
   m_RepDistPtr &= 3;
   LastLength = len;
@@ -208,6 +211,7 @@ HRESULT CDecoder::LongLZ()
 
   AvrPlcB += distancePlace;
   AvrPlcB -= AvrPlcB >> 8;
+  
   for (;;)
   {
     dist = ChSetB[distancePlace & 0xff];
@@ -224,6 +228,7 @@ HRESULT CDecoder::LongLZ()
   dist = ((dist & 0xff00) >> 1) | ReadBits(7);
 
   oldAvr3 = AvrLn3;
+  
   if (len != 1 && len != 4)
     if (len == 0 && dist <= MaxDist3)
     {
@@ -233,19 +238,24 @@ HRESULT CDecoder::LongLZ()
     else
       if (AvrLn3 > 0)
         AvrLn3--;
+  
   len += 3;
+  
   if (dist >= MaxDist3)
     len++;
   if (dist <= 256)
     len += 8;
+  
   if (oldAvr3 > 0xb0 || AvrPlc >= 0x2a00 && oldAvr2 < 0x40)
     MaxDist3 = 0x7f00;
   else
     MaxDist3 = 0x2001;
+  
   m_RepDists[m_RepDistPtr++] = --dist;
   m_RepDistPtr &= 3;
   LastLength = len;
   LastDist = dist;
+  
   return CopyBlock(dist, len);
 }
 
@@ -262,6 +272,7 @@ HRESULT CDecoder::HuffDecode()
   else if (AvrPlc > 0x35ff)  bytePlace = DecodeNum(PosHf2);
   else if (AvrPlc > 0x0dff)  bytePlace = DecodeNum(PosHf1);
   else                       bytePlace = DecodeNum(PosHf0);
+  
   if (StMode)
   {
     if (--bytePlace == -1)
@@ -282,10 +293,12 @@ HRESULT CDecoder::HuffDecode()
   }
   else if (NumHuf++ >= 16 && FlagsCnt == 0)
     StMode = 1;
+  
   bytePlace &= 0xff;
   AvrPlc += bytePlace;
   AvrPlc -= AvrPlc >> 8;
   Nhfb+=16;
+  
   if (Nhfb > 0xff)
   {
     Nhfb=0x90;
@@ -389,7 +402,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
   m_InBitStream.SetStream(inStream);
   m_InBitStream.Init();
 
-  CCoderReleaser coderReleaser(this);
+  // CCoderReleaser coderReleaser(this);
   InitData();
   if (!m_IsSolid)
   {
@@ -473,7 +486,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
 {
   if (size < 1)
     return E_INVALIDARG;
-  m_IsSolid = (data[0] != 0);
+  m_IsSolid = ((data[0] & 1) != 0);
   return S_OK;
 }
 

data/ext/p7zip/CPP/7zip/Compress/Rar1Decoder.h

@@ -70,11 +70,13 @@ public:
 
   MY_UNKNOWN_IMP1(ICompressSetDecoderProperties2)
 
+  /*
   void ReleaseStreams()
   {
     m_OutWindowStream.ReleaseStream();
     m_InBitStream.ReleaseStream();
   }
+  */
 
   STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
       const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);

data/ext/p7zip/CPP/7zip/Compress/Rar2Decoder.cpp

@@ -20,19 +20,22 @@ Byte CFilter::Decode(int &channelDelta, Byte deltaByte)
   int predictedValue = ((8 * LastChar + K1 * D1 + K2 * D2 + K3 * D3 + K4 * D4 + K5 * channelDelta) >> 3);
 
   Byte realValue = (Byte)(predictedValue - deltaByte);
-  int i = ((int)(signed char)deltaByte) << 3;
-
-  Dif[0] += abs(i);
-  Dif[1] += abs(i - D1);
-  Dif[2] += abs(i + D1);
-  Dif[3] += abs(i - D2);
-  Dif[4] += abs(i + D2);
-  Dif[5] += abs(i - D3);
-  Dif[6] += abs(i + D3);
-  Dif[7] += abs(i - D4);
-  Dif[8] += abs(i + D4);
-  Dif[9] += abs(i - channelDelta);
-  Dif[10] += abs(i + channelDelta);
+  
+  {
+    int i = ((int)(signed char)deltaByte) << 3;
+
+    Dif[0] += abs(i);
+    Dif[1] += abs(i - D1);
+    Dif[2] += abs(i + D1);
+    Dif[3] += abs(i - D2);
+    Dif[4] += abs(i + D2);
+    Dif[5] += abs(i - D3);
+    Dif[6] += abs(i + D3);
+    Dif[7] += abs(i - D4);
+    Dif[8] += abs(i + D4);
+    Dif[9] += abs(i - channelDelta);
+    Dif[10] += abs(i + channelDelta);
+  }
 
   channelDelta = LastDelta = (signed char)(realValue - LastChar);
   LastChar = realValue;
@@ -42,7 +45,8 @@ Byte CFilter::Decode(int &channelDelta, Byte deltaByte)
     UInt32 minDif = Dif[0];
     UInt32 numMinDif = 0;
     Dif[0] = 0;
-    for (i = 1; i < sizeof(Dif) / sizeof(Dif[0]); i++)
+    
+    for (unsigned i = 1; i < ARRAY_SIZE(Dif); i++)
     {
       if (Dif[i] < minDif)
       {
@@ -51,7 +55,8 @@ Byte CFilter::Decode(int &channelDelta, Byte deltaByte)
       }
       Dif[i] = 0;
     }
-    switch(numMinDif)
+    
+    switch (numMinDif)
     {
       case 1: if (K1 >= -16) K1--; break;
       case 2: if (K1 <   16) K1++; break;
@@ -65,16 +70,13 @@ Byte CFilter::Decode(int &channelDelta, Byte deltaByte)
       case 10:if (K5 <   16) K5++; break;
     }
   }
+  
   return realValue;
 }
 }
 
-static const char *kNumberErrorMessage = "Number error";
-
 static const UInt32 kHistorySize = 1 << 20;
 
-static const int kNumStats = 11;
-
 static const UInt32 kWindowReservSize = (1 << 22) + 256;
 
 CDecoder::CDecoder():
@@ -85,14 +87,14 @@ CDecoder::CDecoder():
 void CDecoder::InitStructures()
 {
   m_MmFilter.Init();
-  for(int i = 0; i < kNumRepDists; i++)
+  for (unsigned i = 0; i < kNumRepDists; i++)
     m_RepDists[i] = 0;
   m_RepDistPtr = 0;
   m_LastLength = 0;
   memset(m_LastLevels, 0, kMaxTableSize);
 }
 
-UInt32 CDecoder::ReadBits(int numBits) { return m_InBitStream.ReadBits(numBits); }
+UInt32 CDecoder::ReadBits(unsigned numBits) { return m_InBitStream.ReadBits(numBits); }
 
 #define RIF(x) { if (!(x)) return false; }
 
@@ -104,7 +106,9 @@ bool CDecoder::ReadTables(void)
 
   if (ReadBits(1) == 0)
     memset(m_LastLevels, 0, kMaxTableSize);
-  int numLevels;
+  
+  unsigned numLevels;
+  
   if (m_AudioMode)
   {
     m_NumChannels = ReadBits(2) + 1;
@@ -115,52 +119,56 @@ bool CDecoder::ReadTables(void)
   else
     numLevels = kHeapTablesSizesSum;
  
-  int i;
+  unsigned i;
   for (i = 0; i < kLevelTableSize; i++)
     levelLevels[i] = (Byte)ReadBits(4);
-  RIF(m_LevelDecoder.SetCodeLengths(levelLevels));
+  RIF(m_LevelDecoder.Build(levelLevels));
+  
   i = 0;
+  
   while (i < numLevels)
   {
-    UInt32 number = m_LevelDecoder.DecodeSymbol(&m_InBitStream);
-    if (number < kTableDirectLevels)
+    UInt32 sym = m_LevelDecoder.Decode(&m_InBitStream);
+    if (sym < kTableDirectLevels)
     {
-      newLevels[i] = (Byte)((number + m_LastLevels[i]) & kLevelMask);
+      newLevels[i] = (Byte)((sym + m_LastLevels[i]) & kLevelMask);
       i++;
     }
     else
     {
-      if (number == kTableLevelRepNumber)
+      if (sym == kTableLevelRepNumber)
       {
-        int t = ReadBits(2) + 3;
-        for (int reps = t; reps > 0 && i < numLevels ; reps--, i++)
+        unsigned t = ReadBits(2) + 3;
+        for (unsigned reps = t; reps > 0 && i < numLevels; reps--, i++)
           newLevels[i] = newLevels[i - 1];
       }
       else
       {
-        int num;
-        if (number == kTableLevel0Number)
+        unsigned num;
+        if (sym == kTableLevel0Number)
           num = ReadBits(3) + 3;
-        else if (number == kTableLevel0Number2)
+        else if (sym == kTableLevel0Number2)
           num = ReadBits(7) + 11;
         else
           return false;
-        for (;num > 0 && i < numLevels; num--)
+        for (; num > 0 && i < numLevels; num--)
           newLevels[i++] = 0;
       }
     }
   }
+
   if (m_AudioMode)
     for (i = 0; i < m_NumChannels; i++)
     {
-      RIF(m_MMDecoders[i].SetCodeLengths(&newLevels[i * kMMTableSize]));
+      RIF(m_MMDecoders[i].Build(&newLevels[i * kMMTableSize]));
     }
   else
   {
-    RIF(m_MainDecoder.SetCodeLengths(&newLevels[0]));
-    RIF(m_DistDecoder.SetCodeLengths(&newLevels[kMainTableSize]));
-    RIF(m_LenDecoder.SetCodeLengths(&newLevels[kMainTableSize + kDistTableSize]));
+    RIF(m_MainDecoder.Build(&newLevels[0]));
+    RIF(m_DistDecoder.Build(&newLevels[kMainTableSize]));
+    RIF(m_LenDecoder.Build(&newLevels[kMainTableSize + kDistTableSize]));
   }
+  
   memcpy(m_LastLevels, newLevels, kMaxTableSize);
   return true;
 }
@@ -174,7 +182,7 @@ bool CDecoder::ReadLastTables()
   // if (m_InBitStream.GetProcessedSize() + 2 <= m_PackSize) // test it: probably incorrect;
     if (m_AudioMode)
     {
-      UInt32 symbol = m_MMDecoders[m_MmFilter.CurrentChannel].DecodeSymbol(&m_InBitStream);
+      UInt32 symbol = m_MMDecoders[m_MmFilter.CurrentChannel].Decode(&m_InBitStream);
       if (symbol == 256)
         return ReadTables();
       if (symbol >= kMMTableSize)
@@ -182,15 +190,16 @@ bool CDecoder::ReadLastTables()
     }
     else
     {
-      UInt32 number = m_MainDecoder.DecodeSymbol(&m_InBitStream);
-      if (number == kReadTableNumber)
+      UInt32 sym = m_MainDecoder.Decode(&m_InBitStream);
+      if (sym == kReadTableNumber)
         return ReadTables();
-      if (number >= kMainTableSize)
+      if (sym >= kMainTableSize)
         return false;
     }
   return true;
 }
 
+/*
 class CCoderReleaser
 {
   CDecoder *m_Coder;
@@ -201,12 +210,13 @@ public:
     m_Coder->ReleaseStreams();
   }
 };
+*/
 
 bool CDecoder::DecodeMm(UInt32 pos)
 {
   while (pos-- > 0)
   {
-    UInt32 symbol = m_MMDecoders[m_MmFilter.CurrentChannel].DecodeSymbol(&m_InBitStream);
+    UInt32 symbol = m_MMDecoders[m_MmFilter.CurrentChannel].Decode(&m_InBitStream);
     if (symbol == 256)
       return true;
     if (symbol >= kMMTableSize)
@@ -228,23 +238,23 @@ bool CDecoder::DecodeLz(Int32 pos)
 {
   while (pos > 0)
   {
-    UInt32 number = m_MainDecoder.DecodeSymbol(&m_InBitStream);
+    UInt32 sym = m_MainDecoder.Decode(&m_InBitStream);
     UInt32 length, distance;
-    if (number < 256)
+    if (sym < 256)
     {
-      m_OutWindowStream.PutByte(Byte(number));
+      m_OutWindowStream.PutByte(Byte(sym));
       pos--;
       continue;
     }
-    else if (number >= kMatchNumber)
+    else if (sym >= kMatchNumber)
     {
-      number -= kMatchNumber;
-      length = kNormalMatchMinLen + UInt32(kLenStart[number]) +
-        m_InBitStream.ReadBits(kLenDirectBits[number]);
-      number = m_DistDecoder.DecodeSymbol(&m_InBitStream);
-      if (number >= kDistTableSize)
+      sym -= kMatchNumber;
+      length = kNormalMatchMinLen + UInt32(kLenStart[sym]) +
+        m_InBitStream.ReadBits(kLenDirectBits[sym]);
+      sym = m_DistDecoder.Decode(&m_InBitStream);
+      if (sym >= kDistTableSize)
         return false;
-      distance = kDistStart[number] + m_InBitStream.ReadBits(kDistDirectBits[number]);
+      distance = kDistStart[sym] + m_InBitStream.ReadBits(kDistDirectBits[sym]);
       if (distance >= kDistLimit3)
       {
         length += 2 - ((distance - kDistLimit4) >> 31);
@@ -253,20 +263,20 @@ bool CDecoder::DecodeLz(Int32 pos)
         //  length++;
       }
     }
-    else if (number == kRepBothNumber)
+    else if (sym == kRepBothNumber)
     {
       length = m_LastLength;
       if (length == 0)
         return false;
       distance = m_RepDists[(m_RepDistPtr + 4 - 1) & 3];
     }
-    else if (number < kLen2Number)
+    else if (sym < kLen2Number)
     {
-      distance = m_RepDists[(m_RepDistPtr - (number - kRepNumber + 1)) & 3];
-      number = m_LenDecoder.DecodeSymbol(&m_InBitStream);
-      if (number >= kLenTableSize)
+      distance = m_RepDists[(m_RepDistPtr - (sym - kRepNumber + 1)) & 3];
+      sym = m_LenDecoder.Decode(&m_InBitStream);
+      if (sym >= kLenTableSize)
         return false;
-      length = 2 + kLenStart[number] + m_InBitStream.ReadBits(kLenDirectBits[number]);
+      length = 2 + kLenStart[sym] + m_InBitStream.ReadBits(kLenDirectBits[sym]);
       if (distance >= kDistLimit2)
       {
         length++;
@@ -279,14 +289,14 @@ bool CDecoder::DecodeLz(Int32 pos)
         }
       }
     }
-    else if (number < kReadTableNumber)
+    else if (sym < kReadTableNumber)
     {
-      number -= kLen2Number;
-      distance = kLen2DistStarts[number] +
-        m_InBitStream.ReadBits(kLen2DistDirectBits[number]);
+      sym -= kLen2Number;
+      distance = kLen2DistStarts[sym] +
+        m_InBitStream.ReadBits(kLen2DistDirectBits[sym]);
       length = 2;
     }
-    else if (number == kReadTableNumber)
+    else if (sym == kReadTableNumber)
       return true;
     else
       return false;
@@ -319,7 +329,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
   m_InBitStream.SetStream(inStream);
   m_InBitStream.Init();
 
-  CCoderReleaser coderReleaser(this);
+  // CCoderReleaser coderReleaser(this);
   if (!m_IsSolid)
   {
     InitStructures();
@@ -335,7 +345,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
   }
 
   UInt64 startPos = m_OutWindowStream.GetProcessedSize();
-  while(pos < unPackSize)
+  while (pos < unPackSize)
   {
     UInt32 blockSize = 1 << 20;
     if (blockSize > unPackSize - pos)
@@ -384,7 +394,7 @@ STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
 {
   if (size < 1)
     return E_INVALIDARG;
-  m_IsSolid = (data[0] != 0);
+  m_IsSolid = ((data[0] & 1) != 0);
   return S_OK;
 }