react-native-update 10.34.3 → 10.34.4

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

@@ -1,7 +1,7 @@
 // LoadCodecs.h
 
-#ifndef ZIP7_INC_LOAD_CODECS_H
-#define ZIP7_INC_LOAD_CODECS_H
+#ifndef __LOAD_CODECS_H
+#define __LOAD_CODECS_H
 
 /*
 Client application uses LoadCodecs.* to load plugins to
@@ -10,26 +10,26 @@ CCodecs object, that contains 3 lists of plugins:
   2) Codecs  - external codecs
   3) Hashers - external hashers
 
-Z7_EXTERNAL_CODECS
+EXTERNAL_CODECS
 ---------------
 
-  if Z7_EXTERNAL_CODECS is defined, then the code tries to load external
+  if EXTERNAL_CODECS is defined, then the code tries to load external
   plugins from DLL files (shared libraries).
 
   There are two types of executables in 7-Zip:
   
   1) Executable that uses external plugins must be compiled
-     with Z7_EXTERNAL_CODECS defined:
+     with EXTERNAL_CODECS defined:
        - 7z.exe, 7zG.exe, 7zFM.exe
     
-     Note: Z7_EXTERNAL_CODECS is used also in CPP/7zip/Common/CreateCoder.h
+     Note: EXTERNAL_CODECS is used also in CPP/7zip/Common/CreateCoder.h
            that code is used in plugin module (7z.dll).
   
-  2) Standalone modules are compiled without Z7_EXTERNAL_CODECS:
+  2) Standalone modules are compiled without EXTERNAL_CODECS:
     - SFX modules: 7z.sfx, 7zCon.sfx
     - standalone versions of console 7-Zip: 7za.exe, 7zr.exe
 
-  if Z7_EXTERNAL_CODECS is defined, CCodecs class implements interfaces:
+  if EXTERNAL_CODECS is defined, CCodecs class implements interfaces:
     - ICompressCodecsInfo : for Codecs
     - IHashers            : for Hashers
   
@@ -51,7 +51,7 @@ Z7_EXTERNAL_CODECS
 #include "../../../Common/MyString.h"
 #include "../../../Common/ComTry.h"
 
-#ifdef Z7_EXTERNAL_CODECS
+#ifdef EXTERNAL_CODECS
 #include "../../../Windows/DLL.h"
 #endif
 
@@ -60,7 +60,7 @@ Z7_EXTERNAL_CODECS
 #include "../../Archive/IArchive.h"
 
 
-#ifdef Z7_EXTERNAL_CODECS
+#ifdef EXTERNAL_CODECS
 
 struct CDllCodecInfo
 {
@@ -68,8 +68,6 @@ struct CDllCodecInfo
   UInt32 CodecIndex;
   bool EncoderIsAssigned;
   bool DecoderIsAssigned;
-  bool IsFilter;
-  bool IsFilter_Assigned;
   CLSID Encoder;
   CLSID Decoder;
 };
@@ -96,7 +94,6 @@ struct CArcExtInfo
 struct CArcInfoEx
 {
   UInt32 Flags;
-  UInt32 TimeFlags;
   
   Func_CreateInArchive CreateInArchive;
   Func_IsArc IsArcFunc;
@@ -104,48 +101,29 @@ struct CArcInfoEx
   UString Name;
   CObjectVector<CArcExtInfo> Exts;
   
-  #ifndef Z7_SFX
+  #ifndef _SFX
     Func_CreateOutArchive CreateOutArchive;
     bool UpdateEnabled;
     bool NewInterface;
     // UInt32 Version;
     UInt32 SignatureOffset;
     CObjectVector<CByteBuffer> Signatures;
-    /*
     #ifdef NEW_FOLDER_INTERFACE
       UStringVector AssociateExts;
     #endif
-    */
   #endif
   
-  #ifdef Z7_EXTERNAL_CODECS
+  #ifdef EXTERNAL_CODECS
     int LibIndex;
     UInt32 FormatIndex;
     CLSID ClassID;
   #endif
 
-  int Compare(const CArcInfoEx &a) const
-  {
-    const int res = Name.Compare(a.Name);
-    if (res != 0)
-      return res;
-    #ifdef Z7_EXTERNAL_CODECS
-    return MyCompare(LibIndex, a.LibIndex);
-    #else
-    return 0;
-    #endif
-    /*
-    if (LibIndex < a.LibIndex) return -1;
-    if (LibIndex > a.LibIndex) return 1;
-    return 0;
-    */
-  }
-
   bool Flags_KeepName() const { return (Flags & NArcInfoFlags::kKeepName) != 0; }
   bool Flags_FindSignature() const { return (Flags & NArcInfoFlags::kFindSignature) != 0; }
 
   bool Flags_AltStreams() const { return (Flags & NArcInfoFlags::kAltStreams) != 0; }
-  bool Flags_NtSecurity() const { return (Flags & NArcInfoFlags::kNtSecure) != 0; }
+  bool Flags_NtSecure() const { return (Flags & NArcInfoFlags::kNtSecure) != 0; }
   bool Flags_SymLinks() const { return (Flags & NArcInfoFlags::kSymLinks) != 0; }
   bool Flags_HardLinks() const { return (Flags & NArcInfoFlags::kHardLinks) != 0; }
 
@@ -154,30 +132,7 @@ struct CArcInfoEx
   bool Flags_BackwardOpen() const { return (Flags & NArcInfoFlags::kBackwardOpen) != 0; }
   bool Flags_PreArc() const { return (Flags & NArcInfoFlags::kPreArc) != 0; }
   bool Flags_PureStartOpen() const { return (Flags & NArcInfoFlags::kPureStartOpen) != 0; }
-  bool Flags_ByExtOnlyOpen() const { return (Flags & NArcInfoFlags::kByExtOnlyOpen) != 0; }
-  bool Flags_HashHandler() const { return (Flags & NArcInfoFlags::kHashHandler) != 0; }
-
-  bool Flags_CTime() const { return (Flags & NArcInfoFlags::kCTime) != 0; }
-  bool Flags_ATime() const { return (Flags & NArcInfoFlags::kATime) != 0; }
-  bool Flags_MTime() const { return (Flags & NArcInfoFlags::kMTime) != 0; }
-
-  bool Flags_CTime_Default() const { return (Flags & NArcInfoFlags::kCTime_Default) != 0; }
-  bool Flags_ATime_Default() const { return (Flags & NArcInfoFlags::kATime_Default) != 0; }
-  bool Flags_MTime_Default() const { return (Flags & NArcInfoFlags::kMTime_Default) != 0; }
-
-  UInt32 Get_TimePrecFlags() const
-  {
-    return (TimeFlags >> NArcInfoTimeFlags::kTime_Prec_Mask_bit_index) &
-      (((UInt32)1 << NArcInfoTimeFlags::kTime_Prec_Mask_num_bits) - 1);
-  }
-
-  UInt32 Get_DefaultTimePrec() const
-  {
-    return (TimeFlags >> NArcInfoTimeFlags::kTime_Prec_Default_bit_index) &
-      (((UInt32)1 << NArcInfoTimeFlags::kTime_Prec_Default_num_bits) - 1);
-  }
-
-
+  
   UString GetMainExt() const
   {
     if (Exts.IsEmpty())
@@ -186,16 +141,6 @@ struct CArcInfoEx
   }
   int FindExtension(const UString &ext) const;
   
-  bool Is_7z()    const { return Name.IsEqualTo_Ascii_NoCase("7z"); }
-  bool Is_Split() const { return Name.IsEqualTo_Ascii_NoCase("Split"); }
-  bool Is_Xz()    const { return Name.IsEqualTo_Ascii_NoCase("xz"); }
-  bool Is_BZip2() const { return Name.IsEqualTo_Ascii_NoCase("bzip2"); }
-  bool Is_GZip()  const { return Name.IsEqualTo_Ascii_NoCase("gzip"); }
-  bool Is_Tar()   const { return Name.IsEqualTo_Ascii_NoCase("tar"); }
-  bool Is_Zip()   const { return Name.IsEqualTo_Ascii_NoCase("zip"); }
-  bool Is_Rar()   const { return Name.IsEqualTo_Ascii_NoCase("rar"); }
-  bool Is_Zstd()  const { return Name.IsEqualTo_Ascii_NoCase("zstd"); }
-
   /*
   UString GetAllExtensions() const
   {
@@ -203,7 +148,7 @@ struct CArcInfoEx
     for (int i = 0; i < Exts.Size(); i++)
     {
       if (i > 0)
-        s.Add_Space();
+        s += ' ';
       s += Exts[i].Ext;
     }
     return s;
@@ -212,29 +157,49 @@ struct CArcInfoEx
 
   void AddExts(const UString &ext, const UString &addExt);
 
+  bool IsSplit() const { return StringsAreEqualNoCase_Ascii(Name, "Split"); }
+  // bool IsRar() const { return StringsAreEqualNoCase_Ascii(Name, "Rar"); }
 
   CArcInfoEx():
       Flags(0),
-      TimeFlags(0),
       CreateInArchive(NULL),
       IsArcFunc(NULL)
-      #ifndef Z7_SFX
+      #ifndef _SFX
       , CreateOutArchive(NULL)
       , UpdateEnabled(false)
       , NewInterface(false)
       // , Version(0)
       , SignatureOffset(0)
       #endif
-      #ifdef Z7_EXTERNAL_CODECS
+      #ifdef EXTERNAL_CODECS
       , LibIndex(-1)
       #endif
   {}
 };
 
+#ifdef NEW_FOLDER_INTERFACE
+
+struct CCodecIcons
+{
+  struct CIconPair
+  {
+    UString Ext;
+    int IconIndex;
+  };
+  CObjectVector<CIconPair> IconPairs;
+
+  void LoadIcons(HMODULE m);
+  bool FindIconIndex(const UString &ext, int &iconIndex) const;
+};
 
-#ifdef Z7_EXTERNAL_CODECS
+#endif
+
+#ifdef EXTERNAL_CODECS
 
 struct CCodecLib
+  #ifdef NEW_FOLDER_INTERFACE
+    : public CCodecIcons
+  #endif
 {
   NWindows::NDLL::CLibrary Lib;
   FString Path;
@@ -246,53 +211,25 @@ struct CCodecLib
   Func_SetCodecs SetCodecs;
 
   CMyComPtr<IHashers> ComHashers;
-
-  UInt32 Version;
   
-  /*
   #ifdef NEW_FOLDER_INTERFACE
-  CCodecIcons CodecIcons;
-  void LoadIcons() { CodecIcons.LoadIcons((HMODULE)Lib); }
+  void LoadIcons() { CCodecIcons::LoadIcons((HMODULE)Lib); }
   #endif
-  */
   
   CCodecLib():
       CreateObject(NULL),
       GetMethodProperty(NULL),
       CreateDecoder(NULL),
       CreateEncoder(NULL),
-      SetCodecs(NULL),
-      Version(0)
+      SetCodecs(NULL)
       {}
 };
 
 #endif
 
-struct CCodecError
-{
-  FString Path;
-  HRESULT ErrorCode;
-  AString Message;
-  CCodecError(): ErrorCode(0) {}
-};
-
-
-struct CCodecInfoUser
-{
-  // unsigned LibIndex;
-  // UInt32 CodecIndex;
-  // UInt64 id;
-  bool EncoderIsAssigned;
-  bool DecoderIsAssigned;
-  bool IsFilter;
-  bool IsFilter_Assigned;
-  UInt32 NumStreams;
-  AString Name;
-};
 
-
-class CCodecs Z7_final:
-  #ifdef Z7_EXTERNAL_CODECS
+class CCodecs:
+  #ifdef EXTERNAL_CODECS
     public ICompressCodecsInfo,
     public IHashers,
   #else
@@ -300,26 +237,18 @@ class CCodecs Z7_final:
   #endif
   public CMyUnknownImp
 {
-#ifdef Z7_EXTERNAL_CODECS
-  Z7_IFACES_IMP_UNK_2(ICompressCodecsInfo, IHashers)
-#else
-  Z7_COM_UNKNOWN_IMP_0
-#endif // Z7_EXTERNAL_CODECS
-
-  Z7_CLASS_NO_COPY(CCodecs)
+  CLASS_NO_COPY(CCodecs);
 public:
-  #ifdef Z7_EXTERNAL_CODECS
+  #ifdef EXTERNAL_CODECS
   
   CObjectVector<CCodecLib> Libs;
   FString MainDll_ErrorPath;
-  CObjectVector<CCodecError> Errors;
-  
-  void AddLastError(const FString &path);
+
   void CloseLibs();
 
   class CReleaser
   {
-    Z7_CLASS_NO_COPY(CReleaser)
+    CLASS_NO_COPY(CReleaser);
 
     /* CCodecsReleaser object releases CCodecs links.
          1) CCodecs is COM object that is deleted when all links to that object will be released/
@@ -343,32 +272,30 @@ public:
 
   HRESULT CreateArchiveHandler(const CArcInfoEx &ai, bool outHandler, void **archive) const
   {
-    return Libs[(unsigned)ai.LibIndex].CreateObject(&ai.ClassID, outHandler ? &IID_IOutArchive : &IID_IInArchive, (void **)archive);
+    return Libs[ai.LibIndex].CreateObject(&ai.ClassID, outHandler ? &IID_IOutArchive : &IID_IInArchive, (void **)archive);
   }
   
   #endif
 
-  /*
   #ifdef NEW_FOLDER_INTERFACE
   CCodecIcons InternalIcons;
   #endif
-  */
 
   CObjectVector<CArcInfoEx> Formats;
   
-  #ifdef Z7_EXTERNAL_CODECS
+  #ifdef EXTERNAL_CODECS
   CRecordVector<CDllCodecInfo> Codecs;
   CRecordVector<CDllHasherInfo> Hashers;
   #endif
 
-  bool CaseSensitive_Change;
+  bool CaseSensitiveChange;
   bool CaseSensitive;
 
   CCodecs():
-      #ifdef Z7_EXTERNAL_CODECS
+      #ifdef EXTERNAL_CODECS
       NeedSetLibCodecs(true),
       #endif
-      CaseSensitive_Change(false),
+      CaseSensitiveChange(false),
       CaseSensitive(false)
       {}
 
@@ -379,24 +306,43 @@ public:
  
   const wchar_t *GetFormatNamePtr(int formatIndex) const
   {
-    return formatIndex < 0 ? L"#" : (const wchar_t *)Formats[(unsigned)formatIndex].Name;
+    return formatIndex < 0 ? L"#" : (const wchar_t *)Formats[formatIndex].Name;
   }
 
   HRESULT Load();
-
-  #ifndef Z7_SFX
+  
+  #ifndef _SFX
   int FindFormatForArchiveName(const UString &arcPath) const;
   int FindFormatForExtension(const UString &ext) const;
   int FindFormatForArchiveType(const UString &arcType) const;
   bool FindFormatForArchiveType(const UString &arcType, CIntVector &formatIndices) const;
   #endif
 
-  #ifdef Z7_EXTERNAL_CODECS
+  #ifdef EXTERNAL_CODECS
+
+  MY_UNKNOWN_IMP2(ICompressCodecsInfo, IHashers)
+    
+  STDMETHOD(GetNumMethods)(UInt32 *numMethods);
+  STDMETHOD(GetProperty)(UInt32 index, PROPID propID, PROPVARIANT *value);
+  STDMETHOD(CreateDecoder)(UInt32 index, const GUID *iid, void **coder);
+  STDMETHOD(CreateEncoder)(UInt32 index, const GUID *iid, void **coder);
+
+  STDMETHOD_(UInt32, GetNumHashers)();
+  STDMETHOD(GetHasherProp)(UInt32 index, PROPID propID, PROPVARIANT *value);
+  STDMETHOD(CreateHasher)(UInt32 index, IHasher **hasher);
+
+  #else
+
+  MY_UNKNOWN_IMP
+
+  #endif // EXTERNAL_CODECS
+
+  
+  #ifdef EXTERNAL_CODECS
 
   int GetCodec_LibIndex(UInt32 index) const;
   bool GetCodec_DecoderIsAssigned(UInt32 index) const;
   bool GetCodec_EncoderIsAssigned(UInt32 index) const;
-  bool GetCodec_IsFilter(UInt32 index, bool &isAssigned) const;
   UInt32 GetCodec_NumStreams(UInt32 index);
   HRESULT GetCodec_Id(UInt32 index, UInt64 &id);
   AString GetCodec_Name(UInt32 index);
@@ -406,14 +352,12 @@ public:
   AString GetHasherName(UInt32 index);
   UInt32 GetHasherDigestSize(UInt32 index);
 
-  void GetCodecsErrorMessage(UString &s);
-
   #endif
 
   HRESULT CreateInArchive(unsigned formatIndex, CMyComPtr<IInArchive> &archive) const
   {
     const CArcInfoEx &ai = Formats[formatIndex];
-    #ifdef Z7_EXTERNAL_CODECS
+    #ifdef EXTERNAL_CODECS
     if (ai.LibIndex < 0)
     #endif
     {
@@ -422,17 +366,17 @@ public:
       return S_OK;
       COM_TRY_END
     }
-    #ifdef Z7_EXTERNAL_CODECS
+    #ifdef EXTERNAL_CODECS
     return CreateArchiveHandler(ai, false, (void **)&archive);
     #endif
   }
   
-  #ifndef Z7_SFX
+  #ifndef _SFX
 
   HRESULT CreateOutArchive(unsigned formatIndex, CMyComPtr<IOutArchive> &archive) const
   {
     const CArcInfoEx &ai = Formats[formatIndex];
-    #ifdef Z7_EXTERNAL_CODECS
+    #ifdef EXTERNAL_CODECS
     if (ai.LibIndex < 0)
     #endif
     {
@@ -442,7 +386,7 @@ public:
       COM_TRY_END
     }
     
-    #ifdef Z7_EXTERNAL_CODECS
+    #ifdef EXTERNAL_CODECS
     return CreateArchiveHandler(ai, true, (void **)&archive);
     #endif
   }
@@ -455,28 +399,26 @@ public:
       if (!arc.UpdateEnabled)
         continue;
       if (arc.Name.IsEqualTo_NoCase(name))
-        return (int)i;
+        return i;
     }
     return -1;
   }
 
-  void Get_CodecsInfoUser_Vector(CObjectVector<CCodecInfoUser> &v);
-
-  #endif // Z7_SFX
+  #endif // _SFX
 };
 
-#ifdef Z7_EXTERNAL_CODECS
+#ifdef EXTERNAL_CODECS
   #define CREATE_CODECS_OBJECT \
     CCodecs *codecs = new CCodecs; \
-    CExternalCodecs _externalCodecs; \
-    _externalCodecs.GetCodecs = codecs; \
-    _externalCodecs.GetHashers = codecs; \
+    CExternalCodecs __externalCodecs; \
+    __externalCodecs.GetCodecs = codecs; \
+    __externalCodecs.GetHashers = codecs; \
     CCodecs::CReleaser codecsReleaser; \
     codecsReleaser.Set(codecs);
 #else
   #define CREATE_CODECS_OBJECT \
     CCodecs *codecs = new CCodecs; \
-    CMyComPtr<IUnknown> _codecsRef = codecs;
+    CMyComPtr<IUnknown> __codecsRef = codecs;
 #endif
-
+  
 #endif