1 files changed, 54 insertions, 13 deletions
diff --git a/src/libs/7zip/unix/CPP/7zip/Common/RegisterArc.h b/src/libs/7zip/unix/CPP/7zip/Common/RegisterArc.h
index 305aac1fd..82bd09673 100644
--- a/src/libs/7zip/unix/CPP/7zip/Common/RegisterArc.h
+++ b/src/libs/7zip/unix/CPP/7zip/Common/RegisterArc.h
@@ -5,28 +5,69 @@
 
 #include "../Archive/IArchive.h"
 
-typedef IInArchive * (*CreateInArchiveP)();
-typedef IOutArchive * (*CreateOutArchiveP)();
+#include <mutex>
 
 struct CArcInfo
 {
-  const wchar_t *Name;
-  const wchar_t *Ext;
-  const wchar_t *AddExt;
+  const char *Name;
+  const char *Ext;
+  const char *AddExt;
+
   Byte ClassId;
-  Byte Signature[28];  // FIXME Byte Signature[16]; adding 22 bytes to insure kSignature[0x1A]!= 0 and  kSignature[0x1B] != 0
-  int SignatureSize;
-  bool KeepName;
-  CreateInArchiveP CreateInArchive;
-  CreateOutArchiveP CreateOutArchive;
+
+  Byte SignatureSize;
+  Byte Signature[20];
+  UInt16 SignatureOffset;
+
+  UInt16 Flags;
+
+  Func_CreateInArchive CreateInArchive;
+  Func_CreateOutArchive CreateOutArchive;
+  Func_IsArc IsArc;
+
+  bool IsMultiSignature() const { return (Flags & NArcInfoFlags::kMultiSignature) != 0; }
+
+  std::once_flag once;
 };
 
-void RegisterArc(const CArcInfo *arcInfo);
+void RegisterArc(const CArcInfo *arcInfo) throw();
 
 #define REGISTER_ARC_NAME(x) CRegister ## x
 
-#define REGISTER_ARC(x) struct REGISTER_ARC_NAME(x) { \
-    REGISTER_ARC_NAME(x)() { RegisterArc(&g_ArcInfo); }}; \
+#define REGISTER_ARC(x) struct REGISTER_ARC_NAME(x) \
+    { \
+        REGISTER_ARC_NAME(x)() \
+        { \
+            std::call_once(g_ArcInfo.once, [] { RegisterArc(&g_ArcInfo); }); \
+        } \
+    }; \
     static REGISTER_ARC_NAME(x) g_RegisterArc; \
     void registerArc##x() { static REGISTER_ARC_NAME(x) g_RegisterArc; }
+
+#define REGISTER_ARC_DEC_SIG(x) struct REGISTER_ARC_NAME(x) \
+    { \
+        REGISTER_ARC_NAME(x)() { \
+            std::call_once(g_ArcInfo.once, [] { \
+                g_ArcInfo.Signature[0]--; \
+                RegisterArc(&g_ArcInfo); \
+            }); \
+        } \
+    }; \
+    static REGISTER_ARC_NAME(x) g_RegisterArc; \
+    void registerArcDec##x() { static REGISTER_ARC_NAME(x) g_RegisterArc; }
+
+
+#define IMP_CreateArcIn_2(c) \
+  static IInArchive *CreateArc() { return new c; }
+
+#define IMP_CreateArcIn IMP_CreateArcIn_2(CHandler)
+
+#ifdef EXTRACT_ONLY
+  #define IMP_CreateArcOut
+  #define REF_CreateArc_Pair CreateArc, NULL
+#else
+  #define IMP_CreateArcOut static IOutArchive *CreateArcOut() { return new CHandler; }
+  #define REF_CreateArc_Pair CreateArc, CreateArcOut
+#endif
+
 #endif