react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Compress/XzDecoder.h

@@ -1,7 +1,7 @@
 // XzDecoder.h
 
-#ifndef ZIP7_INC_XZ_DECODER_H
-#define ZIP7_INC_XZ_DECODER_H
+#ifndef __XZ_DECODER_H
+#define __XZ_DECODER_H
 
 #include "../../../C/Xz.h"
 
@@ -38,46 +38,52 @@ struct CDecoder
       XzDecMt_Destroy(xz);
   }
 
-  /* Decode() can return S_OK, if there is data after good xz streams, and that data is not new xz stream.
-     check also (Stat.DataAfterEnd) flag */
-
+  /* Decode() can return ERROR code only if there is progress or stream error.
+     Decode() returns S_OK in case of xz decoding error, but DecodeRes and CStatInfo contain error information */
   HRESULT Decode(ISequentialInStream *seqInStream, ISequentialOutStream *outStream,
       const UInt64 *outSizeLimit, bool finishStream, ICompressProgressInfo *compressProgress);
 };
 
 
-class CComDecoder Z7_final:
+class CComDecoder:
   public ICompressCoder,
   public ICompressSetFinishMode,
   public ICompressGetInStreamProcessedSize,
- #ifndef Z7_ST
+
+  #ifndef _7ZIP_ST
   public ICompressSetCoderMt,
   public ICompressSetMemLimit,
- #endif
+  #endif
+
   public CMyUnknownImp,
   public CDecoder
 {
-  Z7_COM_QI_BEGIN2(ICompressCoder)
-  Z7_COM_QI_ENTRY(ICompressSetFinishMode)
-  Z7_COM_QI_ENTRY(ICompressGetInStreamProcessedSize)
- #ifndef Z7_ST
-  Z7_COM_QI_ENTRY(ICompressSetCoderMt)
-  Z7_COM_QI_ENTRY(ICompressSetMemLimit)
- #endif
-  Z7_COM_QI_END
-  Z7_COM_ADDREF_RELEASE
-
-  Z7_IFACE_COM7_IMP(ICompressCoder)
-  Z7_IFACE_COM7_IMP(ICompressSetFinishMode)
-  Z7_IFACE_COM7_IMP(ICompressGetInStreamProcessedSize)
- #ifndef Z7_ST
-  Z7_IFACE_COM7_IMP(ICompressSetCoderMt)
-  Z7_IFACE_COM7_IMP(ICompressSetMemLimit)
- #endif
-
   bool _finishStream;
 
 public:
+  MY_QUERYINTERFACE_BEGIN2(ICompressCoder)
+
+  MY_QUERYINTERFACE_ENTRY(ICompressSetFinishMode)
+  MY_QUERYINTERFACE_ENTRY(ICompressGetInStreamProcessedSize)
+
+  #ifndef _7ZIP_ST
+  MY_QUERYINTERFACE_ENTRY(ICompressSetCoderMt)
+  MY_QUERYINTERFACE_ENTRY(ICompressSetMemLimit)
+  #endif
+  
+  MY_QUERYINTERFACE_END
+  MY_ADDREF_RELEASE
+
+  STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
+      const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
+  STDMETHOD(SetFinishMode)(UInt32 finishMode);
+  STDMETHOD(GetInStreamProcessedSize)(UInt64 *value);
+
+  #ifndef _7ZIP_ST
+  STDMETHOD(SetNumberOfThreads)(UInt32 numThreads);
+  STDMETHOD(SetMemLimit)(UInt64 memUsage);
+  #endif
+
   CComDecoder(): _finishStream(false) {}
 };
 

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Compress/XzEncoder.cpp

@@ -15,7 +15,9 @@
 namespace NCompress {
 
 namespace NLzma2 {
+
 HRESULT SetLzma2Prop(PROPID propID, const PROPVARIANT &prop, CLzma2EncProps &lzma2Props);
+
 }
 
 namespace NXz {
@@ -61,7 +63,7 @@ static const CMethodNamePair g_NamePairs[] =
 
 static int FilterIdFromName(const wchar_t *name)
 {
-  for (unsigned i = 0; i < Z7_ARRAY_SIZE(g_NamePairs); i++)
+  for (unsigned i = 0; i < ARRAY_SIZE(g_NamePairs); i++)
   {
     const CMethodNamePair &pair = g_NamePairs[i];
     if (StringsAreEqualNoCase_Ascii(name, pair.Name))
@@ -128,7 +130,7 @@ HRESULT CEncoder::SetCoderProp(PROPID propID, const PROPVARIANT &prop)
   {
     if (prop.vt == VT_UI4)
     {
-      const UInt32 id32 = prop.ulVal;
+      UInt32 id32 = prop.ulVal;
       if (id32 == XZ_ID_Delta)
         return E_INVALIDARG;
       xzProps.filterProps.id = prop.ulVal;
@@ -154,20 +156,20 @@ HRESULT CEncoder::SetCoderProp(PROPID propID, const PROPVARIANT &prop)
         }
         else
         {
-          const int filterId = FilterIdFromName(prop.bstrVal);
+          int filterId = FilterIdFromName(prop.bstrVal);
           if (filterId < 0 /* || filterId == XZ_ID_LZMA2 */)
             return E_INVALIDARG;
-          id32 = (UInt32)(unsigned)filterId;
+          id32 = filterId;
         }
       }
       
       if (id32 == XZ_ID_Delta)
       {
-        const wchar_t c = *name;
+        wchar_t c = *name;
         if (c != '-' && c != ':')
           return E_INVALIDARG;
         name++;
-        const UInt32 delta = ConvertStringToUInt32(name, &end);
+        UInt32 delta = ConvertStringToUInt32(name, &end);
         if (end == name || *end != 0 || delta == 0 || delta > 256)
           return E_INVALIDARG;
         xzProps.filterProps.delta = delta;
@@ -183,14 +185,14 @@ HRESULT CEncoder::SetCoderProp(PROPID propID, const PROPVARIANT &prop)
 }
 
 
-Z7_COM7F_IMF(CEncoder::SetCoderProperties(const PROPID *propIDs,
-    const PROPVARIANT *coderProps, UInt32 numProps))
+STDMETHODIMP CEncoder::SetCoderProperties(const PROPID *propIDs,
+    const PROPVARIANT *coderProps, UInt32 numProps)
 {
   XzProps_Init(&xzProps);
 
   for (UInt32 i = 0; i < numProps; i++)
   {
-    RINOK(SetCoderProp(propIDs[i], coderProps[i]))
+    RINOK(SetCoderProp(propIDs[i], coderProps[i]));
   }
   
   return S_OK;
@@ -198,13 +200,13 @@ Z7_COM7F_IMF(CEncoder::SetCoderProperties(const PROPID *propIDs,
 }
 
 
-Z7_COM7F_IMF(CEncoder::SetCoderPropertiesOpt(const PROPID *propIDs,
-    const PROPVARIANT *coderProps, UInt32 numProps))
+STDMETHODIMP CEncoder::SetCoderPropertiesOpt(const PROPID *propIDs,
+    const PROPVARIANT *coderProps, UInt32 numProps)
 {
   for (UInt32 i = 0; i < numProps; i++)
   {
     const PROPVARIANT &prop = coderProps[i];
-    const PROPID propID = propIDs[i];
+    PROPID propID = propIDs[i];
     if (propID == NCoderPropID::kExpectedDataSize)
       if (prop.vt == VT_UI8)
         XzEnc_SetDataSize(_encoder, prop.uhVal.QuadPart);
@@ -216,8 +218,8 @@ Z7_COM7F_IMF(CEncoder::SetCoderPropertiesOpt(const PROPID *propIDs,
 #define RET_IF_WRAP_ERROR(wrapRes, sRes, sResErrorCode) \
   if (wrapRes != S_OK /* && (sRes == SZ_OK || sRes == sResErrorCode) */) return wrapRes;
 
-Z7_COM7F_IMF(CEncoder::Code(ISequentialInStream *inStream, ISequentialOutStream *outStream,
-    const UInt64 * /* inSize */, const UInt64 * /* outSize */, ICompressProgressInfo *progress))
+STDMETHODIMP CEncoder::Code(ISequentialInStream *inStream, ISequentialOutStream *outStream,
+    const UInt64 * /* inSize */, const UInt64 * /* outSize */, ICompressProgressInfo *progress)
 {
   CSeqInStreamWrap inWrap;
   CSeqOutStreamWrap outWrap;

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Compress/XzEncoder.h

@@ -1,7 +1,7 @@
 // XzEncoder.h
 
-#ifndef ZIP7_INC_XZ_ENCODER_H
-#define ZIP7_INC_XZ_ENCODER_H
+#ifndef __XZ_ENCODER_H
+#define __XZ_ENCODER_H
 
 #include "../../../C/XzEnc.h"
 
@@ -12,22 +12,33 @@
 namespace NCompress {
 namespace NXz {
 
-Z7_CLASS_IMP_COM_3(
-  CEncoder
-  , ICompressCoder
-  , ICompressSetCoderProperties
-  , ICompressSetCoderPropertiesOpt
-)
+
+class CEncoder:
+  public ICompressCoder,
+  public ICompressSetCoderProperties,
+  public ICompressSetCoderPropertiesOpt,
+  public CMyUnknownImp
+{
   CXzEncHandle _encoder;
 public:
   CXzProps xzProps;
 
+  MY_UNKNOWN_IMP3(
+      ICompressCoder,
+      ICompressSetCoderProperties,
+      ICompressSetCoderPropertiesOpt)
+
   void InitCoderProps();
   HRESULT SetCheckSize(UInt32 checkSizeInBytes);
   HRESULT SetCoderProp(PROPID propID, const PROPVARIANT &prop);
+  
+  STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
+      const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
+  STDMETHOD(SetCoderProperties)(const PROPID *propIDs, const PROPVARIANT *props, UInt32 numProps);
+  STDMETHOD(SetCoderPropertiesOpt)(const PROPID *propIDs, const PROPVARIANT *props, UInt32 numProps);
 
   CEncoder();
-  ~CEncoder();
+  virtual ~CEncoder();
 };
 
 }}

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Crc.mak

@@ -1,6 +1,6 @@
 C_OBJS = $(C_OBJS) \
   $O\7zCrc.obj
-!IF defined(USE_NO_ASM) || defined(USE_C_CRC) || "$(PLATFORM)" == "ia64" || "$(PLATFORM)" == "mips" || "$(PLATFORM)" == "arm" || "$(PLATFORM)" == "arm64"
+!IF "$(PLATFORM)" == "ia64" || "$(PLATFORM)" == "mips" || "$(PLATFORM)" == "arm" || "$(PLATFORM)" == "arm64"
 C_OBJS = $(C_OBJS) \
 !ELSE
 ASM_OBJS = $(ASM_OBJS) \

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Crc64.mak

@@ -1,6 +1,6 @@
 C_OBJS = $(C_OBJS) \
   $O\XzCrc64.obj
-!IF defined(USE_NO_ASM) || defined(USE_C_CRC64) || "$(PLATFORM)" == "ia64" || "$(PLATFORM)" == "mips" || "$(PLATFORM)" == "arm" || "$(PLATFORM)" == "arm64"
+!IF "$(PLATFORM)" == "ia64" || "$(PLATFORM)" == "mips" || "$(PLATFORM)" == "arm" || "$(PLATFORM)" == "arm64"
 C_OBJS = $(C_OBJS) \
 !ELSE
 ASM_OBJS = $(ASM_OBJS) \

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Crypto/7zAes.cpp

@@ -2,13 +2,11 @@
 
 #include "StdAfx.h"
 
-#include "../../../C/CpuArch.h"
 #include "../../../C/Sha256.h"
 
 #include "../../Common/ComTry.h"
-#include "../../Common/MyBuffer2.h"
 
-#ifndef Z7_ST
+#ifndef _7ZIP_ST
 #include "../../Windows/Synchronization.h"
 #endif
 
@@ -17,7 +15,7 @@
 #include "7zAes.h"
 #include "MyAes.h"
 
-#ifndef Z7_EXTRACT_ONLY
+#ifndef EXTRACT_ONLY
 #include "RandGen.h"
 #endif
 
@@ -50,66 +48,31 @@ void CKeyInfo::CalcKey()
   }
   else
   {
-    const unsigned kUnrPow = 6;
-    const UInt32 numUnroll = (UInt32)1 << (NumCyclesPower <= kUnrPow ? (unsigned)NumCyclesPower : kUnrPow);
-
-    const size_t bufSize = 8 + SaltSize + Password.Size();
-    const size_t unrollSize = bufSize * numUnroll;
-
-    // MY_ALIGN (16)
-    // CSha256 sha;
-    const size_t shaAllocSize = sizeof(CSha256) + unrollSize + bufSize * 2;
-    CAlignedBuffer1 sha(shaAllocSize);
-    Byte *buf = sha + sizeof(CSha256);
-
+    size_t bufSize = 8 + SaltSize + Password.Size();
+    CObjArray<Byte> buf(bufSize);
     memcpy(buf, Salt, SaltSize);
     memcpy(buf + SaltSize, Password, Password.Size());
-    memset(buf + bufSize - 8, 0, 8);
     
-    Sha256_Init((CSha256 *)(void *)(Byte *)sha);
+    CSha256 sha;
+    Sha256_Init(&sha);
+    
+    Byte *ctr = buf + SaltSize + Password.Size();
+    
+    for (unsigned i = 0; i < 8; i++)
+      ctr[i] = 0;
     
-    {
-      {
-        Byte *dest = buf;
-        for (UInt32 i = 1; i < numUnroll; i++)
-        {
-          dest += bufSize;
-          memcpy(dest, buf, bufSize);
-        }
-      }
-
-      const UInt32 numRounds = (UInt32)1 << NumCyclesPower;
-      UInt32 r = 0;
-      do
-      {
-        Byte *dest = buf + bufSize - 8;
-        UInt32 i = r;
-        r += numUnroll;
-        do
-        {
-          SetUi32(dest, i)  i++; dest += bufSize;
-          // SetUi32(dest, i)  i++; dest += bufSize;
-        }
-        while (i < r);
-        Sha256_Update((CSha256 *)(void *)(Byte *)sha, buf, unrollSize);
-      }
-      while (r < numRounds);
-    }
-    /*
     UInt64 numRounds = (UInt64)1 << NumCyclesPower;
 
     do
     {
-      Sha256_Update((CSha256 *)(Byte *)sha, buf, bufSize);
+      Sha256_Update(&sha, buf, bufSize);
       for (unsigned i = 0; i < 8; i++)
         if (++(ctr[i]) != 0)
           break;
     }
     while (--numRounds != 0);
-    */
 
-    Sha256_Final((CSha256 *)(void *)(Byte *)sha, Key);
-    memset(sha, 0, shaAllocSize);
+    Sha256_Final(&sha, Key);
   }
 }
 
@@ -154,7 +117,7 @@ void CKeyInfoCache::Add(const CKeyInfo &key)
 
 static CKeyInfoCache g_GlobalKeyCache(32);
 
-#ifndef Z7_ST
+#ifndef _7ZIP_ST
   static NWindows::NSynchronization::CCriticalSection g_GlobalKeyCacheCriticalSection;
   #define MT_LOCK NWindows::NSynchronization::CCriticalSectionLock lock(g_GlobalKeyCacheCriticalSection);
 #else
@@ -186,10 +149,10 @@ void CBase::PrepareKey()
     g_GlobalKeyCache.FindAndAdd(_key);
 }
 
-#ifndef Z7_EXTRACT_ONLY
+#ifndef EXTRACT_ONLY
 
 /*
-Z7_COM7F_IMF(CEncoder::ResetSalt())
+STDMETHODIMP CEncoder::ResetSalt()
 {
   _key.SaltSize = 4;
   g_RandomGenerator.Generate(_key.Salt, _key.SaltSize);
@@ -197,7 +160,7 @@ Z7_COM7F_IMF(CEncoder::ResetSalt())
 }
 */
 
-Z7_COM7F_IMF(CEncoder::ResetInitVector())
+STDMETHODIMP CEncoder::ResetInitVector()
 {
   for (unsigned i = 0; i < sizeof(_iv); i++)
     _iv[i] = 0;
@@ -206,7 +169,7 @@ Z7_COM7F_IMF(CEncoder::ResetInitVector())
   return S_OK;
 }
 
-Z7_COM7F_IMF(CEncoder::WriteCoderProperties(ISequentialOutStream *outStream))
+STDMETHODIMP CEncoder::WriteCoderProperties(ISequentialOutStream *outStream)
 {
   Byte props[2 + sizeof(_key.Salt) + sizeof(_iv)];
   unsigned propsSize = 1;
@@ -244,7 +207,7 @@ CDecoder::CDecoder()
   _aesFilter = new CAesCbcDecoder(kKeySize);
 }
 
-Z7_COM7F_IMF(CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size))
+STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
 {
   _key.ClearProps();
  
@@ -256,16 +219,19 @@ Z7_COM7F_IMF(CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size))
   if (size == 0)
     return S_OK;
   
-  const unsigned b0 = data[0];
+  Byte b0 = data[0];
+
   _key.NumCyclesPower = b0 & 0x3F;
   if ((b0 & 0xC0) == 0)
     return size == 1 ? S_OK : E_INVALIDARG;
+
   if (size <= 1)
     return E_INVALIDARG;
 
-  const unsigned b1 = data[1];
-  const unsigned saltSize = ((b0 >> 7) & 1) + (b1 >> 4);
-  const unsigned ivSize   = ((b0 >> 6) & 1) + (b1 & 0x0F);
+  Byte b1 = data[1];
+
+  unsigned saltSize = ((b0 >> 7) & 1) + (b1 >> 4);
+  unsigned ivSize   = ((b0 >> 6) & 1) + (b1 & 0x0F);
   
   if (size != 2 + saltSize + ivSize)
     return E_INVALIDARG;
@@ -280,34 +246,33 @@ Z7_COM7F_IMF(CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size))
 }
 
 
-Z7_COM7F_IMF(CBaseCoder::CryptoSetPassword(const Byte *data, UInt32 size))
+STDMETHODIMP CBaseCoder::CryptoSetPassword(const Byte *data, UInt32 size)
 {
   COM_TRY_BEGIN
   
-  _key.Password.Wipe();
   _key.Password.CopyFrom(data, (size_t)size);
   return S_OK;
   
   COM_TRY_END
 }
 
-Z7_COM7F_IMF(CBaseCoder::Init())
+STDMETHODIMP CBaseCoder::Init()
 {
   COM_TRY_BEGIN
   
   PrepareKey();
   CMyComPtr<ICryptoProperties> cp;
-  RINOK(_aesFilter.QueryInterface(IID_ICryptoProperties, &cp))
+  RINOK(_aesFilter.QueryInterface(IID_ICryptoProperties, &cp));
   if (!cp)
     return E_FAIL;
-  RINOK(cp->SetKey(_key.Key, kKeySize))
-  RINOK(cp->SetInitVector(_iv, sizeof(_iv)))
+  RINOK(cp->SetKey(_key.Key, kKeySize));
+  RINOK(cp->SetInitVector(_iv, sizeof(_iv)));
   return _aesFilter->Init();
   
   COM_TRY_END
 }
 
-Z7_COM7F_IMF2(UInt32, CBaseCoder::Filter(Byte *data, UInt32 size))
+STDMETHODIMP_(UInt32) CBaseCoder::Filter(Byte *data, UInt32 size)
 {
   return _aesFilter->Filter(data, size);
 }

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Crypto/7zAes.h

@@ -1,7 +1,7 @@
 // 7zAes.h
 
-#ifndef ZIP7_INC_CRYPTO_7Z_AES_H
-#define ZIP7_INC_CRYPTO_7Z_AES_H
+#ifndef __CRYPTO_7Z_AES_H
+#define __CRYPTO_7Z_AES_H
 
 #include "../../Common/MyBuffer.h"
 #include "../../Common/MyCom.h"
@@ -37,20 +37,6 @@ public:
     for (unsigned i = 0; i < sizeof(Salt); i++)
       Salt[i] = 0;
   }
-
-  void Wipe()
-  {
-    Password.Wipe();
-    NumCyclesPower = 0;
-    SaltSize = 0;
-    Z7_memset_0_ARRAY(Salt);
-    Z7_memset_0_ARRAY(Key);
-  }
-
-#ifdef Z7_CPP_IS_SUPPORTED_default
-  CKeyInfo(const CKeyInfo &) = default;
-#endif
-  ~CKeyInfo() { Wipe(); }
 };
 
 class CKeyInfoCache
@@ -82,46 +68,48 @@ class CBaseCoder:
   public CMyUnknownImp,
   public CBase
 {
-  Z7_IFACE_COM7_IMP(ICompressFilter)
-  Z7_IFACE_COM7_IMP(ICryptoSetPassword)
 protected:
-  virtual ~CBaseCoder() {}
   CMyComPtr<ICompressFilter> _aesFilter;
+
+public:
+  INTERFACE_ICompressFilter(;)
+  
+  STDMETHOD(CryptoSetPassword)(const Byte *data, UInt32 size);
 };
 
-#ifndef Z7_EXTRACT_ONLY
+#ifndef EXTRACT_ONLY
 
-class CEncoder Z7_final:
+class CEncoder:
   public CBaseCoder,
   public ICompressWriteCoderProperties,
   // public ICryptoResetSalt,
   public ICryptoResetInitVector
 {
-  Z7_COM_UNKNOWN_IMP_4(
+public:
+  MY_UNKNOWN_IMP4(
       ICompressFilter,
       ICryptoSetPassword,
       ICompressWriteCoderProperties,
       // ICryptoResetSalt,
       ICryptoResetInitVector)
-  Z7_IFACE_COM7_IMP(ICompressWriteCoderProperties)
-  // Z7_IFACE_COM7_IMP(ICryptoResetSalt)
-  Z7_IFACE_COM7_IMP(ICryptoResetInitVector)
-public:
+  STDMETHOD(WriteCoderProperties)(ISequentialOutStream *outStream);
+  // STDMETHOD(ResetSalt)();
+  STDMETHOD(ResetInitVector)();
   CEncoder();
 };
 
 #endif
 
-class CDecoder Z7_final:
+class CDecoder:
   public CBaseCoder,
   public ICompressSetDecoderProperties2
 {
-  Z7_COM_UNKNOWN_IMP_3(
+public:
+  MY_UNKNOWN_IMP3(
       ICompressFilter,
       ICryptoSetPassword,
       ICompressSetDecoderProperties2)
-  Z7_IFACE_COM7_IMP(ICompressSetDecoderProperties2)
-public:
+  STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size);
   CDecoder();
 };
 

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Crypto/7zAesRegister.cpp

@@ -9,9 +9,9 @@
 namespace NCrypto {
 namespace N7z {
 
-REGISTER_FILTER_E(SzAES,
-    CDecoder,
-    CEncoder,
+REGISTER_FILTER_E(7zAES,
+    CDecoder(),
+    CEncoder(),
     0x6F10701, "7zAES")
 
 }}