react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/C/Util/SfxSetup/Precomp.h

@@ -1,13 +1,10 @@
-/* Precomp.h -- Precomp
-2024-01-23 : Igor Pavlov : Public domain */
+/* Precomp.h -- StdAfx
+2013-06-16 : Igor Pavlov : Public domain */
 
-// #ifndef ZIP7_INC_PRECOMP_LOC_H
-// #define ZIP7_INC_PRECOMP_LOC_H
+#ifndef __7Z_PRECOMP_H
+#define __7Z_PRECOMP_H
 
-#if defined(_MSC_VER) && _MSC_VER >= 1800
-#pragma warning(disable : 4464) // relative include path contains '..'
-#endif
-
-#include "../../Precomp.h"
+#include "../../Compiler.h"
+#include "../../7zTypes.h"
 
-// #endif
+#endif

package/harmony/pushy/src/main/cpp/lzma/C/Util/SfxSetup/SfxSetup.c

@@ -1,5 +1,5 @@
 /* SfxSetup.c - 7z SFX Setup
-2024-01-24 : Igor Pavlov : Public domain */
+2019-02-02 : Igor Pavlov : Public domain */
 
 #include "Precomp.h"
 
@@ -26,12 +26,6 @@
 
 #define kInputBufSize ((size_t)1 << 18)
 
-
-#define wcscat lstrcatW
-#define wcslen (size_t)lstrlenW
-#define wcscpy lstrcpyW
-// wcsncpy() and lstrcpynW() work differently. We don't use them.
-
 static const char * const kExts[] =
 {
     "bat"
@@ -70,7 +64,7 @@ static unsigned FindExt(const wchar_t *s, unsigned *extLen)
   return len;
 }
 
-#define MAKE_CHAR_UPPER(c) ((((c) >= 'a' && (c) <= 'z') ? (c) - 0x20 : (c)))
+#define MAKE_CHAR_UPPER(c) ((((c) >= 'a' && (c) <= 'z') ? (c) -= 0x20 : (c)))
 
 static unsigned FindItem(const char * const *items, unsigned num, const wchar_t *s, unsigned len)
 {
@@ -78,13 +72,13 @@ static unsigned FindItem(const char * const *items, unsigned num, const wchar_t
   for (i = 0; i < num; i++)
   {
     const char *item = items[i];
-    const unsigned itemLen = (unsigned)strlen(item);
+    unsigned itemLen = (unsigned)strlen(item);
     unsigned j;
     if (len != itemLen)
       continue;
     for (j = 0; j < len; j++)
     {
-      const unsigned c = (Byte)item[j];
+      unsigned c = (Byte)item[j];
       if (c != s[j] && MAKE_CHAR_UPPER(c) != s[j])
         break;
     }
@@ -102,20 +96,10 @@ static BOOL WINAPI HandlerRoutine(DWORD ctrlType)
 }
 #endif
 
-
-#ifdef _CONSOLE
-static void PrintStr(const char *s)
-{
-  fputs(s, stdout);
-}
-#endif
-
 static void PrintErrorMessage(const char *message)
 {
   #ifdef _CONSOLE
-  PrintStr("\n7-Zip Error: ");
-  PrintStr(message);
-  PrintStr("\n");
+  printf("\n7-Zip Error: %s\n", message);
   #else
   #ifdef UNDER_CE
   WCHAR messageW[256 + 4];
@@ -195,7 +179,7 @@ static WRes RemoveDirWithSubItems(WCHAR *path)
   WIN32_FIND_DATAW fd;
   HANDLE handle;
   WRes res = 0;
-  const size_t len = wcslen(path);
+  size_t len = wcslen(path);
   wcscpy(path + len, L"*");
   handle = FindFirstFileW(path, &fd);
   path[len] = L'\0';
@@ -244,7 +228,7 @@ static WRes RemoveDirWithSubItems(WCHAR *path)
 }
 
 #ifdef _CONSOLE
-int Z7_CDECL main(void)
+int MY_CDECL main()
 #else
 int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
   #ifdef UNDER_CE
@@ -278,10 +262,10 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
   #ifdef _CONSOLE
   SetConsoleCtrlHandler(HandlerRoutine, TRUE);
   #else
-  UNUSED_VAR(hInstance)
-  UNUSED_VAR(hPrevInstance)
-  UNUSED_VAR(lpCmdLine)
-  UNUSED_VAR(nCmdShow)
+  UNUSED_VAR(hInstance);
+  UNUSED_VAR(hPrevInstance);
+  UNUSED_VAR(lpCmdLine);
+  UNUSED_VAR(nCmdShow);
   #endif
 
   CrcGenerateTable();
@@ -306,7 +290,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
       BoolInt quoteMode = False;
       for (;; cmdLineParams++)
       {
-        const wchar_t c = *cmdLineParams;
+        wchar_t c = *cmdLineParams;
         if (c == L'\"')
           quoteMode = !quoteMode;
         else if (c == 0 || (c == L' ' && !quoteMode))
@@ -340,7 +324,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
         unsigned k;
         for (k = 0; k < 8; k++)
         {
-          const unsigned t = value & 0xF;
+          unsigned t = value & 0xF;
           value >>= 4;
           s[7 - k] = (wchar_t)((t < 10) ? ('0' + t) : ('A' + (t - 10)));
         }
@@ -402,7 +386,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
     {
       lookStream.bufSize = kInputBufSize;
       lookStream.realStream = &archiveStream.vt;
-      LookToRead2_INIT(&lookStream)
+      LookToRead2_Init(&lookStream);
     }
   }
 
@@ -471,11 +455,11 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
           unsigned extLen;
           const WCHAR *name = temp + nameStartPos;
           unsigned len = (unsigned)wcslen(name);
-          const unsigned nameLen = FindExt(temp + nameStartPos, &extLen);
-          const unsigned extPrice = FindItem(kExts, sizeof(kExts) / sizeof(kExts[0]), name + len - extLen, extLen);
-          const unsigned namePrice = FindItem(kNames, sizeof(kNames) / sizeof(kNames[0]), name, nameLen);
+          unsigned nameLen = FindExt(temp + nameStartPos, &extLen);
+          unsigned extPrice = FindItem(kExts, sizeof(kExts) / sizeof(kExts[0]), name + len - extLen, extLen);
+          unsigned namePrice = FindItem(kNames, sizeof(kNames) / sizeof(kNames[0]), name, nameLen);
 
-          const unsigned price = namePrice + extPrice * 64 + (nameStartPos == 0 ? 0 : (1 << 12));
+          unsigned price = namePrice + extPrice * 64 + (nameStartPos == 0 ? 0 : (1 << 12));
           if (minPrice > price)
           {
             minPrice = price;
@@ -516,13 +500,12 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
         #endif
         
         {
-          const WRes res2 = File_Close(&outFile);
+          SRes res2 = File_Close(&outFile);
           if (res != SZ_OK)
             break;
-          if (res2 != 0)
+          if (res2 != SZ_OK)
           {
-            errorMessage = "Can't close output file";
-            res = SZ_ERROR_FAIL;
+            res = res2;
             break;
           }
         }
@@ -567,7 +550,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
     WCHAR oldCurDir[MAX_PATH + 2];
     oldCurDir[0] = 0;
     {
-      const DWORD needLen = GetCurrentDirectory(MAX_PATH + 1, oldCurDir);
+      DWORD needLen = GetCurrentDirectory(MAX_PATH + 1, oldCurDir);
       if (needLen == 0 || needLen > MAX_PATH)
         oldCurDir[0] = 0;
       SetCurrentDirectory(workCurDir);

package/harmony/pushy/src/main/cpp/lzma/C/Util/SfxSetup/makefile

@@ -1,14 +1,13 @@
 PROG = 7zS2.sfx
 MY_FIXED = 1
 
-CFLAGS = $(CFLAGS) \
-  -DZ7_EXTRACT_ONLY \
-
 C_OBJS = \
   $O\7zAlloc.obj \
   $O\7zArcIn.obj \
   $O\7zBuf.obj \
   $O\7zBuf2.obj \
+  $O\7zCrc.obj \
+  $O\7zCrcOpt.obj \
   $O\7zFile.obj \
   $O\7zDec.obj \
   $O\7zStream.obj \
@@ -25,13 +24,9 @@ C_OBJS = \
 7Z_OBJS = \
   $O\SfxSetup.obj \
 
-!include "../../../CPP/7zip/Crc.mak"
-# !include "../../../CPP/7zip/LzmaDec.mak"
-
 OBJS = \
   $(7Z_OBJS) \
   $(C_OBJS) \
-  $(ASM_OBJS) \
   $O\resource.res
 
 !include "../../../CPP/Build.mak"
@@ -40,5 +35,3 @@ $(7Z_OBJS): $(*B).c
 	$(COMPL_O1)
 $(C_OBJS): ../../$(*B).c
 	$(COMPL_O1)
-
-!include "../../Asm_c.mak"

package/harmony/pushy/src/main/cpp/lzma/C/Util/SfxSetup/makefile_con

@@ -1,8 +1,6 @@
 PROG = 7zS2con.sfx
 MY_FIXED = 1
-
-CFLAGS = $(CFLAGS) -D_CONSOLE \
-  -DZ7_EXTRACT_ONLY \
+CFLAGS = $(CFLAGS) -D_CONSOLE
 
 C_OBJS = \
   $O\7zAlloc.obj \

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

@@ -1,5 +1,5 @@
 /* Xz.c - Xz
-2024-03-01 : Igor Pavlov : Public domain */
+2017-05-12 : Igor Pavlov : Public domain */
 
 #include "Precomp.h"
 
@@ -41,7 +41,7 @@ void Xz_Free(CXzStream *p, ISzAllocPtr alloc)
 unsigned XzFlags_GetCheckSize(CXzStreamFlags f)
 {
   unsigned t = XzFlags_GetCheckType(f);
-  return (t == 0) ? 0 : ((unsigned)4 << ((t - 1) / 3));
+  return (t == 0) ? 0 : (4 << ((t - 1) / 3));
 }
 
 void XzCheck_Init(CXzCheck *p, unsigned mode)
@@ -52,7 +52,6 @@ void XzCheck_Init(CXzCheck *p, unsigned mode)
     case XZ_CHECK_CRC32: p->crc = CRC_INIT_VAL; break;
     case XZ_CHECK_CRC64: p->crc64 = CRC64_INIT_VAL; break;
     case XZ_CHECK_SHA256: Sha256_Init(&p->sha); break;
-    default: break;
   }
 }
 
@@ -63,7 +62,6 @@ void XzCheck_Update(CXzCheck *p, const void *data, size_t size)
     case XZ_CHECK_CRC32: p->crc = CrcUpdate(p->crc, data, size); break;
     case XZ_CHECK_CRC64: p->crc64 = Crc64Update(p->crc64, data, size); break;
     case XZ_CHECK_SHA256: Sha256_Update(&p->sha, (const Byte *)data, size); break;
-    default: break;
   }
 }
 
@@ -72,7 +70,7 @@ int XzCheck_Final(CXzCheck *p, Byte *digest)
   switch (p->mode)
   {
     case XZ_CHECK_CRC32:
-      SetUi32(digest, CRC_GET_DIGEST(p->crc))
+      SetUi32(digest, CRC_GET_DIGEST(p->crc));
       break;
     case XZ_CHECK_CRC64:
     {

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

@@ -1,24 +1,21 @@
 /* Xz.h - Xz interface
-Igor Pavlov : Public domain */
+2018-07-04 : Igor Pavlov : Public domain */
 
-#ifndef ZIP7_INC_XZ_H
-#define ZIP7_INC_XZ_H
+#ifndef __XZ_H
+#define __XZ_H
 
 #include "Sha256.h"
-#include "Delta.h"
 
 EXTERN_C_BEGIN
 
 #define XZ_ID_Subblock 1
 #define XZ_ID_Delta 3
-#define XZ_ID_X86   4
-#define XZ_ID_PPC   5
-#define XZ_ID_IA64  6
-#define XZ_ID_ARM   7
-#define XZ_ID_ARMT  8
+#define XZ_ID_X86 4
+#define XZ_ID_PPC 5
+#define XZ_ID_IA64 6
+#define XZ_ID_ARM 7
+#define XZ_ID_ARMT 8
 #define XZ_ID_SPARC 9
-#define XZ_ID_ARM64 0xa
-#define XZ_ID_RISCV 0xb
 #define XZ_ID_LZMA2 0x21
 
 unsigned Xz_ReadVarInt(const Byte *p, size_t maxSize, UInt64 *value);
@@ -50,13 +47,13 @@ typedef struct
   CXzFilter filters[XZ_NUM_FILTERS_MAX];
 } CXzBlock;
 
-#define XzBlock_GetNumFilters(p) (((unsigned)(p)->flags & XZ_BF_NUM_FILTERS_MASK) + 1)
+#define XzBlock_GetNumFilters(p) (((p)->flags & XZ_BF_NUM_FILTERS_MASK) + 1)
 #define XzBlock_HasPackSize(p)   (((p)->flags & XZ_BF_PACK_SIZE) != 0)
 #define XzBlock_HasUnpackSize(p) (((p)->flags & XZ_BF_UNPACK_SIZE) != 0)
 #define XzBlock_HasUnsupportedFlags(p) (((p)->flags & ~(XZ_BF_NUM_FILTERS_MASK | XZ_BF_PACK_SIZE | XZ_BF_UNPACK_SIZE)) != 0)
 
 SRes XzBlock_Parse(CXzBlock *p, const Byte *header);
-SRes XzBlock_ReadHeader(CXzBlock *p, ISeqInStreamPtr inStream, BoolInt *isIndex, UInt32 *headerSizeRes);
+SRes XzBlock_ReadHeader(CXzBlock *p, ISeqInStream *inStream, BoolInt *isIndex, UInt32 *headerSizeRes);
 
 /* ---------- xz stream ---------- */
 
@@ -104,7 +101,7 @@ typedef UInt16 CXzStreamFlags;
 unsigned XzFlags_GetCheckSize(CXzStreamFlags f);
 
 SRes Xz_ParseHeader(CXzStreamFlags *p, const Byte *buf);
-SRes Xz_ReadHeader(CXzStreamFlags *p, ISeqInStreamPtr inStream);
+SRes Xz_ReadHeader(CXzStreamFlags *p, ISeqInStream *inStream);
 
 typedef struct
 {
@@ -115,13 +112,11 @@ typedef struct
 typedef struct
 {
   CXzStreamFlags flags;
-  // Byte _pad[6];
   size_t numBlocks;
   CXzBlockSizes *blocks;
   UInt64 startOffset;
 } CXzStream;
 
-#define Xz_CONSTRUCT(p) { (p)->numBlocks = 0;  (p)->blocks = NULL;  (p)->flags = 0; }
 void Xz_Construct(CXzStream *p);
 void Xz_Free(CXzStream *p, ISzAllocPtr alloc);
 
@@ -137,14 +132,9 @@ typedef struct
   CXzStream *streams;
 } CXzs;
 
-#define Xzs_CONSTRUCT(p) { (p)->num = 0;  (p)->numAllocated = 0;  (p)->streams = NULL; }
 void Xzs_Construct(CXzs *p);
 void Xzs_Free(CXzs *p, ISzAllocPtr alloc);
-/*
-Xzs_ReadBackward() must be called for empty CXzs object.
-Xzs_ReadBackward() can return non empty object with (p->num != 0) even in case of error.
-*/
-SRes Xzs_ReadBackward(CXzs *p, ILookInStreamPtr inStream, Int64 *startOffset, ICompressProgressPtr progress, ISzAllocPtr alloc);
+SRes Xzs_ReadBackward(CXzs *p, ILookInStream *inStream, Int64 *startOffset, ICompressProgress *progress, ISzAllocPtr alloc);
 
 UInt64 Xzs_GetNumBlocks(const CXzs *p);
 UInt64 Xzs_GetUnpackSize(const CXzs *p);
@@ -170,9 +160,9 @@ typedef enum
 } ECoderFinishMode;
 
 
-typedef struct
+typedef struct _IStateCoder
 {
-  void *p; // state object;
+  void *p;
   void (*Free)(void *p, ISzAllocPtr alloc);
   SRes (*SetProps)(void *p, const Byte *props, size_t propSize, ISzAllocPtr alloc);
   void (*Init)(void *p);
@@ -184,20 +174,6 @@ typedef struct
 } IStateCoder;
 
 
-typedef struct
-{
-  UInt32 methodId;
-  UInt32 delta;
-  UInt32 ip;
-  UInt32 X86_State;
-  Byte delta_State[DELTA_STATE_SIZE];
-} CXzBcFilterStateBase;
-
-typedef SizeT (*Xz_Func_BcFilterStateBase_Filter)(CXzBcFilterStateBase *p, Byte *data, SizeT size);
-
-SRes Xz_StateCoder_Bc_SetFromMethod_Func(IStateCoder *p, UInt64 id,
-    Xz_Func_BcFilterStateBase_Filter func, ISzAllocPtr alloc);
-
 
 #define MIXCODER_NUM_FILTERS_MAX 4
 
@@ -240,13 +216,13 @@ typedef enum
 typedef struct
 {
   EXzState state;
-  unsigned pos;
+  UInt32 pos;
   unsigned alignPos;
   unsigned indexPreSize;
 
   CXzStreamFlags streamFlags;
   
-  unsigned blockHeaderSize;
+  UInt32 blockHeaderSize;
   UInt64 packSize;
   UInt64 unpackSize;
 
@@ -274,8 +250,8 @@ typedef struct
   size_t outBufSize;
   size_t outDataWritten; // the size of data in (outBuf) that were fully unpacked
 
-  UInt32 shaDigest32[SHA256_DIGEST_SIZE / 4];
-  Byte buf[XZ_BLOCK_HEADER_SIZE_MAX]; // it must be aligned for 4-bytes
+  Byte shaDigest[SHA256_DIGEST_SIZE];
+  Byte buf[XZ_BLOCK_HEADER_SIZE_MAX];
 } CXzUnpacker;
 
 /* alloc : aligned for cache line allocation is better */
@@ -301,10 +277,7 @@ void XzUnpacker_Free(CXzUnpacker *p);
     {
       XzUnpacker_Init()
       for()
-      {
         XzUnpacker_Code();
-      }
-      XzUnpacker_IsStreamWasFinished()
     }
     
   Interface-2 : Direct output buffer:
@@ -315,10 +288,7 @@ void XzUnpacker_Free(CXzUnpacker *p);
       XzUnpacker_Init()
       XzUnpacker_SetOutBufMode(); // to set output buffer and size
       for()
-      {
         XzUnpacker_Code(); // (dest = NULL) in XzUnpacker_Code()
-      }
-      XzUnpacker_IsStreamWasFinished()
     }
 
   Interface-3 : Direct output buffer : One call full decoding
@@ -326,7 +296,6 @@ void XzUnpacker_Free(CXzUnpacker *p);
     It uses Interface-2 internally.
     {
       XzUnpacker_CodeFull()
-      XzUnpacker_IsStreamWasFinished()
     }
 */
 
@@ -340,12 +309,8 @@ Returns:
   SZ_OK
     status:
       CODER_STATUS_NOT_FINISHED,
-      CODER_STATUS_NEEDS_MORE_INPUT - the decoder can return it in two cases:
-         1) it needs more input data to finish current xz stream
-         2) xz stream was finished successfully. But the decoder supports multiple
-            concatented xz streams. So it expects more input data for new xz streams.
-         Call XzUnpacker_IsStreamWasFinished() to check that latest xz stream was finished successfully.
-
+      CODER_STATUS_NEEDS_MORE_INPUT - maybe there are more xz streams,
+                                      call XzUnpacker_IsStreamWasFinished to check that current stream was finished
   SZ_ERROR_MEM  - Memory allocation error
   SZ_ERROR_DATA - Data error
   SZ_ERROR_UNSUPPORTED - Unsupported method or method properties
@@ -370,17 +335,12 @@ SRes XzUnpacker_CodeFull(CXzUnpacker *p, Byte *dest, SizeT *destLen,
     const Byte *src, SizeT *srcLen,
     ECoderFinishMode finishMode, ECoderStatus *status);
 
-/*
-If you decode full xz stream(s), then you can call XzUnpacker_IsStreamWasFinished()
-after successful XzUnpacker_CodeFull() or after last call of XzUnpacker_Code().
-*/
-
 BoolInt XzUnpacker_IsStreamWasFinished(const CXzUnpacker *p);
 
 /*
-XzUnpacker_GetExtraSize() returns then number of unconfirmed bytes,
+XzUnpacker_GetExtraSize() returns then number of uncofirmed bytes,
  if it's in (XZ_STATE_STREAM_HEADER) state or in (XZ_STATE_STREAM_PADDING) state.
-These bytes can be some data after xz archive, or
+These bytes can be some bytes after xz archive, or
 it can be start of new xz stream.
  
 Call XzUnpacker_GetExtraSize() after XzUnpacker_Code() function to detect real size of
@@ -411,57 +371,29 @@ BoolInt XzUnpacker_IsBlockFinished(const CXzUnpacker *p);
 
 
 
-
-
-
-/* ---- Single-Thread and Multi-Thread xz Decoding with Input/Output Streams ---- */
-
-/*
-  if (CXzDecMtProps::numThreads > 1), the decoder can try to use
-  Multi-Threading. The decoder analyses xz block header, and if
-  there are pack size and unpack size values stored in xz block header,
-  the decoder reads compressed data of block to internal buffers,
-  and then it can start parallel decoding, if there are another blocks.
-  The decoder can switch back to Single-Thread decoding after some conditions.
-
-  The sequence of calls for xz decoding with in/out Streams:
-  {
-    XzDecMt_Create()
-    XzDecMtProps_Init(XzDecMtProps) to set default values of properties
-    // then you can change some XzDecMtProps parameters with required values
-    // here you can set the number of threads and (memUseMax) - the maximum
-    Memory usage for multithreading decoding.
-    for()
-    {
-      XzDecMt_Decode() // one call per one file
-    }
-    XzDecMt_Destroy()
-  }
-*/
+/* ---------- Multi Threading Decoding ---------- */
 
 
 typedef struct
 {
-  size_t inBufSize_ST;    // size of input buffer for Single-Thread decoding
-  size_t outStep_ST;      // size of output buffer for Single-Thread decoding
-  BoolInt ignoreErrors;   // if set to 1, the decoder can ignore some errors and it skips broken parts of data.
+  size_t inBufSize_ST;
+  size_t outStep_ST;
+  BoolInt ignoreErrors;
   
-  #ifndef Z7_ST
-  unsigned numThreads;    // the number of threads for Multi-Thread decoding. if (umThreads == 1) it will use Single-thread decoding
-  size_t inBufSize_MT;    // size of small input data buffers for Multi-Thread decoding. Big number of such small buffers can be created
-  size_t memUseMax;       // the limit of total memory usage for Multi-Thread decoding.
-                          // it's recommended to set (memUseMax) manually to value that is smaller of total size of RAM in computer.
+  #ifndef _7ZIP_ST
+  unsigned numThreads;
+  size_t inBufSize_MT;
+  size_t memUseMax;
   #endif
 } CXzDecMtProps;
 
 void XzDecMtProps_Init(CXzDecMtProps *p);
 
-typedef struct CXzDecMt CXzDecMt;
-typedef CXzDecMt * CXzDecMtHandle;
-// Z7_DECLARE_HANDLE(CXzDecMtHandle)
+
+typedef void * CXzDecMtHandle;
 
 /*
-  alloc    : XzDecMt uses CAlignOffsetAlloc internally for addresses allocated by (alloc).
+  alloc    : XzDecMt uses CAlignOffsetAlloc for addresses allocated by (alloc).
   allocMid : for big allocations, aligned allocation is better
 */
 
@@ -475,46 +407,33 @@ typedef struct
   Byte NumStreams_Defined;
   Byte NumBlocks_Defined;
 
-  Byte DataAfterEnd;      // there are some additional data after good xz streams, and that data is not new xz stream.
+  Byte DataAfterEnd;
   Byte DecodingTruncated; // Decoding was Truncated, we need only partial output data
 
-  UInt64 InSize;          // pack size processed. That value doesn't include the data after
-                          // end of xz stream, if that data was not correct
+  UInt64 InSize;  // pack size processed
   UInt64 OutSize;
 
   UInt64 NumStreams;
   UInt64 NumBlocks;
 
-  SRes DecodeRes;         // the error code of xz streams data decoding
-  SRes ReadRes;           // error code from ISeqInStream:Read()
-  SRes ProgressRes;       // error code from ICompressProgress:Progress()
+  SRes DecodeRes;
+  SRes ReadRes;
+  SRes ProgressRes;
+  SRes CombinedRes;
+  SRes CombinedRes_Type;
 
-  SRes CombinedRes;       // Combined result error code that shows main rusult
-                          // = S_OK, if there is no error.
-                          // but check also (DataAfterEnd) that can show additional minor errors.
- 
-  SRes CombinedRes_Type;  // = SZ_ERROR_READ,     if error from ISeqInStream
-                          // = SZ_ERROR_PROGRESS, if error from ICompressProgress
-                          // = SZ_ERROR_WRITE,    if error from ISeqOutStream
-                          // = SZ_ERROR_* codes for decoding
 } CXzStatInfo;
 
 void XzStatInfo_Clear(CXzStatInfo *p);
 
 /*
-
 XzDecMt_Decode()
-SRes: it's combined decoding result. It also is equal to stat->CombinedRes.
-
-  SZ_OK               - no error
-                        check also output value in (stat->DataAfterEnd)
-                        that can show additional possible error
-
+SRes:
+  SZ_OK               - OK
   SZ_ERROR_MEM        - Memory allocation error
   SZ_ERROR_NO_ARCHIVE - is not xz archive
   SZ_ERROR_ARCHIVE    - Headers error
   SZ_ERROR_DATA       - Data Error
-  SZ_ERROR_UNSUPPORTED - Unsupported method or method properties
   SZ_ERROR_CRC        - CRC Error
   SZ_ERROR_INPUT_EOF  - it needs more input data
   SZ_ERROR_WRITE      - ISeqOutStream error
@@ -528,14 +447,13 @@ SRes XzDecMt_Decode(CXzDecMtHandle p,
     const CXzDecMtProps *props,
     const UInt64 *outDataSize, // NULL means undefined
     int finishMode,            // 0 - partial unpacking is allowed, 1 - xz stream(s) must be finished
-    ISeqOutStreamPtr outStream,
+    ISeqOutStream *outStream,
     // Byte *outBuf, size_t *outBufSize,
-    ISeqInStreamPtr inStream,
+    ISeqInStream *inStream,
     // const Byte *inData, size_t inDataSize,
-    CXzStatInfo *stat,         // out: decoding results and statistics
-    int *isMT,                 // out: 0 means that ST (Single-Thread) version was used
-                               //      1 means that MT (Multi-Thread) version was used
-    ICompressProgressPtr progress);
+    CXzStatInfo *stat,
+    int *isMT,                 // 0 means that ST (Single-Thread) version was used
+    ICompressProgress *progress);
 
 EXTERN_C_END