seven-zip 1.4.2 → 1.7.0.rc1

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

@@ -5,92 +5,94 @@
 
 #include "../../Common/MyCom.h"
 
-#include "../ICoder.h"
-
-#include "../Common/InBuffer.h"
-
 #include "LzOutWindow.h"
 
 namespace NCompress {
 namespace NQuantum {
 
-class CStreamBitDecoder
+class CBitDecoder
 {
   UInt32 Value;
-  CInBuffer Stream;
+  bool _extra;
+  const Byte *_buf;
+  const Byte *_bufLim;
 public:
-  bool Create(UInt32 bufferSize) { return Stream.Create(bufferSize); }
-  void SetStream(ISequentialInStream *stream) { Stream.SetStream(stream); }
-  void ReleaseStream() { Stream.ReleaseStream(); }
-
-  void Finish() { Value = 0x10000; }
-
-  void Init()
+  void SetStreamAndInit(const Byte *inData, size_t inSize)
   {
-    Stream.Init();
+    _buf = inData;
+    _bufLim = inData + inSize;
     Value = 0x10000;
+    _extra = false;
   }
 
-  UInt64 GetProcessedSize() const { return Stream.GetProcessedSize(); }
-  bool WasFinished() const { return Stream.WasFinished(); }
+  bool WasExtraRead() const { return _extra; }
+
+  bool WasFinishedOK() const
+  {
+    return !_extra && _buf == _bufLim;
+  }
   
   UInt32 ReadBit()
   {
     if (Value >= 0x10000)
-      Value = 0x100 | Stream.ReadByte();
+    {
+      Byte b;
+      if (_buf >= _bufLim)
+      {
+        b = 0xFF;
+        _extra = true;
+      }
+      else
+        b = *_buf++;
+      Value = 0x100 | b;
+    }
     UInt32 res = (Value >> 7) & 1;
     Value <<= 1;
     return res;
   }
 
-  UInt32 ReadBits(int numBits) // numBits > 0
+  UInt32 ReadStart16Bits()
+  {
+    // we use check for extra read in another code.
+    UInt32 val = ((UInt32)*_buf << 8) | _buf[1];
+    _buf += 2;
+    return val;
+  }
+
+  UInt32 ReadBits(unsigned numBits) // numBits > 0
   {
     UInt32 res = 0;
     do
       res = (res << 1) | ReadBit();
-    while (--numBits != 0);
+    while (--numBits);
     return res;
   }
 };
 
-const unsigned kNumLitSelectorBits = 2;
-const unsigned kNumLitSelectors = (1 << kNumLitSelectorBits);
-const unsigned kNumLitSymbols = 1 << (8 - kNumLitSelectorBits);
-const unsigned kNumMatchSelectors = 3;
-const unsigned kNumSelectors = kNumLitSelectors + kNumMatchSelectors;
-const unsigned kNumSymbolsMax = kNumLitSymbols; // 64
-
-namespace NRangeCoder {
 
-class CDecoder
+class CRangeDecoder
 {
   UInt32 Low;
   UInt32 Range;
   UInt32 Code;
 public:
-  CStreamBitDecoder Stream;
-  bool Create(UInt32 bufferSize) { return Stream.Create(bufferSize); }
-  void SetStream(ISequentialInStream *stream) { Stream.SetStream(stream); }
-  void ReleaseStream() { Stream.ReleaseStream(); }
+  CBitDecoder Stream;
 
   void Init()
   {
-    Stream.Init();
     Low = 0;
     Range = 0x10000;
-    Code = Stream.ReadBits(16);
+    Code = Stream.ReadStart16Bits();
   }
 
-  void Finish()
+  bool Finish()
   {
-    // we need these extra two Bit_reads
-    Stream.ReadBit();
-    Stream.ReadBit();
-    Stream.Finish();
+    // do all streams use these two bits at end?
+    if (Stream.ReadBit() != 0) return false;
+    if (Stream.ReadBit() != 0) return false;
+    return Stream.WasFinishedOK();
   }
 
-  UInt64 GetProcessedSize() const { return Stream.GetProcessedSize(); }
-
   UInt32 GetThreshold(UInt32 total) const
   {
     return ((Code + 1) * total - 1) / Range; // & 0xFFFF is not required;
@@ -119,143 +121,52 @@ public:
   }
 };
 
-const UInt16 kUpdateStep = 8;
-const UInt16 kFreqSumMax = 3800;
-const UInt16 kReorderCountStart = 4;
-const UInt16 kReorderCount = 50;
+
+const unsigned kNumLitSelectorBits = 2;
+const unsigned kNumLitSelectors = (1 << kNumLitSelectorBits);
+const unsigned kNumLitSymbols = 1 << (8 - kNumLitSelectorBits);
+const unsigned kNumMatchSelectors = 3;
+const unsigned kNumSelectors = kNumLitSelectors + kNumMatchSelectors;
+const unsigned kNumSymbolsMax = kNumLitSymbols; // 64
+
 
 class CModelDecoder
 {
   unsigned NumItems;
   unsigned ReorderCount;
   UInt16 Freqs[kNumSymbolsMax + 1];
-  Byte Values[kNumSymbolsMax];
+  Byte Vals[kNumSymbolsMax];
 public:
-  void Init(unsigned numItems)
-  {
-    NumItems = numItems;
-    ReorderCount = kReorderCountStart;
-    for (unsigned i = 0; i < numItems; i++)
-    {
-      Freqs[i] = (UInt16)(numItems - i);
-      Values[i] = (Byte)i;
-    }
-    Freqs[numItems] = 0;
-  }
-  
-  unsigned Decode(CDecoder *rangeDecoder)
-  {
-    UInt32 threshold = rangeDecoder->GetThreshold(Freqs[0]);
-    unsigned i;
-    for (i = 1; Freqs[i] > threshold; i++);
-    rangeDecoder->Decode(Freqs[i], Freqs[i - 1], Freqs[0]);
-    unsigned res = Values[--i];
-    do
-      Freqs[i] += kUpdateStep;
-    while (i-- != 0);
-
-    if (Freqs[0] > kFreqSumMax)
-    {
-      if (--ReorderCount == 0)
-      {
-        ReorderCount = kReorderCount;
-        for (i = 0; i < NumItems; i++)
-          Freqs[i] = (UInt16)(((Freqs[i] - Freqs[i + 1]) + 1) >> 1);
-        for (i = 0; i < NumItems - 1; i++)
-          for (unsigned j = i + 1; j < NumItems; j++)
-            if (Freqs[i] < Freqs[j])
-            {
-              UInt16 tmpFreq = Freqs[i];
-              Byte tmpVal = Values[i];
-              Freqs[i] = Freqs[j];
-              Values[i] = Values[j];
-              Freqs[j] = tmpFreq;
-              Values[j] = tmpVal;
-            }
-        do
-          Freqs[i] = (UInt16)(Freqs[i] + Freqs[i + 1]);
-        while (i-- != 0);
-      }
-      else
-      {
-        i = NumItems - 1;
-        do
-        {
-          Freqs[i] >>= 1;
-          if (Freqs[i] <= Freqs[i + 1])
-            Freqs[i] = (UInt16)(Freqs[i + 1] + 1);
-        }
-        while (i-- != 0);
-      }
-    }
-    return res;
-  }
+  void Init(unsigned numItems);
+  unsigned Decode(CRangeDecoder *rc);
 };
 
-}
 
 class CDecoder:
-  public ICompressCoder,
-  public ICompressSetInStream,
-  public ICompressSetOutStreamSize,
+  public IUnknown,
   public CMyUnknownImp
 {
-  CLzOutWindow _outWindowStream;
-  NRangeCoder::CDecoder _rangeDecoder;
-
-  UInt64 _outSize;
-  int _remainLen; // -1 means end of stream. // -2 means need Init
-  UInt32 _rep0;
+  CLzOutWindow _outWindow;
+  unsigned _numDictBits;
 
-  int _numDictBits;
-  bool _keepHistory;
+  CModelDecoder m_Selector;
+  CModelDecoder m_Literals[kNumLitSelectors];
+  CModelDecoder m_PosSlot[kNumMatchSelectors];
+  CModelDecoder m_LenSlot;
 
-  NRangeCoder::CModelDecoder m_Selector;
-  NRangeCoder::CModelDecoder m_Literals[kNumLitSelectors];
-  NRangeCoder::CModelDecoder m_PosSlot[kNumMatchSelectors];
-  NRangeCoder::CModelDecoder m_LenSlot;
   void Init();
-  HRESULT CodeSpec(UInt32 size);
+  HRESULT CodeSpec(const Byte *inData, size_t inSize, UInt32 outSize);
 public:
-  MY_UNKNOWN_IMP2(
-      ICompressSetInStream,
-      ICompressSetOutStreamSize)
-
-  void ReleaseStreams()
-  {
-    _outWindowStream.ReleaseStream();
-    ReleaseInStream();
-  }
 
-  class CDecoderFlusher
-  {
-    CDecoder *_decoder;
-  public:
-    bool NeedFlush;
-    CDecoderFlusher(CDecoder *decoder): _decoder(decoder), NeedFlush(true) {}
-    ~CDecoderFlusher()
-    {
-      if (NeedFlush)
-        _decoder->Flush();
-      _decoder->ReleaseStreams();
-    }
-  };
+  MY_UNKNOWN_IMP
 
-  HRESULT Flush() {  return _outWindowStream.Flush(); }
+  HRESULT Code(const Byte *inData, size_t inSize,
+      ISequentialOutStream *outStream, UInt32 outSize,
+      bool keepHistory);
 
-  HRESULT CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream,
-      const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
+  HRESULT SetParams(unsigned numDictBits);
   
-  STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
-      const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
-
-  STDMETHOD(SetInStream)(ISequentialInStream *inStream);
-  STDMETHOD(ReleaseInStream)();
-  STDMETHOD(SetOutStreamSize)(const UInt64 *outSize);
-
-  void SetParams(int numDictBits) { _numDictBits = numDictBits; }
-  void SetKeepHistory(bool keepHistory) { _keepHistory = keepHistory; }
-  CDecoder(): _keepHistory(false) {}
+  CDecoder(): _numDictBits(0) {}
   virtual ~CDecoder() {}
 };
 

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

@@ -1,34 +1,49 @@
-PROG=../../../../bin/Codecs/Rar29.so
 
-LOCAL_FLAGS=$(CC_SHARED) -DUNICODE -D_UNICODE
+TARGET_FLAGS=$(CC_SHARED) -DRegisterCodec=DllRegisterCodec
 
 MY_WINDOWS=
 
 include ../../../../makefile.crc32
 include ../../../../makefile.machine
 
-LOCAL_SHARED=$(LINK_SHARED)
+LOCAL_LINK=$(LINK_SHARED)
 LIBS=$(LOCAL_LIBS)
 
+COMPRESS_OBJS = \
+  CodecExports.o \
+  DllExportsCompress.o \
+
+RAR29_OPT_OBJS = \
+  LzOutWindow.o \
+  Rar1Decoder.o \
+  Rar2Decoder.o \
+  Rar3Decoder.o \
+  Rar3Vm.o \
+  RarCodecsRegister.o \
+
+COMMON_OBJS = \
+  CRC.o \
+  MyVector.o \
+
+P7ZIP_COMMON_OBJS = \
+  InBuffer.o \
+  OutBuffer.o \
+  StreamUtils.o \
+
+C_OBJS = \
+  Alloc.o \
+  CpuArch.o \
+
 OBJS = \
 MyWindows.o \
-CRC.o\
-MyVector.o\
-CodecExports.o \
-DllExports.o \
-Rar1Decoder.o \
-Rar2Decoder.o \
-Rar3Decoder.o \
-Rar3Vm.o \
-RarCodecsRegister.o \
-$(OBJ_CRC32) \
-InBuffer.o \
-OutBuffer.o \
-StreamUtils.o \
-LzOutWindow.o \
 Ppmd7.o \
 Ppmd7Dec.o \
-Alloc.o
+$(COMPRESS_OBJS) \
+$(RAR29_OPT_OBJS) \
+$(COMMON_OBJS) \
+$(P7ZIP_COMMON_OBJS) \
+$(C_OBJS) \
+7zCrc.o $(OBJ_CRC32) \
 
 include ../../../../makefile.glb
 

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

@@ -1,158 +0,0 @@
-CRC.o: ../../../Common/CRC.cpp ../../../myWindows/StdAfx.h \
- ../../../myWindows/config.h ../../../Common/MyWindows.h \
- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
- ../../../Common/../../C/Types.h ../../../Common/Types.h \
- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
- ../../../include_windows/tchar.h ../../../Common/../../C/7zCrc.h \
- ../../../Common/../../C/Types.h
-MyWindows.o: ../../../Common/MyWindows.cpp ../../../myWindows/StdAfx.h \
- ../../../myWindows/config.h ../../../Common/MyWindows.h \
- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
- ../../../Common/../../C/Types.h ../../../Common/Types.h \
- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
- ../../../include_windows/tchar.h ../../../Common/MyWindows.h
-MyVector.o: ../../../Common/MyVector.cpp ../../../myWindows/StdAfx.h \
- ../../../myWindows/config.h ../../../Common/MyWindows.h \
- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
- ../../../Common/../../C/Types.h ../../../Common/Types.h \
- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
- ../../../include_windows/tchar.h ../../../Common/MyVector.h \
- ../../../Common/Defs.h
-InBuffer.o: ../../Common/InBuffer.cpp ../../../myWindows/StdAfx.h \
- ../../../myWindows/config.h ../../../Common/MyWindows.h \
- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
- ../../../Common/../../C/Types.h ../../../Common/Types.h \
- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
- ../../../include_windows/tchar.h ../../Common/../../../C/Alloc.h \
- ../../Common/InBuffer.h ../../Common/../IStream.h \
- ../../Common/../../Common/MyUnknown.h \
- ../../Common/../../Common/MyWindows.h ../../Common/../../Common/Types.h \
- ../../Common/../IDecl.h ../../Common/../../Common/MyCom.h \
- ../../Common/../../Common/MyException.h
-StreamUtils.o: ../../Common/StreamUtils.cpp ../../../myWindows/StdAfx.h \
- ../../../myWindows/config.h ../../../Common/MyWindows.h \
- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
- ../../../Common/../../C/Types.h ../../../Common/Types.h \
- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
- ../../../include_windows/tchar.h ../../Common/StreamUtils.h \
- ../../Common/../IStream.h ../../Common/../../Common/MyUnknown.h \
- ../../Common/../../Common/MyWindows.h ../../Common/../../Common/Types.h \
- ../../Common/../IDecl.h
-OutBuffer.o: ../../Common/OutBuffer.cpp ../../../myWindows/StdAfx.h \
- ../../../myWindows/config.h ../../../Common/MyWindows.h \
- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
- ../../../Common/../../C/Types.h ../../../Common/Types.h \
- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
- ../../../include_windows/tchar.h ../../Common/../../../C/Alloc.h \
- ../../Common/OutBuffer.h ../../Common/../IStream.h \
- ../../Common/../../Common/MyUnknown.h \
- ../../Common/../../Common/MyWindows.h ../../Common/../../Common/Types.h \
- ../../Common/../IDecl.h ../../Common/../../Common/MyCom.h \
- ../../Common/../../Common/MyException.h
-LzOutWindow.o: ../LzOutWindow.cpp ../../../myWindows/StdAfx.h \
- ../../../myWindows/config.h ../../../Common/MyWindows.h \
- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
- ../../../Common/../../C/Types.h ../../../Common/Types.h \
- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
- ../../../include_windows/tchar.h ../LzOutWindow.h ../../IStream.h \
- ../../../Common/MyUnknown.h ../../../Common/MyWindows.h \
- ../../../Common/Types.h ../../IDecl.h ../../Common/OutBuffer.h \
- ../../Common/../IStream.h ../../Common/../../Common/MyCom.h \
- ../../Common/../../Common/MyWindows.h \
- ../../Common/../../Common/MyException.h
-CodecExports.o: ../CodecExports.cpp ../../../myWindows/StdAfx.h \
- ../../../myWindows/config.h ../../../Common/MyWindows.h \
- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
- ../../../Common/../../C/Types.h ../../../Common/Types.h \
- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
- ../../../include_windows/tchar.h ../../../Common/ComTry.h \
- ../../../Common/MyWindows.h ../../../Windows/PropVariant.h \
- ../../../Windows/../Common/MyWindows.h \
- ../../../Windows/../Common/Types.h ../../ICoder.h ../../IStream.h \
- ../../../Common/MyUnknown.h ../../../Common/Types.h ../../IDecl.h \
- ../../Common/RegisterCodec.h ../../Common/../Common/MethodId.h \
- ../../Common/../Common/../../Common/Types.h
-DllExports.o: ../DllExports.cpp ../../../myWindows/StdAfx.h \
- ../../../myWindows/config.h ../../../Common/MyWindows.h \
- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
- ../../../Common/../../C/Types.h ../../../Common/Types.h \
- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
- ../../../include_windows/tchar.h ../../../Common/MyInitGuid.h \
- ../../ICoder.h ../../IStream.h ../../../Common/MyUnknown.h \
- ../../../Common/MyWindows.h ../../../Common/Types.h ../../IDecl.h \
- ../../Common/RegisterCodec.h ../../Common/../Common/MethodId.h \
- ../../Common/../Common/../../Common/Types.h
-Rar1Decoder.o: ../Rar1Decoder.cpp ../../../myWindows/StdAfx.h \
- ../../../myWindows/config.h ../../../Common/MyWindows.h \
- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
- ../../../Common/../../C/Types.h ../../../Common/Types.h \
- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
- ../../../include_windows/tchar.h ../Rar1Decoder.h \
- ../../../Common/MyCom.h ../../../Common/MyWindows.h ../../ICoder.h \
- ../../IStream.h ../../../Common/MyUnknown.h ../../../Common/Types.h \
- ../../IDecl.h ../../Common/InBuffer.h ../../Common/../IStream.h \
- ../../Common/../../Common/MyCom.h \
- ../../Common/../../Common/MyException.h \
- ../../Common/../../Common/MyWindows.h ../BitmDecoder.h ../../IStream.h \
- ../HuffmanDecoder.h ../../../Common/Types.h ../LzOutWindow.h \
- ../../Common/OutBuffer.h
-Rar2Decoder.o: ../Rar2Decoder.cpp ../../../myWindows/StdAfx.h \
- ../../../myWindows/config.h ../../../Common/MyWindows.h \
- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
- ../../../Common/../../C/Types.h ../../../Common/Types.h \
- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
- ../../../include_windows/tchar.h ../Rar2Decoder.h \
- ../../../Common/MyCom.h ../../../Common/MyWindows.h ../../ICoder.h \
- ../../IStream.h ../../../Common/MyUnknown.h ../../../Common/Types.h \
- ../../IDecl.h ../../Common/InBuffer.h ../../Common/../IStream.h \
- ../../Common/../../Common/MyCom.h \
- ../../Common/../../Common/MyException.h \
- ../../Common/../../Common/MyWindows.h ../BitmDecoder.h ../../IStream.h \
- ../HuffmanDecoder.h ../../../Common/Types.h ../LzOutWindow.h \
- ../../Common/OutBuffer.h
-Rar3Decoder.o: ../Rar3Decoder.cpp ../../../myWindows/StdAfx.h \
- ../../../myWindows/config.h ../../../Common/MyWindows.h \
- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
- ../../../Common/../../C/Types.h ../../../Common/Types.h \
- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
- ../../../include_windows/tchar.h ../../../../C/Alloc.h \
- ../../Common/StreamUtils.h ../../Common/../IStream.h \
- ../../Common/../../Common/MyUnknown.h \
- ../../Common/../../Common/MyWindows.h ../../Common/../../Common/Types.h \
- ../../Common/../IDecl.h ../Rar3Decoder.h ../../../../C/Ppmd7.h \
- ../../../../C/Ppmd.h ../../../../C/Types.h ../../../../C/CpuArch.h \
- ../../../Common/MyCom.h ../../../Common/MyWindows.h ../../ICoder.h \
- ../../IStream.h ../../Common/InBuffer.h \
- ../../Common/../../Common/MyCom.h \
- ../../Common/../../Common/MyException.h ../BitmDecoder.h ../../IStream.h \
- ../HuffmanDecoder.h ../../../Common/Types.h ../Rar3Vm.h \
- ../../../../C/CpuArch.h ../../../Common/MyVector.h \
- ../../../Common/Defs.h
-Rar3Vm.o: ../Rar3Vm.cpp ../../../myWindows/StdAfx.h \
- ../../../myWindows/config.h ../../../Common/MyWindows.h \
- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
- ../../../Common/../../C/Types.h ../../../Common/Types.h \
- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
- ../../../include_windows/tchar.h ../../../../C/7zCrc.h \
- ../../../../C/Types.h ../../../../C/Alloc.h ../Rar3Vm.h \
- ../../../../C/CpuArch.h ../../../Common/MyVector.h \
- ../../../Common/Defs.h
-RarCodecsRegister.o: ../RarCodecsRegister.cpp ../../../myWindows/StdAfx.h \
- ../../../myWindows/config.h ../../../Common/MyWindows.h \
- ../../../Common/MyGuidDef.h ../../../Common/Types.h \
- ../../../Common/../../C/Types.h ../../../Common/Types.h \
- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \
- ../../../include_windows/tchar.h ../../Common/RegisterCodec.h \
- ../../Common/../Common/MethodId.h \
- ../../Common/../Common/../../Common/Types.h ../Rar1Decoder.h \
- ../../../Common/MyCom.h ../../../Common/MyWindows.h ../../ICoder.h \
- ../../IStream.h ../../../Common/MyUnknown.h ../../../Common/Types.h \
- ../../IDecl.h ../../Common/InBuffer.h ../../Common/../IStream.h \
- ../../Common/../../Common/MyCom.h \
- ../../Common/../../Common/MyException.h \
- ../../Common/../../Common/MyWindows.h ../BitmDecoder.h ../../IStream.h \
- ../HuffmanDecoder.h ../../../Common/Types.h ../LzOutWindow.h \
- ../../Common/OutBuffer.h ../Rar2Decoder.h ../Rar3Decoder.h \
- ../../../../C/Ppmd7.h ../../../../C/Ppmd.h ../../../../C/Types.h \
- ../../../../C/CpuArch.h ../Rar3Vm.h ../../../../C/CpuArch.h \
- ../../../Common/MyVector.h ../../../Common/Defs.h