react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Common/HashCalc.h

@@ -1,26 +1,18 @@
 // HashCalc.h
 
-#ifndef ZIP7_INC_HASH_CALC_H
-#define ZIP7_INC_HASH_CALC_H
+#ifndef __HASH_CALC_H
+#define __HASH_CALC_H
 
-#include "../../../Common/UTFConvert.h"
 #include "../../../Common/Wildcard.h"
 
 #include "../../Common/CreateCoder.h"
 #include "../../Common/MethodProps.h"
 
 #include "DirItem.h"
-#include "IFileExtractCallback.h"
 
 const unsigned k_HashCalc_DigestSize_Max = 64;
-const unsigned k_HashCalc_ExtraSize = 8;
-const unsigned k_HashCalc_NumGroups = 4;
 
-/*
-  if (size <= 8) : upper case : reversed byte order : it shows 32-bit/64-bit number, if data contains little-endian number
-  if (size >  8) : lower case : original byte order (as big-endian byte sequence)
-*/
-void HashHexToString(char *dest, const Byte *data, size_t size);
+const unsigned k_HashCalc_NumGroups = 4;
 
 enum
 {
@@ -35,40 +27,10 @@ struct CHasherState
   CMyComPtr<IHasher> Hasher;
   AString Name;
   UInt32 DigestSize;
-  UInt64 NumSums[k_HashCalc_NumGroups];
-  Byte Digests[k_HashCalc_NumGroups][k_HashCalc_DigestSize_Max + k_HashCalc_ExtraSize];
-
-  void InitDigestGroup(unsigned groupIndex)
-  {
-    NumSums[groupIndex] = 0;
-    memset(Digests[groupIndex], 0, sizeof(Digests[groupIndex]));
-  }
-
-  const Byte *GetExtraData_for_Group(unsigned groupIndex) const
-  {
-    return Digests[groupIndex] + k_HashCalc_DigestSize_Max;
-  }
-
-  unsigned GetNumExtraBytes_for_Group(unsigned groupIndex) const
-  {
-    const Byte *p = GetExtraData_for_Group(groupIndex);
-    // we use little-endian to read extra bytes
-    for (unsigned i = k_HashCalc_ExtraSize; i != 0; i--)
-      if (p[i - 1] != 0)
-        return i;
-    return 0;
-  }
-
-  void AddDigest(unsigned groupIndex, const Byte *data);
-
-  void WriteToString(unsigned digestIndex, char *s) const;
+  Byte Digests[k_HashCalc_NumGroups][k_HashCalc_DigestSize_Max];
 };
 
-
-Z7_PURE_INTERFACES_BEGIN
-
-
-DECLARE_INTERFACE(IHashCalc)
+struct IHashCalc
 {
   virtual void InitForNewFile() = 0;
   virtual void Update(const void *data, UInt32 size) = 0;
@@ -76,9 +38,7 @@ DECLARE_INTERFACE(IHashCalc)
   virtual void Final(bool isDir, bool isAltStream, const UString &path) = 0;
 };
 
-Z7_PURE_INTERFACES_END
-
-struct CHashBundle Z7_final: public IHashCalc
+struct CHashBundle: public IHashCalc
 {
   CObjectVector<CHasherState> Hashers;
 
@@ -102,112 +62,42 @@ struct CHashBundle Z7_final: public IHashCalc
     NumDirs = NumFiles = NumAltStreams = FilesSize = AltStreamsSize = NumErrors = 0;
   }
 
-  void InitForNewFile() Z7_override;
-  void Update(const void *data, UInt32 size) Z7_override;
-  void SetSize(UInt64 size) Z7_override;
-  void Final(bool isDir, bool isAltStream, const UString &path) Z7_override;
+  void InitForNewFile();
+  void Update(const void *data, UInt32 size);
+  void SetSize(UInt64 size);
+  void Final(bool isDir, bool isAltStream, const UString &path);
 };
 
-Z7_PURE_INTERFACES_BEGIN
-
-// INTERFACE_IDirItemsCallback(x)
-
-#define Z7_IFACEN_IHashCallbackUI(x) \
-  virtual HRESULT StartScanning() x \
-  virtual HRESULT FinishScanning(const CDirItemsStat &st) x \
-  virtual HRESULT SetNumFiles(UInt64 numFiles) x \
-  virtual HRESULT SetTotal(UInt64 size) x \
-  virtual HRESULT SetCompleted(const UInt64 *completeValue) x \
-  virtual HRESULT CheckBreak() x \
-  virtual HRESULT BeforeFirstFile(const CHashBundle &hb) x \
-  virtual HRESULT GetStream(const wchar_t *name, bool isFolder) x \
-  virtual HRESULT OpenFileError(const FString &path, DWORD systemError) x \
-  virtual HRESULT SetOperationResult(UInt64 fileSize, const CHashBundle &hb, bool showHash) x \
-  virtual HRESULT AfterLastFile(CHashBundle &hb) x \
-
-Z7_IFACE_DECL_PURE_(IHashCallbackUI, IDirItemsCallback)
-
-Z7_PURE_INTERFACES_END
-
-
-struct CHashOptionsLocal
+#define INTERFACE_IHashCallbackUI(x) \
+  INTERFACE_IDirItemsCallback(x) \
+  virtual HRESULT StartScanning() x; \
+  virtual HRESULT FinishScanning(const CDirItemsStat &st) x; \
+  virtual HRESULT SetNumFiles(UInt64 numFiles) x; \
+  virtual HRESULT SetTotal(UInt64 size) x; \
+  virtual HRESULT SetCompleted(const UInt64 *completeValue) x; \
+  virtual HRESULT CheckBreak() x; \
+  virtual HRESULT BeforeFirstFile(const CHashBundle &hb) x; \
+  virtual HRESULT GetStream(const wchar_t *name, bool isFolder) x; \
+  virtual HRESULT OpenFileError(const FString &path, DWORD systemError) x; \
+  virtual HRESULT SetOperationResult(UInt64 fileSize, const CHashBundle &hb, bool showHash) x; \
+  virtual HRESULT AfterLastFile(CHashBundle &hb) x; \
+
+struct IHashCallbackUI: public IDirItemsCallback
 {
-  CBoolPair HashMode_Zero;
-  CBoolPair HashMode_Tag;
-  CBoolPair HashMode_Dirs;
-  CBoolPair HashMode_OnlyHash;
-  
-  void Init_HashOptionsLocal()
-  {
-    HashMode_Zero.Init();
-    HashMode_Tag.Init();
-    HashMode_Dirs.Init();
-    HashMode_OnlyHash.Init();
-    // HashMode_Dirs = true; // for debug
-  }
-
-  CHashOptionsLocal()
-  {
-    Init_HashOptionsLocal();
-  }
-  
-  bool ParseFlagCharOption(wchar_t c, bool val)
-  {
-    c = MyCharLower_Ascii(c);
-         if (c == 'z') HashMode_Zero.SetVal_as_Defined(val);
-    else if (c == 't') HashMode_Tag.SetVal_as_Defined(val);
-    else if (c == 'd') HashMode_Dirs.SetVal_as_Defined(val);
-    else if (c == 'h') HashMode_OnlyHash.SetVal_as_Defined(val);
-    else return false;
-    return true;
-  }
-
-  bool ParseString(const UString &s)
-  {
-    for (unsigned i = 0; i < s.Len();)
-    {
-      const wchar_t c = s[i++];
-      bool val = true;
-      if (i < s.Len())
-      {
-        const wchar_t next  = s[i];
-        if (next == '-')
-        {
-          val = false;
-          i++;
-        }
-      }
-      if (!ParseFlagCharOption(c, val))
-        return false;
-    }
-    return true;
-  }
+  INTERFACE_IHashCallbackUI(=0)
 };
 
-
 struct CHashOptions
-  // : public CHashOptionsLocal
 {
   UStringVector Methods;
-  // UString HashFilePath;
-
-  bool PreserveATime;
   bool OpenShareForWrite;
   bool StdInMode;
   bool AltStreamsMode;
-  CBoolPair SymLinks;
-
   NWildcard::ECensorPathMode PathMode;
-
-  CHashOptions():
-      PreserveATime(false),
-      OpenShareForWrite(false),
-      StdInMode(false),
-      AltStreamsMode(false),
-      PathMode(NWildcard::k_RelatPath) {}
+ 
+  CHashOptions(): StdInMode(false), OpenShareForWrite(false), AltStreamsMode(false), PathMode(NWildcard::k_RelatPath) {};
 };
 
-
 HRESULT HashCalc(
     DECL_EXTERNAL_CODECS_LOC_VARS
     const NWildcard::CCensor &censor,
@@ -215,108 +105,6 @@ HRESULT HashCalc(
     AString &errorInfo,
     IHashCallbackUI *callback);
 
-
-
-#ifndef Z7_SFX
-
-namespace NHash {
-
-struct CHashPair
-{
-  CByteBuffer Hash;
-  char Mode;
-  bool IsBSD;
-  bool Escape;
-  bool Size_from_Arc_Defined;
-  bool Size_from_Disk_Defined;
-  AString Method;
-  AString Name;
-  
-  AString FullLine;
-  AString HashString;
-  // unsigned HashLengthInBits;
-
-  // AString MethodName;
-  UInt64 Size_from_Arc;
-  UInt64 Size_from_Disk;
-
-  bool IsDir() const;
-
-  void Get_UString_Path(UString &path) const
-  {
-    path.Empty();
-    if (!ConvertUTF8ToUnicode(Name, path))
-      return;
-  }
-
-  bool ParseCksum(const char *s);
-  bool Parse(const char *s);
-
-  bool IsSupportedMode() const
-  {
-    return Mode != 'U' && Mode != '^';
-  }
-
-  CHashPair():
-      Mode(0)
-      , IsBSD(false)
-      , Escape(false)
-      , Size_from_Arc_Defined(false)
-      , Size_from_Disk_Defined(false)
-      // , HashLengthInBits(0)
-      , Size_from_Arc(0)
-      , Size_from_Disk(0)
-    {}
-};
-
-
-Z7_CLASS_IMP_CHandler_IInArchive_3(
-    IArchiveGetRawProps,
-    /* public IGetArchiveHashHandler, */
-    IOutArchive,
-    ISetProperties
-)
-  bool _isArc;
-  bool _supportWindowsBackslash;
-  bool _crcSize_WasSet;
-  bool _is_CksumMode;
-  bool _is_PgpMethod;
-  bool _is_ZeroMode;
-  bool _are_there_Tags;
-  bool _are_there_Dirs;
-  bool _is_KnownMethod_in_FileName;
-  bool _hashSize_Defined;
-  unsigned _hashSize;
-  UInt32 _crcSize;
-  UInt64 _phySize;
-  CObjectVector<CHashPair> HashPairs;
-  UStringVector _methods;
-  AString _method_from_FileName;
-  AString _pgpMethod;
-  AString _method_for_Extraction;
-  CHashOptionsLocal _options;
-
-  void ClearVars();
-  void InitProps();
-
-  bool CanUpdate() const
-  {
-    if (!_isArc || _is_PgpMethod || _is_CksumMode)
-      return false;
-    return true;
-  }
-
-  HRESULT SetProperty(const wchar_t *nameSpec, const PROPVARIANT &value);
-
-public:
-  CHandler();
-};
-
-}
-
-void Codecs_AddHashArcHandler(CCodecs *codecs);
-
-#endif
-
+void AddHashHexToString(char *dest, const Byte *data, UInt32 size);
 
 #endif

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Common/IFileExtractCallback.h

@@ -1,7 +1,7 @@
 // IFileExtractCallback.h
 
-#ifndef ZIP7_INC_I_FILE_EXTRACT_CALLBACK_H
-#define ZIP7_INC_I_FILE_EXTRACT_CALLBACK_H
+#ifndef __I_FILE_EXTRACT_CALLBACK_H
+#define __I_FILE_EXTRACT_CALLBACK_H
 
 #include "../../../Common/MyString.h"
 
@@ -10,15 +10,6 @@
 #include "LoadCodecs.h"
 #include "OpenArchive.h"
 
-Z7_PURE_INTERFACES_BEGIN
-
-#define Z7_IFACE_CONSTR_FOLDERARC_SUB(i, base, n) \
-  Z7_DECL_IFACE_7ZIP_SUB(i, base, 1, n) \
-  { Z7_IFACE_COM7_PURE(i) };
-
-#define Z7_IFACE_CONSTR_FOLDERARC(i, n) \
-        Z7_IFACE_CONSTR_FOLDERARC_SUB(i, IUnknown, n)
-
 namespace NOverwriteAnswer
 {
   enum EEnum
@@ -51,21 +42,27 @@ IID_IFolderArchiveExtractCallback is requested by:
  IFolderArchiveExtractCallback is used by Common/ArchiveExtractCallback.cpp
 */
 
-#define Z7_IFACEM_IFolderArchiveExtractCallback(x) \
-  x(AskOverwrite( \
+#define INTERFACE_IFolderArchiveExtractCallback(x) \
+  STDMETHOD(AskOverwrite)( \
       const wchar_t *existName, const FILETIME *existTime, const UInt64 *existSize, \
       const wchar_t *newName, const FILETIME *newTime, const UInt64 *newSize, \
-      Int32 *answer)) \
-  x(PrepareOperation(const wchar_t *name, Int32 isFolder, Int32 askExtractMode, const UInt64 *position)) \
-  x(MessageError(const wchar_t *message)) \
-  x(SetOperationResult(Int32 opRes, Int32 encrypted)) \
+      Int32 *answer) x; \
+  STDMETHOD(PrepareOperation)(const wchar_t *name, Int32 isFolder, Int32 askExtractMode, const UInt64 *position) x; \
+  STDMETHOD(MessageError)(const wchar_t *message) x; \
+  STDMETHOD(SetOperationResult)(Int32 opRes, Int32 encrypted) x; \
 
-Z7_IFACE_CONSTR_FOLDERARC_SUB(IFolderArchiveExtractCallback, IProgress, 0x07)
+DECL_INTERFACE_SUB(IFolderArchiveExtractCallback, IProgress, 0x01, 0x07)
+{
+  INTERFACE_IFolderArchiveExtractCallback(PURE)
+};
 
-#define Z7_IFACEM_IFolderArchiveExtractCallback2(x) \
-  x(ReportExtractResult(Int32 opRes, Int32 encrypted, const wchar_t *name)) \
+#define INTERFACE_IFolderArchiveExtractCallback2(x) \
+  STDMETHOD(ReportExtractResult)(Int32 opRes, Int32 encrypted, const wchar_t *name) x; \
 
-Z7_IFACE_CONSTR_FOLDERARC(IFolderArchiveExtractCallback2, 0x08)
+DECL_INTERFACE_SUB(IFolderArchiveExtractCallback2, IUnknown, 0x01, 0x08)
+{
+  INTERFACE_IFolderArchiveExtractCallback2(PURE)
+};
 
 /* ---------- IExtractCallbackUI ----------
 is implemented by
@@ -73,40 +70,45 @@ is implemented by
   FileManager/ExtractCallback.h     CExtractCallbackImp
 */
 
-#ifdef Z7_NO_CRYPTO
-  #define Z7_IFACEM_IExtractCallbackUI_Crypto(px)
+#ifdef _NO_CRYPTO
+  #define INTERFACE_IExtractCallbackUI_Crypto(x)
 #else
-  #define Z7_IFACEM_IExtractCallbackUI_Crypto(px) \
-  virtual HRESULT SetPassword(const UString &password) px
+  #define INTERFACE_IExtractCallbackUI_Crypto(x) \
+  virtual HRESULT SetPassword(const UString &password) x;
 #endif
 
-#define Z7_IFACEN_IExtractCallbackUI(px) \
-  virtual HRESULT BeforeOpen(const wchar_t *name, bool testMode) px \
-  virtual HRESULT OpenResult(const CCodecs *codecs, const CArchiveLink &arcLink, const wchar_t *name, HRESULT result) px \
-  virtual HRESULT ThereAreNoFiles() px \
-  virtual HRESULT ExtractResult(HRESULT result) px \
-  Z7_IFACEM_IExtractCallbackUI_Crypto(px)
+#define INTERFACE_IExtractCallbackUI(x) \
+  virtual HRESULT BeforeOpen(const wchar_t *name, bool testMode) x; \
+  virtual HRESULT OpenResult(const CCodecs *codecs, const CArchiveLink &arcLink, const wchar_t *name, HRESULT result) x; \
+  virtual HRESULT ThereAreNoFiles() x; \
+  virtual HRESULT ExtractResult(HRESULT result) x; \
+  INTERFACE_IExtractCallbackUI_Crypto(x)
 
-// IExtractCallbackUI - is non-COM interface
-// IFolderArchiveExtractCallback - is COM interface
-// Z7_IFACE_DECL_PURE_(IExtractCallbackUI, IFolderArchiveExtractCallback)
-Z7_IFACE_DECL_PURE(IExtractCallbackUI)
+struct IExtractCallbackUI: IFolderArchiveExtractCallback
+{
+  INTERFACE_IExtractCallbackUI(PURE)
+};
 
 
 
-#define Z7_IFACEM_IGetProp(x) \
-  x(GetProp(PROPID propID, PROPVARIANT *value)) \
+#define INTERFACE_IGetProp(x) \
+  STDMETHOD(GetProp)(PROPID propID, PROPVARIANT *value) x; \
 
-Z7_IFACE_CONSTR_FOLDERARC(IGetProp, 0x20)
+DECL_INTERFACE_SUB(IGetProp, IUnknown, 0x01, 0x20)
+{
+  INTERFACE_IGetProp(PURE)
+};
 
-#define Z7_IFACEM_IFolderExtractToStreamCallback(x) \
-  x(UseExtractToStream(Int32 *res)) \
-  x(GetStream7(const wchar_t *name, Int32 isDir, ISequentialOutStream **outStream, Int32 askExtractMode, IGetProp *getProp)) \
-  x(PrepareOperation7(Int32 askExtractMode)) \
-  x(SetOperationResult8(Int32 resultEOperationResult, Int32 encrypted, UInt64 size)) \
+#define INTERFACE_IFolderExtractToStreamCallback(x) \
+  STDMETHOD(UseExtractToStream)(Int32 *res) x; \
+  STDMETHOD(GetStream7)(const wchar_t *name, Int32 isDir, ISequentialOutStream **outStream, Int32 askExtractMode, IGetProp *getProp) x; \
+  STDMETHOD(PrepareOperation7)(Int32 askExtractMode) x; \
+  STDMETHOD(SetOperationResult7)(Int32 resultEOperationResult, Int32 encrypted) x; \
 
-Z7_IFACE_CONSTR_FOLDERARC(IFolderExtractToStreamCallback, 0x31)
+DECL_INTERFACE_SUB(IFolderExtractToStreamCallback, IUnknown, 0x01, 0x30)
+{
+  INTERFACE_IFolderExtractToStreamCallback(PURE)
+};
 
-Z7_PURE_INTERFACES_END
 
 #endif