react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/C/Lzma2DecMt.c

@@ -1,44 +1,44 @@
 /* Lzma2DecMt.c -- LZMA2 Decoder Multi-thread
-2023-04-13 : Igor Pavlov : Public domain */
+2019-02-02 : Igor Pavlov : Public domain */
 
 #include "Precomp.h"
 
 // #define SHOW_DEBUG_INFO
-// #define Z7_ST
 
 #ifdef SHOW_DEBUG_INFO
 #include <stdio.h>
 #endif
 
+#ifdef SHOW_DEBUG_INFO
+#define PRF(x) x
+#else
+#define PRF(x)
+#endif
+
+#define PRF_STR(s) PRF(printf("\n" s "\n"))
+#define PRF_STR_INT(s, d) PRF(printf("\n" s " %d\n", (unsigned)d))
+#define PRF_STR_INT_2(s, d1, d2) PRF(printf("\n" s " %d %d\n", (unsigned)d1, (unsigned)d2))
+
+// #define _7ZIP_ST
+
 #include "Alloc.h"
 
 #include "Lzma2Dec.h"
 #include "Lzma2DecMt.h"
 
-#ifndef Z7_ST
+#ifndef _7ZIP_ST
 #include "MtDec.h"
-
-#define LZMA2DECMT_OUT_BLOCK_MAX_DEFAULT (1 << 28)
 #endif
 
 
-#ifndef Z7_ST
-#ifdef SHOW_DEBUG_INFO
-#define PRF(x) x
-#else
-#define PRF(x)
-#endif
-#define PRF_STR(s) PRF(printf("\n" s "\n");)
-#define PRF_STR_INT_2(s, d1, d2) PRF(printf("\n" s " %d %d\n", (unsigned)d1, (unsigned)d2);)
-#endif
-
+#define LZMA2DECMT_OUT_BLOCK_MAX_DEFAULT (1 << 28)
 
 void Lzma2DecMtProps_Init(CLzma2DecMtProps *p)
 {
   p->inBufSize_ST = 1 << 20;
   p->outStep_ST = 1 << 20;
 
-  #ifndef Z7_ST
+  #ifndef _7ZIP_ST
   p->numThreads = 1;
   p->inBufSize_MT = 1 << 18;
   p->outBlockMax = LZMA2DECMT_OUT_BLOCK_MAX_DEFAULT;
@@ -48,7 +48,7 @@ void Lzma2DecMtProps_Init(CLzma2DecMtProps *p)
 
 
 
-#ifndef Z7_ST
+#ifndef _7ZIP_ST
 
 /* ---------- CLzma2DecMtThread ---------- */
 
@@ -81,7 +81,7 @@ typedef struct
 
 /* ---------- CLzma2DecMt ---------- */
 
-struct CLzma2DecMt
+typedef struct
 {
   // ISzAllocPtr alloc;
   ISzAllocPtr allocMid;
@@ -90,9 +90,9 @@ struct CLzma2DecMt
   CLzma2DecMtProps props;
   Byte prop;
   
-  ISeqInStreamPtr inStream;
-  ISeqOutStreamPtr outStream;
-  ICompressProgressPtr progress;
+  ISeqInStream *inStream;
+  ISeqOutStream *outStream;
+  ICompressProgress *progress;
 
   BoolInt finishMode;
   BoolInt outSize_Defined;
@@ -111,13 +111,14 @@ struct CLzma2DecMt
   size_t inPos;
   size_t inLim;
 
-  #ifndef Z7_ST
+  #ifndef _7ZIP_ST
   UInt64 outProcessed_Parse;
   BoolInt mtc_WasConstructed;
   CMtDec mtc;
-  CLzma2DecMtThread coders[MTDEC_THREADS_MAX];
+  CLzma2DecMtThread coders[MTDEC__THREADS_MAX];
   #endif
-};
+
+} CLzma2DecMt;
 
 
 
@@ -141,11 +142,11 @@ CLzma2DecMtHandle Lzma2DecMt_Create(ISzAllocPtr alloc, ISzAllocPtr allocMid)
 
   // Lzma2DecMtProps_Init(&p->props);
 
-  #ifndef Z7_ST
+  #ifndef _7ZIP_ST
   p->mtc_WasConstructed = False;
   {
     unsigned i;
-    for (i = 0; i < MTDEC_THREADS_MAX; i++)
+    for (i = 0; i < MTDEC__THREADS_MAX; i++)
     {
       CLzma2DecMtThread *t = &p->coders[i];
       t->dec_created = False;
@@ -155,16 +156,16 @@ CLzma2DecMtHandle Lzma2DecMt_Create(ISzAllocPtr alloc, ISzAllocPtr allocMid)
   }
   #endif
 
-  return (CLzma2DecMtHandle)(void *)p;
+  return p;
 }
 
 
-#ifndef Z7_ST
+#ifndef _7ZIP_ST
 
 static void Lzma2DecMt_FreeOutBufs(CLzma2DecMt *p)
 {
   unsigned i;
-  for (i = 0; i < MTDEC_THREADS_MAX; i++)
+  for (i = 0; i < MTDEC__THREADS_MAX; i++)
   {
     CLzma2DecMtThread *t = &p->coders[i];
     if (t->outBuf)
@@ -195,15 +196,13 @@ static void Lzma2DecMt_FreeSt(CLzma2DecMt *p)
 }
 
 
-// #define GET_CLzma2DecMt_p CLzma2DecMt *p = (CLzma2DecMt *)(void *)pp;
-
-void Lzma2DecMt_Destroy(CLzma2DecMtHandle p)
+void Lzma2DecMt_Destroy(CLzma2DecMtHandle pp)
 {
-  // GET_CLzma2DecMt_p
+  CLzma2DecMt *p = (CLzma2DecMt *)pp;
 
   Lzma2DecMt_FreeSt(p);
 
-  #ifndef Z7_ST
+  #ifndef _7ZIP_ST
 
   if (p->mtc_WasConstructed)
   {
@@ -212,7 +211,7 @@ void Lzma2DecMt_Destroy(CLzma2DecMtHandle p)
   }
   {
     unsigned i;
-    for (i = 0; i < MTDEC_THREADS_MAX; i++)
+    for (i = 0; i < MTDEC__THREADS_MAX; i++)
     {
       CLzma2DecMtThread *t = &p->coders[i];
       if (t->dec_created)
@@ -227,19 +226,19 @@ void Lzma2DecMt_Destroy(CLzma2DecMtHandle p)
 
   #endif
 
-  ISzAlloc_Free(p->alignOffsetAlloc.baseAlloc, p);
+  ISzAlloc_Free(p->alignOffsetAlloc.baseAlloc, pp);
 }
 
 
 
-#ifndef Z7_ST
+#ifndef _7ZIP_ST
 
 static void Lzma2DecMt_MtCallback_Parse(void *obj, unsigned coderIndex, CMtDecCallbackInfo *cc)
 {
   CLzma2DecMt *me = (CLzma2DecMt *)obj;
   CLzma2DecMtThread *t = &me->coders[coderIndex];
 
-  PRF_STR_INT_2("Parse", coderIndex, cc->srcSize)
+  PRF_STR_INT_2("Parse", coderIndex, cc->srcSize);
 
   cc->state = MTDEC_PARSE_CONTINUE;
 
@@ -247,7 +246,7 @@ static void Lzma2DecMt_MtCallback_Parse(void *obj, unsigned coderIndex, CMtDecCa
   {
     if (!t->dec_created)
     {
-      Lzma2Dec_CONSTRUCT(&t->dec)
+      Lzma2Dec_Construct(&t->dec);
       t->dec_created = True;
       AlignOffsetAlloc_CreateVTable(&t->alloc);
       {
@@ -256,7 +255,7 @@ static void Lzma2DecMt_MtCallback_Parse(void *obj, unsigned coderIndex, CMtDecCa
         const unsigned kNumAlignBits = 12;
         const unsigned kNumCacheLineBits = 7; /* <= kNumAlignBits */
         t->alloc.numAlignBits = kNumAlignBits;
-        t->alloc.offset = ((UInt32)coderIndex * (((unsigned)1 << 11) + (1 << 8) + (1 << 6))) & (((unsigned)1 << kNumAlignBits) - ((unsigned)1 << kNumCacheLineBits));
+        t->alloc.offset = ((UInt32)coderIndex * ((1 << 11) + (1 << 8) + (1 << 6))) & ((1 << kNumAlignBits) - (1 << kNumCacheLineBits));
         t->alloc.baseAlloc = me->alignOffsetAlloc.baseAlloc;
       }
     }
@@ -298,7 +297,7 @@ static void Lzma2DecMt_MtCallback_Parse(void *obj, unsigned coderIndex, CMtDecCa
     // that must be finished at position <= outBlockMax.
 
     {
-      const size_t srcOrig = cc->srcSize;
+      const SizeT srcOrig = cc->srcSize;
       SizeT srcSize_Point = 0;
       SizeT dicPos_Point = 0;
       
@@ -307,10 +306,10 @@ static void Lzma2DecMt_MtCallback_Parse(void *obj, unsigned coderIndex, CMtDecCa
 
       for (;;)
       {
-        SizeT srcCur = (SizeT)(srcOrig - cc->srcSize);
+        SizeT srcCur = srcOrig - cc->srcSize;
         
         status = Lzma2Dec_Parse(&t->dec,
-            (SizeT)limit - t->dec.decoder.dicPos,
+            limit - t->dec.decoder.dicPos,
             cc->src + cc->srcSize, &srcCur,
             checkFinishBlock);
 
@@ -334,7 +333,7 @@ static void Lzma2DecMt_MtCallback_Parse(void *obj, unsigned coderIndex, CMtDecCa
           if (t->dec.decoder.dicPos >= (1 << 14))
             break;
           dicPos_Point = t->dec.decoder.dicPos;
-          srcSize_Point = (SizeT)cc->srcSize;
+          srcSize_Point = cc->srcSize;
           continue;
         }
 
@@ -392,7 +391,7 @@ static void Lzma2DecMt_MtCallback_Parse(void *obj, unsigned coderIndex, CMtDecCa
             if (unpackRem != 0)
             {
               /* we also reserve space for max possible number of output bytes of current LZMA chunk */
-              size_t rem = limit - dicPos;
+              SizeT rem = limit - dicPos;
               if (rem > unpackRem)
                 rem = unpackRem;
               dicPos += rem;
@@ -445,7 +444,7 @@ static SRes Lzma2DecMt_MtCallback_PreCode(void *pp, unsigned coderIndex)
   }
 
   t->dec.decoder.dic = dest;
-  t->dec.decoder.dicBufSize = (SizeT)t->outPreSize;
+  t->dec.decoder.dicBufSize = t->outPreSize;
 
   t->needInit = True;
 
@@ -463,7 +462,7 @@ static SRes Lzma2DecMt_MtCallback_Code(void *pp, unsigned coderIndex,
 
   UNUSED_VAR(srcFinished)
 
-  PRF_STR_INT_2("Code", coderIndex, srcSize)
+  PRF_STR_INT_2("Code", coderIndex, srcSize);
 
   *inCodePos = t->inCodeSize;
   *outCodePos = 0;
@@ -477,13 +476,13 @@ static SRes Lzma2DecMt_MtCallback_Code(void *pp, unsigned coderIndex,
 
   {
     ELzmaStatus status;
-    SizeT srcProcessed = (SizeT)srcSize;
+    size_t srcProcessed = srcSize;
     BoolInt blockWasFinished =
         ((int)t->parseStatus == LZMA_STATUS_FINISHED_WITH_MARK
         || t->parseStatus == LZMA2_PARSE_STATUS_NEW_BLOCK);
     
     SRes res = Lzma2Dec_DecodeToDic(&t->dec,
-        (SizeT)t->outPreSize,
+        t->outPreSize,
         src, &srcProcessed,
         blockWasFinished ? LZMA_FINISH_END : LZMA_FINISH_ANY,
         &status);
@@ -528,7 +527,7 @@ static SRes Lzma2DecMt_MtCallback_Code(void *pp, unsigned coderIndex,
 
 static SRes Lzma2DecMt_MtCallback_Write(void *pp, unsigned coderIndex,
     BoolInt needWriteToStream,
-    const Byte *src, size_t srcSize, BoolInt isCross,
+    const Byte *src, size_t srcSize,
     BoolInt *needContinue, BoolInt *canRecode)
 {
   CLzma2DecMt *me = (CLzma2DecMt *)pp;
@@ -537,14 +536,12 @@ static SRes Lzma2DecMt_MtCallback_Write(void *pp, unsigned coderIndex,
   const Byte *data = t->outBuf;
   BoolInt needContinue2 = True;
 
-  UNUSED_VAR(src)
-  UNUSED_VAR(srcSize)
-  UNUSED_VAR(isCross)
-
-  PRF_STR_INT_2("Write", coderIndex, srcSize)
+  PRF_STR_INT_2("Write", coderIndex, srcSize);
 
   *needContinue = False;
   *canRecode = True;
+  UNUSED_VAR(src)
+  UNUSED_VAR(srcSize)
 
   if (
       // t->parseStatus == LZMA_STATUS_FINISHED_WITH_MARK
@@ -589,7 +586,7 @@ static SRes Lzma2DecMt_MtCallback_Write(void *pp, unsigned coderIndex,
         *needContinue = needContinue2;
         return SZ_OK;
       }
-      RINOK(MtProgress_ProgressAdd(&me->mtc.mtProgress, 0, 0))
+      RINOK(MtProgress_ProgressAdd(&me->mtc.mtProgress, 0, 0));
     }
   }
   
@@ -612,11 +609,11 @@ static SRes Lzma2Dec_Prepare_ST(CLzma2DecMt *p)
 {
   if (!p->dec_created)
   {
-    Lzma2Dec_CONSTRUCT(&p->dec)
+    Lzma2Dec_Construct(&p->dec);
     p->dec_created = True;
   }
 
-  RINOK(Lzma2Dec_Allocate(&p->dec, p->prop, &p->alignOffsetAlloc.vt))
+  RINOK(Lzma2Dec_Allocate(&p->dec, p->prop, &p->alignOffsetAlloc.vt));
 
   if (!p->inBuf || p->inBufSize != p->props.inBufSize_ST)
   {
@@ -635,7 +632,7 @@ static SRes Lzma2Dec_Prepare_ST(CLzma2DecMt *p)
 
 
 static SRes Lzma2Dec_Decode_ST(CLzma2DecMt *p
-    #ifndef Z7_ST
+    #ifndef _7ZIP_ST
     , BoolInt tMode
     #endif
     )
@@ -647,7 +644,7 @@ static SRes Lzma2Dec_Decode_ST(CLzma2DecMt *p
 
   CLzma2Dec *dec;
 
-  #ifndef Z7_ST
+  #ifndef _7ZIP_ST
   if (tMode)
   {
     Lzma2DecMt_FreeOutBufs(p);
@@ -655,7 +652,7 @@ static SRes Lzma2Dec_Decode_ST(CLzma2DecMt *p
   }
   #endif
 
-  RINOK(Lzma2Dec_Prepare_ST(p))
+  RINOK(Lzma2Dec_Prepare_ST(p));
 
   dec = &p->dec;
 
@@ -682,7 +679,7 @@ static SRes Lzma2Dec_Decode_ST(CLzma2DecMt *p
 
     if (inPos == inLim)
     {
-      #ifndef Z7_ST
+      #ifndef _7ZIP_ST
       if (tMode)
       {
         inData = MtDec_Read(&p->mtc, &inLim);
@@ -699,7 +696,7 @@ static SRes Lzma2Dec_Decode_ST(CLzma2DecMt *p
         inPos = 0;
         inLim = p->inBufSize;
         inData = p->inBuf;
-        p->readRes = ISeqInStream_Read(p->inStream, (void *)(p->inBuf), &inLim);
+        p->readRes = ISeqInStream_Read(p->inStream, (void *)inData, &inLim);
         // p->readProcessed += inLim;
         // inLim -= 5; p->readWasFinished = True; // for test
         if (inLim == 0 || p->readRes != SZ_OK)
@@ -711,7 +708,7 @@ static SRes Lzma2Dec_Decode_ST(CLzma2DecMt *p
     {
       SizeT next = dec->decoder.dicBufSize;
       if (next - wrPos > p->props.outStep_ST)
-        next = wrPos + (SizeT)p->props.outStep_ST;
+        next = wrPos + p->props.outStep_ST;
       size = next - dicPos;
     }
 
@@ -727,7 +724,7 @@ static SRes Lzma2Dec_Decode_ST(CLzma2DecMt *p
       }
     }
 
-    inProcessed = (SizeT)(inLim - inPos);
+    inProcessed = inLim - inPos;
     
     res = Lzma2Dec_DecodeToDic(dec, dicPos + size, inData + inPos, &inProcessed, finishMode, &status);
 
@@ -756,7 +753,7 @@ static SRes Lzma2Dec_Decode_ST(CLzma2DecMt *p
         dec->decoder.dicPos = 0;
       wrPos = dec->decoder.dicPos;
 
-      RINOK(res2)
+      RINOK(res2);
 
       if (needStop)
       {
@@ -789,7 +786,7 @@ static SRes Lzma2Dec_Decode_ST(CLzma2DecMt *p
       UInt64 outDelta = p->outProcessed - outPrev;
       if (inDelta >= (1 << 22) || outDelta >= (1 << 22))
       {
-        RINOK(ICompressProgress_Progress(p->progress, p->inProcessed, p->outProcessed))
+        RINOK(ICompressProgress_Progress(p->progress, p->inProcessed, p->outProcessed));
         inPrev = p->inProcessed;
         outPrev = p->outProcessed;
       }
@@ -799,20 +796,20 @@ static SRes Lzma2Dec_Decode_ST(CLzma2DecMt *p
 
 
 
-SRes Lzma2DecMt_Decode(CLzma2DecMtHandle p,
+SRes Lzma2DecMt_Decode(CLzma2DecMtHandle pp,
     Byte prop,
     const CLzma2DecMtProps *props,
-    ISeqOutStreamPtr outStream, const UInt64 *outDataSize, int finishMode,
+    ISeqOutStream *outStream, const UInt64 *outDataSize, int finishMode,
     // Byte *outBuf, size_t *outBufSize,
-    ISeqInStreamPtr inStream,
+    ISeqInStream *inStream,
     // const Byte *inData, size_t inDataSize,
     UInt64 *inProcessed,
     // UInt64 *outProcessed,
     int *isMT,
-    ICompressProgressPtr progress)
+    ICompressProgress *progress)
 {
-  // GET_CLzma2DecMt_p
-  #ifndef Z7_ST
+  CLzma2DecMt *p = (CLzma2DecMt *)pp;
+  #ifndef _7ZIP_ST
   BoolInt tMode;
   #endif
 
@@ -841,12 +838,11 @@ SRes Lzma2DecMt_Decode(CLzma2DecMtHandle p,
   p->inProcessed = 0;
 
   p->readWasFinished = False;
-  p->readRes = SZ_OK;
 
   *isMT = False;
 
   
-  #ifndef Z7_ST
+  #ifndef _7ZIP_ST
 
   tMode = False;
 
@@ -860,7 +856,7 @@ SRes Lzma2DecMt_Decode(CLzma2DecMtHandle p,
 
   if (p->props.numThreads > 1)
   {
-    IMtDecCallback2 vt;
+    IMtDecCallback vt;
 
     Lzma2DecMt_FreeSt(p);
 
@@ -940,7 +936,7 @@ SRes Lzma2DecMt_Decode(CLzma2DecMtHandle p,
       p->readWasFinished = p->mtc.readWasFinished;
       p->inProcessed = p->mtc.inProcessed;
       
-      PRF_STR("----- decoding ST -----")
+      PRF_STR("----- decoding ST -----");
     }
   }
 
@@ -951,7 +947,7 @@ SRes Lzma2DecMt_Decode(CLzma2DecMtHandle p,
 
   {
     SRes res = Lzma2Dec_Decode_ST(p
-        #ifndef Z7_ST
+        #ifndef _7ZIP_ST
         , tMode
         #endif
         );
@@ -959,16 +955,11 @@ SRes Lzma2DecMt_Decode(CLzma2DecMtHandle p,
     *inProcessed = p->inProcessed;
 
     // res = SZ_OK; // for test
-    if (res == SZ_ERROR_INPUT_EOF)
-    {
-      if (p->readRes != SZ_OK)
-        res = p->readRes;
-    }
-    else if (res == SZ_OK && p->readRes != SZ_OK)
+    if (res == SZ_OK && p->readRes != SZ_OK)
       res = p->readRes;
     
     /*
-    #ifndef Z7_ST
+    #ifndef _7ZIP_ST
     if (res == SZ_OK && tMode && p->mtc.parseRes != SZ_OK)
       res = p->mtc.parseRes;
     #endif
@@ -981,13 +972,13 @@ SRes Lzma2DecMt_Decode(CLzma2DecMtHandle p,
 
 /* ---------- Read from CLzma2DecMtHandle Interface ---------- */
 
-SRes Lzma2DecMt_Init(CLzma2DecMtHandle p,
+SRes Lzma2DecMt_Init(CLzma2DecMtHandle pp,
     Byte prop,
     const CLzma2DecMtProps *props,
     const UInt64 *outDataSize, int finishMode,
-    ISeqInStreamPtr inStream)
+    ISeqInStream *inStream)
 {
-  // GET_CLzma2DecMt_p
+  CLzma2DecMt *p = (CLzma2DecMt *)pp;
 
   if (prop > 40)
     return SZ_ERROR_UNSUPPORTED;
@@ -1016,11 +1007,11 @@ SRes Lzma2DecMt_Init(CLzma2DecMtHandle p,
 }
 
 
-SRes Lzma2DecMt_Read(CLzma2DecMtHandle p,
+SRes Lzma2DecMt_Read(CLzma2DecMtHandle pp,
     Byte *data, size_t *outSize,
     UInt64 *inStreamProcessed)
 {
-  // GET_CLzma2DecMt_p
+  CLzma2DecMt *p = (CLzma2DecMt *)pp;
   ELzmaFinishMode finishMode;
   SRes readRes;
   size_t size = *outSize;
@@ -1056,8 +1047,8 @@ SRes Lzma2DecMt_Read(CLzma2DecMtHandle p,
       readRes = ISeqInStream_Read(p->inStream, p->inBuf, &p->inLim);
     }
 
-    inCur = (SizeT)(p->inLim - p->inPos);
-    outCur = (SizeT)size;
+    inCur = p->inLim - p->inPos;
+    outCur = size;
 
     res = Lzma2Dec_DecodeToBuf(&p->dec, data, &outCur,
         p->inBuf + p->inPos, &inCur, finishMode, &status);
@@ -1089,7 +1080,3 @@ SRes Lzma2DecMt_Read(CLzma2DecMtHandle p,
       return readRes;
   }
 }
-
-#undef PRF
-#undef PRF_STR
-#undef PRF_STR_INT_2

package/harmony/pushy/src/main/cpp/lzma/C/Lzma2DecMt.h

@@ -1,8 +1,8 @@
 /* Lzma2DecMt.h -- LZMA2 Decoder Multi-thread
-2023-04-13 : Igor Pavlov : Public domain */
+2018-02-17 : Igor Pavlov : Public domain */
 
-#ifndef ZIP7_INC_LZMA2_DEC_MT_H
-#define ZIP7_INC_LZMA2_DEC_MT_H
+#ifndef __LZMA2_DEC_MT_H
+#define __LZMA2_DEC_MT_H
 
 #include "7zTypes.h"
 
@@ -13,7 +13,7 @@ typedef struct
   size_t inBufSize_ST;
   size_t outStep_ST;
   
-  #ifndef Z7_ST
+  #ifndef _7ZIP_ST
   unsigned numThreads;
   size_t inBufSize_MT;
   size_t outBlockMax;
@@ -38,9 +38,7 @@ SRes:
   SZ_ERROR_THREAD - error in multithreading functions (only for Mt version)
 */
 
-typedef struct CLzma2DecMt CLzma2DecMt;
-typedef CLzma2DecMt * CLzma2DecMtHandle;
-// Z7_DECLARE_HANDLE(CLzma2DecMtHandle)
+typedef void * CLzma2DecMtHandle;
 
 CLzma2DecMtHandle Lzma2DecMt_Create(ISzAllocPtr alloc, ISzAllocPtr allocMid);
 void Lzma2DecMt_Destroy(CLzma2DecMtHandle p);
@@ -48,11 +46,11 @@ void Lzma2DecMt_Destroy(CLzma2DecMtHandle p);
 SRes Lzma2DecMt_Decode(CLzma2DecMtHandle p,
     Byte prop,
     const CLzma2DecMtProps *props,
-    ISeqOutStreamPtr outStream,
+    ISeqOutStream *outStream,
     const UInt64 *outDataSize, // NULL means undefined
     int finishMode,            // 0 - partial unpacking is allowed, 1 - if lzma2 stream must be finished
     // Byte *outBuf, size_t *outBufSize,
-    ISeqInStreamPtr inStream,
+    ISeqInStream *inStream,
     // const Byte *inData, size_t inDataSize,
     
     // out variables:
@@ -60,7 +58,7 @@ SRes Lzma2DecMt_Decode(CLzma2DecMtHandle p,
     int *isMT,  /* out: (*isMT == 0), if single thread decoding was used */
 
     // UInt64 *outProcessed,
-    ICompressProgressPtr progress);
+    ICompressProgress *progress);
 
 
 /* ---------- Read from CLzma2DecMtHandle Interface ---------- */
@@ -69,7 +67,7 @@ SRes Lzma2DecMt_Init(CLzma2DecMtHandle pp,
     Byte prop,
     const CLzma2DecMtProps *props,
     const UInt64 *outDataSize, int finishMode,
-    ISeqInStreamPtr inStream);
+    ISeqInStream *inStream);
 
 SRes Lzma2DecMt_Read(CLzma2DecMtHandle pp,
     Byte *data, size_t *outSize,