Merge pull request #61 from fancycode/lzma-sdk-1900

Update to LZMA SDK 19.00

Author: fancycode

patches/streaming_encoder.patch

@@ -2,7 +2,7 @@ Index: pylzma/src/sdk/C/LzmaEnc.c
 ===================================================================
 --- pylzma.orig/src/sdk/C/LzmaEnc.c
 +++ pylzma/src/sdk/C/LzmaEnc.c
-@@ -2092,8 +2092,9 @@ void LzmaEnc_Destroy(CLzmaEncHandle p, I
+@@ -2259,8 +2259,9 @@ void LzmaEnc_Destroy(CLzmaEncHandle p, I
  }
 
 
@@ -13,7 +13,7 @@ Index: pylzma/src/sdk/C/LzmaEnc.c
    UInt32 nowPos32, startPos32;
    if (p->needInit)
    {
-@@ -2526,7 +2527,7 @@ static SRes LzmaEnc_AllocAndInit(CLzmaEn
+@@ -2715,7 +2716,7 @@ static SRes LzmaEnc_AllocAndInit(CLzmaEn
    return SZ_OK;
  }
 
@@ -22,12 +22,12 @@ Index: pylzma/src/sdk/C/LzmaEnc.c
      ISzAllocPtr alloc, ISzAllocPtr allocBig)
  {
    CLzmaEnc *p = (CLzmaEnc *)pp;
-@@ -2785,3 +2786,9 @@ SRes LzmaEncode(Byte *dest, SizeT *destL
+@@ -2974,3 +2975,9 @@ SRes LzmaEncode(Byte *dest, SizeT *destL
    LzmaEnc_Destroy(p, alloc, allocBig);
    return res;
  }
 +
-+Bool LzmaEnc_IsFinished(CLzmaEncHandle pp)
++BoolInt LzmaEnc_IsFinished(CLzmaEncHandle pp)
 +{
 +  CLzmaEnc *p = (CLzmaEnc *)pp;
 +  return p->finished;
@@ -44,7 +44,7 @@ Index: pylzma/src/sdk/C/LzmaEnc.h
 +
 +SRes LzmaEnc_Prepare(CLzmaEncHandle pp, ISeqOutStream *outStream, ISeqInStream *inStream, ISzAllocPtr alloc, ISzAllocPtr allocBig);
 +SRes LzmaEnc_CodeOneBlock(CLzmaEncHandle pp, UInt32 maxPackSize, UInt32 maxUnpackSize);
-+Bool LzmaEnc_IsFinished(CLzmaEncHandle pp);
++BoolInt LzmaEnc_IsFinished(CLzmaEncHandle pp);
 +void LzmaEnc_Finish(CLzmaEncHandle pp);
 +
  #endif

patches/strict_prototype.patch

@@ -2,14 +2,16 @@ Index: pylzma/src/sdk/C/CpuArch.h
 ===================================================================
 --- pylzma.orig/src/sdk/C/CpuArch.h
 +++ pylzma/src/sdk/C/CpuArch.h
-@@ -325,8 +325,8 @@ int x86cpuid_GetFirm(const Cx86cpuid *p)
+@@ -325,9 +325,9 @@ int x86cpuid_GetFirm(const Cx86cpuid *p)
  #define x86cpuid_GetModel(ver)  (((ver >> 12) &  0xF0) | ((ver >> 4) & 0xF))
  #define x86cpuid_GetStepping(ver) (ver & 0xF)
 
--Bool CPU_Is_InOrder();
--Bool CPU_Is_Aes_Supported();
-+Bool CPU_Is_InOrder(void);
-+Bool CPU_Is_Aes_Supported(void);
+-BoolInt CPU_Is_InOrder();
+-BoolInt CPU_Is_Aes_Supported();
+-BoolInt CPU_IsSupported_PageGB();
++BoolInt CPU_Is_InOrder(void);
++BoolInt CPU_Is_Aes_Supported(void);
++BoolInt CPU_IsSupported_PageGB(void);
 
  #endif
 

src/pylzma/pylzma.c

@@ -238,7 +238,7 @@ pylzma_bcj2_decode(PyObject *self, PyObject *args)
     dec.bufs[BCJ2_STREAM_RC] = (const Byte *) rc_data;
     dec.lims[BCJ2_STREAM_RC] = (const Byte *) (rc_data + rc_length);
 
-    dec.dest = PyBytes_AS_STRING(result);
+    dec.dest = (Byte *) PyBytes_AS_STRING(result);
     dec.destLim = dec.dest + dest_len;
     Bcj2Dec_Init(&dec);
 

src/pylzma/pylzma_streams.c

@@ -89,7 +89,7 @@ CreateMemoryInOutStream(CMemoryInOutStream *stream)
     stream->avail = INITIAL_BLOCKSIZE;
 }
 
-Bool
+BoolInt
 MemoryInOutStreamAppend(CMemoryInOutStream *stream, Byte *data, size_t size)
 {
     if (!size) {

src/pylzma/pylzma_streams.h

@@ -43,7 +43,7 @@ void CreateMemoryInStream(CMemoryInStream *stream, Byte *data, size_t size);
 typedef CMemoryInStream CMemoryInOutStream;
 
 void CreateMemoryInOutStream(CMemoryInOutStream *stream);
-Bool MemoryInOutStreamAppend(CMemoryInOutStream *stream, Byte *data, size_t size);
+BoolInt MemoryInOutStreamAppend(CMemoryInOutStream *stream, Byte *data, size_t size);
 
 typedef struct
 {

src/sdk/C/7zArcIn.c

@@ -1,5 +1,5 @@
 /* 7zArcIn.c -- 7z Input functions
-2017-04-03 : Igor Pavlov : Public domain */
+2018-12-31 : Igor Pavlov : Public domain */
 
 #include "Precomp.h"
 
@@ -19,7 +19,7 @@
   { MY_ALLOC(Byte, to, size, alloc); memcpy(to, from, size); }
 
 #define MY_ALLOC_ZE_AND_CPY(to, size, from, alloc) \
-  { if ((size) == 0) p = NULL; else { MY_ALLOC_AND_CPY(to, size, from, alloc) } }
+  { if ((size) == 0) to = NULL; else { MY_ALLOC_AND_CPY(to, size, from, alloc) } }
 
 #define k7zMajorVersion 0
 
@@ -666,7 +666,7 @@ static SRes ReadUnpackInfo(CSzAr *p,
   MY_ALLOC(size_t, p->FoCodersOffsets, (size_t)numFolders + 1, alloc);
   MY_ALLOC(UInt32, p->FoStartPackStreamIndex, (size_t)numFolders + 1, alloc);
   MY_ALLOC(UInt32, p->FoToCoderUnpackSizes, (size_t)numFolders + 1, alloc);
-  MY_ALLOC(Byte, p->FoToMainUnpackSizeIndex, (size_t)numFolders, alloc);
+  MY_ALLOC_ZE(Byte, p->FoToMainUnpackSizeIndex, (size_t)numFolders, alloc);
 
   startBufPtr = sd.Data;
 
@@ -1744,7 +1744,7 @@ size_t SzArEx_GetFullNameLen(const CSzArEx *p, size_t fileIndex)
 
 UInt16 *SzArEx_GetFullNameUtf16_Back(const CSzArEx *p, size_t fileIndex, UInt16 *dest)
 {
-  Bool needSlash;
+  BoolInt needSlash;
   if (!p->FileNameOffsets)
   {
     *(--dest) = 0;

src/sdk/C/7zDec.c

@@ -1,5 +1,5 @@
 /* 7zDec.c -- Decoding from 7z folder
-2017-04-03 : Igor Pavlov : Public domain */
+2019-02-02 : Igor Pavlov : Public domain */
 
 #include "Precomp.h"
 
@@ -44,7 +44,7 @@ typedef struct
   const Byte *end;
   const Byte *begin;
   UInt64 processed;
-  Bool extra;
+  BoolInt extra;
   SRes res;
   const ILookInStream *inStream;
 } CByteInToLook;
@@ -156,7 +156,7 @@ static SRes SzDecodeLzma(const Byte *props, unsigned propsSize, UInt64 inSize, I
     {
       SizeT inProcessed = (SizeT)lookahead, dicPos = state.dicPos;
       ELzmaStatus status;
-      res = LzmaDec_DecodeToDic(&state, outSize, inBuf, &inProcessed, LZMA_FINISH_END, &status);
+      res = LzmaDec_DecodeToDic(&state, outSize, (const Byte *)inBuf, &inProcessed, LZMA_FINISH_END, &status);
       lookahead -= inProcessed;
       inSize -= inProcessed;
       if (res != SZ_OK)
@@ -218,7 +218,7 @@ static SRes SzDecodeLzma2(const Byte *props, unsigned propsSize, UInt64 inSize,
     {
       SizeT inProcessed = (SizeT)lookahead, dicPos = state.decoder.dicPos;
       ELzmaStatus status;
-      res = Lzma2Dec_DecodeToDic(&state, outSize, inBuf, &inProcessed, LZMA_FINISH_END, &status);
+      res = Lzma2Dec_DecodeToDic(&state, outSize, (const Byte *)inBuf, &inProcessed, LZMA_FINISH_END, &status);
       lookahead -= inProcessed;
       inSize -= inProcessed;
       if (res != SZ_OK)
@@ -269,7 +269,7 @@ static SRes SzDecodeCopy(UInt64 inSize, ILookInStream *inStream, Byte *outBuffer
   return SZ_OK;
 }
 
-static Bool IS_MAIN_METHOD(UInt32 m)
+static BoolInt IS_MAIN_METHOD(UInt32 m)
 {
   switch (m)
   {
@@ -286,7 +286,7 @@ static Bool IS_MAIN_METHOD(UInt32 m)
   return False;
 }
 
-static Bool IS_SUPPORTED_CODER(const CSzCoderInfo *c)
+static BoolInt IS_SUPPORTED_CODER(const CSzCoderInfo *c)
 {
   return
       c->NumStreams == 1

src/sdk/C/7zTypes.h

@@ -1,5 +1,5 @@
 /* 7zTypes.h -- Basic types
-2017-07-17 : Igor Pavlov : Public domain */
+2018-08-04 : Igor Pavlov : Public domain */
 
 #ifndef __7Z_TYPES_H
 #define __7Z_TYPES_H
@@ -103,7 +103,8 @@ typedef UInt32 SizeT;
 typedef size_t SizeT;
 #endif
 
-typedef int Bool;
+typedef int BoolInt;
+/* typedef BoolInt Bool; */
 #define True 1
 #define False 0
 

src/sdk/C/7zVersion.h

@@ -1,7 +1,7 @@
-#define MY_VER_MAJOR 18
-#define MY_VER_MINOR 05
+#define MY_VER_MAJOR 19
+#define MY_VER_MINOR 00
 #define MY_VER_BUILD 0
-#define MY_VERSION_NUMBERS "18.05"
+#define MY_VERSION_NUMBERS "19.00"
 #define MY_VERSION MY_VERSION_NUMBERS
 
 #ifdef MY_CPU_NAME
@@ -10,7 +10,7 @@
   #define MY_VERSION_CPU MY_VERSION
 #endif
 
-#define MY_DATE "2018-04-30"
+#define MY_DATE "2019-02-21"
 #undef MY_COPYRIGHT
 #undef MY_VERSION_COPYRIGHT_DATE
 #define MY_AUTHOR_NAME "Igor Pavlov"

src/sdk/C/Bcj2Enc.c

@@ -1,5 +1,5 @@
 /* Bcj2Enc.c -- BCJ2 Encoder (Converter for x86 code)
-2017-04-28 : Igor Pavlov : Public domain */
+2019-02-02 : Igor Pavlov : Public domain */
 
 #include "Precomp.h"
 
@@ -52,7 +52,7 @@ void Bcj2Enc_Init(CBcj2Enc *p)
     p->probs[i] = kBitModelTotal >> 1;
 }
 
-static Bool MY_FAST_CALL RangeEnc_ShiftLow(CBcj2Enc *p)
+static BoolInt MY_FAST_CALL RangeEnc_ShiftLow(CBcj2Enc *p)
 {
   if ((UInt32)p->low < (UInt32)0xFF000000 || (UInt32)(p->low >> 32) != 0)
   {
@@ -165,7 +165,7 @@ static void Bcj2Enc_Encode_2(CBcj2Enc *p)
 
         {
           Byte context = (Byte)(num == 0 ? p->prevByte : src[-1]);
-          Bool needConvert;
+          BoolInt needConvert;
 
           p->bufs[BCJ2_STREAM_MAIN] = dest + 1;
           p->ip += (UInt32)num + 1;
@@ -253,7 +253,7 @@ void Bcj2Enc_Encode(CBcj2Enc *p)
     {
       const Byte *src = p->src;
       const Byte *srcLim = p->srcLim;
-      unsigned finishMode = p->finishMode;
+      EBcj2Enc_FinishMode finishMode = p->finishMode;
 
       p->src = p->temp;
       p->srcLim = p->temp + p->tempPos;