react-native-update 10.34.3 → 10.34.5

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

@@ -1,54 +1,23 @@
 // IPassword.h
 
-#ifndef ZIP7_INC_IPASSWORD_H
-#define ZIP7_INC_IPASSWORD_H
+#ifndef __IPASSWORD_H
+#define __IPASSWORD_H
 
 #include "../Common/MyTypes.h"
+#include "../Common/MyUnknown.h"
 
 #include "IDecl.h"
 
-Z7_PURE_INTERFACES_BEGIN
+#define PASSWORD_INTERFACE(i, x) DECL_INTERFACE(i, 5, x)
 
-#define Z7_IFACE_CONSTR_PASSWORD(i, n) \
-  Z7_DECL_IFACE_7ZIP(i, 5, n) \
-  { Z7_IFACE_COM7_PURE(i) };
+PASSWORD_INTERFACE(ICryptoGetTextPassword, 0x10)
+{
+  STDMETHOD(CryptoGetTextPassword)(BSTR *password) PURE;
+};
 
-/*
-How to use output parameter (BSTR *password):
+PASSWORD_INTERFACE(ICryptoGetTextPassword2, 0x11)
+{
+  STDMETHOD(CryptoGetTextPassword2)(Int32 *passwordIsDefined, BSTR *password) PURE;
+};
 
-in:  The caller is required to set BSTR value as NULL (no string).
-     The callee (in 7-Zip code) ignores the input value stored in BSTR variable,
-
-out: The callee rewrites BSTR variable (*password) with new allocated string pointer.
-     The caller must free BSTR string with function SysFreeString();
-*/
-
-#define Z7_IFACEM_ICryptoGetTextPassword(x) \
-  x(CryptoGetTextPassword(BSTR *password))
-Z7_IFACE_CONSTR_PASSWORD(ICryptoGetTextPassword, 0x10)
-
-
-/*
-CryptoGetTextPassword2()
-in:
-  The caller is required to set BSTR value as NULL (no string).
-  The caller is not required to set (*passwordIsDefined) value.
-
-out:
-  Return code: != S_OK : error code
-  Return code:    S_OK : success
-   
-  if (*passwordIsDefined == 1), the variable (*password) contains password string
-    
-  if (*passwordIsDefined == 0), the password is not defined,
-     but the callee still could set (*password) to some allocated string, for example, as empty string.
-  
-  The caller must free BSTR string with function SysFreeString()
-*/
-
-#define Z7_IFACEM_ICryptoGetTextPassword2(x) \
-  x(CryptoGetTextPassword2(Int32 *passwordIsDefined, BSTR *password))
-Z7_IFACE_CONSTR_PASSWORD(ICryptoGetTextPassword2, 0x11)
-
-Z7_PURE_INTERFACES_END
 #endif

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

@@ -1,20 +1,19 @@
 // IProgress.h
 
-#ifndef ZIP7_INC_IPROGRESS_H
-#define ZIP7_INC_IPROGRESS_H
+#ifndef __IPROGRESS_H
+#define __IPROGRESS_H
 
 #include "../Common/MyTypes.h"
 
 #include "IDecl.h"
 
-Z7_PURE_INTERFACES_BEGIN
+#define INTERFACE_IProgress(x) \
+  STDMETHOD(SetTotal)(UInt64 total) x; \
+  STDMETHOD(SetCompleted)(const UInt64 *completeValue) x; \
 
-#define Z7_IFACEM_IProgress(x) \
-  x(SetTotal(UInt64 total)) \
-  x(SetCompleted(const UInt64 *completeValue)) \
+DECL_INTERFACE(IProgress, 0, 5)
+{
+  INTERFACE_IProgress(PURE)
+};
 
-Z7_DECL_IFACE_7ZIP(IProgress, 0, 5)
-  { Z7_IFACE_COM7_PURE(IProgress) };
-
-Z7_PURE_INTERFACES_END
 #endif

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

@@ -1,29 +1,24 @@
 // IStream.h
 
-#ifndef ZIP7_INC_ISTREAM_H
-#define ZIP7_INC_ISTREAM_H
+#ifndef __ISTREAM_H
+#define __ISTREAM_H
 
-#include "../Common/Common0.h"
 #include "../Common/MyTypes.h"
 #include "../Common/MyWindows.h"
 
 #include "IDecl.h"
 
-Z7_PURE_INTERFACES_BEGIN
+#define STREAM_INTERFACE_SUB(i, base, x) DECL_INTERFACE_SUB(i, base, 3, x)
+#define STREAM_INTERFACE(i, x) STREAM_INTERFACE_SUB(i, IUnknown, x)
 
-#define Z7_IFACE_CONSTR_STREAM_SUB(i, base, n) \
-  Z7_DECL_IFACE_7ZIP_SUB(i, base, 3, n) \
-  { Z7_IFACE_COM7_PURE(i) };
-
-#define Z7_IFACE_CONSTR_STREAM(i, n) \
-        Z7_IFACE_CONSTR_STREAM_SUB(i, IUnknown, n)
-
-
-/*
-ISequentialInStream::Read()
+STREAM_INTERFACE(ISequentialInStream, 0x01)
+{
+  STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize) PURE;
+  
+  /*
   The requirement for caller: (processedSize != NULL).
   The callee can allow (processedSize == NULL) for compatibility reasons.
-
+    
   if (size == 0), this function returns S_OK and (*processedSize) is set to 0.
 
   if (size != 0)
@@ -36,21 +31,21 @@ ISequentialInStream::Read()
 
   If seek pointer before Read() call was changed to position past the end of stream:
     if (seek_pointer >= stream_size), this function returns S_OK and (*processedSize) is set to 0.
-
+  
   ERROR CASES:
     If the function returns error code, then (*processedSize) is size of
     data written to (data) buffer (it can be data before error or data with errors).
     The recommended way for callee to work with reading errors:
       1) write part of data before error to (data) buffer and return S_OK.
       2) return error code for further calls of Read().
-*/
-#define Z7_IFACEM_ISequentialInStream(x) \
-  x(Read(void *data, UInt32 size, UInt32 *processedSize))
-Z7_IFACE_CONSTR_STREAM(ISequentialInStream, 0x01)
-
+  */
+};
 
-/*
-ISequentialOutStream::Write()
+STREAM_INTERFACE(ISequentialOutStream, 0x02)
+{
+  STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize) PURE;
+  
+  /*
   The requirement for caller: (processedSize != NULL).
   The callee can allow (processedSize == NULL) for compatibility reasons.
 
@@ -64,13 +59,8 @@ ISequentialOutStream::Write()
   ERROR CASES:
     If the function returns error code, then (*processedSize) is size of
     data written from (data) buffer.
-*/
-#define Z7_IFACEM_ISequentialOutStream(x) \
-  x(Write(const void *data, UInt32 size, UInt32 *processedSize))
-Z7_IFACE_CONSTR_STREAM(ISequentialOutStream, 0x02)
-
-
-#ifdef _WIN32
+  */
+};
 
 #ifdef __HRESULT_FROM_WIN32
 #define HRESULT_WIN32_ERROR_NEGATIVE_SEEK __HRESULT_FROM_WIN32(ERROR_NEGATIVE_SEEK)
@@ -78,44 +68,43 @@ Z7_IFACE_CONSTR_STREAM(ISequentialOutStream, 0x02)
 #define HRESULT_WIN32_ERROR_NEGATIVE_SEEK   HRESULT_FROM_WIN32(ERROR_NEGATIVE_SEEK)
 #endif
 
-#else
-
-#define HRESULT_WIN32_ERROR_NEGATIVE_SEEK   MY_E_ERROR_NEGATIVE_SEEK
-
-#endif
-
-
-/*
-IInStream::Seek() / IOutStream::Seek()
-  If you seek to position before the beginning of the stream,
-  Seek() function returns error code:
+/*  Seek() Function
+  If you seek before the beginning of the stream, Seek() function returns error code:
       Recommended error code is __HRESULT_FROM_WIN32(ERROR_NEGATIVE_SEEK).
       or STG_E_INVALIDFUNCTION
+      
   It is allowed to seek past the end of the stream.
+
+
   if Seek() returns error, then the value of *newPosition is undefined.
 */
 
-#define Z7_IFACEM_IInStream(x) \
-  x(Seek(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition))
-Z7_IFACE_CONSTR_STREAM_SUB(IInStream, ISequentialInStream, 0x03)
+STREAM_INTERFACE_SUB(IInStream, ISequentialInStream, 0x03)
+{
+  STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition) PURE;
+};
 
-#define Z7_IFACEM_IOutStream(x) \
-  x(Seek(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition)) \
-  x(SetSize(UInt64 newSize))
-Z7_IFACE_CONSTR_STREAM_SUB(IOutStream, ISequentialOutStream, 0x04)
+STREAM_INTERFACE_SUB(IOutStream, ISequentialOutStream, 0x04)
+{
+  STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition) PURE;
+  STDMETHOD(SetSize)(UInt64 newSize) PURE;
+};
 
-#define Z7_IFACEM_IStreamGetSize(x) \
-  x(GetSize(UInt64 *size))
-Z7_IFACE_CONSTR_STREAM(IStreamGetSize, 0x06)
+STREAM_INTERFACE(IStreamGetSize, 0x06)
+{
+  STDMETHOD(GetSize)(UInt64 *size) PURE;
+};
 
-#define Z7_IFACEM_IOutStreamFinish(x) \
-  x(OutStreamFinish())
-Z7_IFACE_CONSTR_STREAM(IOutStreamFinish, 0x07)
+STREAM_INTERFACE(IOutStreamFinish, 0x07)
+{
+  STDMETHOD(OutStreamFinish)() PURE;
+};
 
-#define Z7_IFACEM_IStreamGetProps(x) \
-  x(GetProps(UInt64 *size, FILETIME *cTime, FILETIME *aTime, FILETIME *mTime, UInt32 *attrib))
-Z7_IFACE_CONSTR_STREAM(IStreamGetProps, 0x08)
 
+STREAM_INTERFACE(IStreamGetProps, 0x08)
+{
+  STDMETHOD(GetProps)(UInt64 *size, FILETIME *cTime, FILETIME *aTime, FILETIME *mTime, UInt32 *attrib) PURE;
+};
 
 struct CStreamFileProps
 {
@@ -130,81 +119,9 @@ struct CStreamFileProps
   FILETIME MTime;
 };
 
+STREAM_INTERFACE(IStreamGetProps2, 0x09)
+{
+  STDMETHOD(GetProps2)(CStreamFileProps *props) PURE;
+};
 
-#define Z7_IFACEM_IStreamGetProps2(x) \
-  x(GetProps2(CStreamFileProps *props))
-Z7_IFACE_CONSTR_STREAM(IStreamGetProps2, 0x09)
-
-#define Z7_IFACEM_IStreamGetProp(x) \
-  x(GetProperty(PROPID propID, PROPVARIANT *value)) \
-  x(ReloadProps())
-Z7_IFACE_CONSTR_STREAM(IStreamGetProp, 0x0a)
-
-
-/*
-IStreamSetRestriction::SetRestriction(UInt64 begin, UInt64 end)
-  
-  It sets region of data in output stream that is restricted.
-  For restricted region it's expected (or allowed)
-  that the caller can write to same region with different calls of Write()/SetSize().
-  Another regions of output stream will be supposed as non-restricted:
-    - The callee usually doesn't flush the data in restricted region.
-    - The callee usually can flush data from non-restricted region after writing.
-
-Actual restiction rules depend also from current stream position.
-It's recommended to call SetRestriction() just before the Write() call.
-So the callee can optimize writing and flushing, if that Write()
-operation is not restricted.
-
-Note: Each new call of SetRestriction() sets new restictions,
-so previous restrction calls has no effect anymore.
-
-inputs:
- 
-  (begin > end) is not allowed, and returns E_FAIL;
-  
-  if (begin == end)
-  {
-    No restriction.
-    The caller will call Write() in sequential order.
-    After SetRestriction(begin, begin), but before next call of SetRestriction()
-    {
-      Additional condition:
-        it's expected that current stream seek position is equal to stream size.
-      The callee can make final flushing for any data before current stream seek position.
-      For each Write(size) call:
-        The callee can make final flushing for that new written data.
-    }
-    The pair of values (begin == 0 && end == 0) is recommended to remove write restriction.
-  }
-  
-  if (begin < end)
-  {
-    it means that callee must NOT flush any data in region [begin, end).
-    The caller is allowed to Seek() to that region and rewrite the
-    data in that restriction region.
-    if (end == (UInt64)(Int64)-1)
-    {
-      there is no upper bound for restricted region.
-      So non-restricted region will be [0, begin) in that case
-    }
-  }
-
- returns:
-  - if (begin > end) it return ERROR code (E_FAIL)
-  - S_OK : if no errors.
-  - Also the call of SetRestriction() can initiate the flushing of already written data.
-    So it can return the result of that flushing.
- 
- Note: IOutStream::SetSize() also can change the data.
-    So it's not expected the call
-    IOutStream::SetSize() to region that was written before as unrestricted.
-*/
-
-#define Z7_IFACEM_IStreamSetRestriction(x) \
-  x(SetRestriction(UInt64 begin, UInt64 end)) \
-
-Z7_IFACE_CONSTR_STREAM(IStreamSetRestriction, 0x10)
-
-Z7_PURE_INTERFACES_END
 #endif

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

@@ -1,7 +1,5 @@
-!IF "$(PLATFORM)" == "x64" || ("$(PLATFORM)" == "arm64" && !defined(NO_ASM_GNU))
-!IFNDEF NO_ASM
-CFLAGS_C_SPEC = -DZ7_LZMA_DEC_OPT
+!IF "$(PLATFORM)" == "x64"
+CFLAGS_C_SPEC = -D_LZMA_DEC_OPT
 ASM_OBJS = $(ASM_OBJS) \
   $O\LzmaDecOpt.obj
 !ENDIF
-!ENDIF

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/MyVersionInfo.rc

@@ -1,2 +1,2 @@
 #include "MyVersion.h"
-#include "../../C/7zVersion.rc"
+#include "..\..\C\7zVersion.rc"

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

@@ -1,7 +1,7 @@
 // PropID.h
 
-#ifndef ZIP7_INC_7ZIP_PROP_ID_H
-#define ZIP7_INC_7ZIP_PROP_ID_H
+#ifndef __7ZIP_PROP_ID_H
+#define __7ZIP_PROP_ID_H
 
 #include "../Common/MyTypes.h"
 
@@ -103,15 +103,6 @@ enum
   kpidReadOnly,
   kpidOutName,
   kpidCopyLink,
-  kpidArcFileName,
-  kpidIsHash,
-  kpidChangeTime,
-  kpidUserId,
-  kpidGroupId,
-  kpidDeviceMajor,
-  kpidDeviceMinor,
-  kpidDevMajor,
-  kpidDevMinor,
 
   kpid_NUM_DEFINED,
 
@@ -133,46 +124,4 @@ const UInt32 kpv_ErrorFlags_DataError             = 1 << 9;
 const UInt32 kpv_ErrorFlags_CrcError              = 1 << 10;
 // const UInt32 kpv_ErrorFlags_Unsupported           = 1 << 11;
 
-/*
-linux ctime :
-   file metadata was last changed.
-   changing the file modification time
-   counts as a metadata change, so will also have the side effect of updating the ctime.
-
-PROPVARIANT for timestamps in 7-Zip:
-{
-  vt = VT_FILETIME
-  wReserved1: set precision level
-    0      : base value (backward compatibility value)
-             only filetime is used (7 digits precision).
-             wReserved2 and wReserved3 can contain random data
-    1      : Unix (1 sec)
-    2      : DOS  (2 sec)
-    3      : High Precision (1 ns)
-    16 - 3 : (reserved) = 1 day
-    16 - 2 : (reserved) = 1 hour
-    16 - 1 : (reserved) = 1 minute
-    16 + 0 : 1 sec (0 digits after point)
-    16 + (1,2,3,4,5,6,7,8,9) : set subsecond precision level :
-         (number of decimal digits after point)
-    16 + 9 : 1 ns  (9 digits after point)
-  wReserved2 = ns % 100 : if     (8 or 9 digits pecision)
-             = 0        : if not (8 or 9 digits pecision)
-  wReserved3 = 0;
-  filetime
-}
-
-NOTE: TAR-PAX archives created by GNU TAR don't keep
-  whole information about original level of precision,
-  and timestamp are stored in reduced form, where tail zero
-  digits after point are removed.
-  So 7-Zip can return different precision levels for different items for such TAR archives.
-*/
-
-/*
-TimePrec returned by IOutArchive::GetFileTimeType()
-is used only for updating, when we compare MTime timestamp
-from archive with timestamp from directory.
-*/
-
 #endif