1 files changed, 40 insertions, 8 deletions

diff --git a/src/libs/7zip/unix/CPP/7zip/Common/RegisterCodec.h b/src/libs/7zip/unix/CPP/7zip/Common/RegisterCodec.h
index d53c4344a..0c6662a6c 100644
--- a/src/libs/7zip/unix/CPP/7zip/Common/RegisterCodec.h
+++ b/src/libs/7zip/unix/CPP/7zip/Common/RegisterCodec.h
@@ -1,9 +1,12 @@
 // RegisterCodec.h
 
-#ifndef __REGISTERCODEC_H
-#define __REGISTERCODEC_H
+#ifndef __REGISTER_CODEC_H
+#define __REGISTER_CODEC_H
 
 #include "../Common/MethodId.h"
+#include "../ICoder.h"
+
+#include <mutex>
 
 typedef void * (*CreateCodecP)();
 struct CCodecInfo
@@ -14,21 +17,50 @@ struct CCodecInfo
   const wchar_t *Name;
   UInt32 NumInStreams;
   bool IsFilter;
+  std::once_flag once;
 };
 
-void RegisterCodec(const CCodecInfo *codecInfo);
+void RegisterCodec(const CCodecInfo *codecInfo) throw();
 
 #define REGISTER_CODEC_NAME(x) CRegisterCodec ## x
 
-#define REGISTER_CODEC(x) struct REGISTER_CODEC_NAME(x) { \
-    REGISTER_CODEC_NAME(x)() { RegisterCodec(&g_CodecInfo); }}; \
+#define REGISTER_CODEC(x) struct REGISTER_CODEC_NAME(x) \
+    { \
+        REGISTER_CODEC_NAME(x)() \
+        { \
+            std::call_once(g_CodecInfo.once, [] { RegisterCodec(&g_CodecInfo); }); \
+        } \
+    }; \
     static REGISTER_CODEC_NAME(x) g_RegisterCodec; \
     void registerCodec##x() { static REGISTER_CODEC_NAME(x) g_RegisterCodecs; }
 
 #define REGISTER_CODECS_NAME(x) CRegisterCodecs ## x
-#define REGISTER_CODECS(x) struct REGISTER_CODECS_NAME(x) { \
-    REGISTER_CODECS_NAME(x)() { for (int i = 0; i < sizeof(g_CodecsInfo) / sizeof(g_CodecsInfo[0]); i++) \
-    RegisterCodec(&g_CodecsInfo[i]); }}; \
+#define REGISTER_CODECS(x) struct REGISTER_CODECS_NAME(x) \
+    { \
+        REGISTER_CODECS_NAME(x)() \
+        { \
+            for (unsigned i = 0; i < ARRAY_SIZE(g_CodecsInfo); i++) \
+                std::call_once(g_CodecsInfo[i].once, [&i] { RegisterCodec(&g_CodecsInfo[i]); }); \
+        } \
+    }; \
     static REGISTER_CODECS_NAME(x) g_RegisterCodecs; \
     void registerCodec##x() { static REGISTER_CODECS_NAME(x) g_RegisterCodecs; }
+
+
+struct CHasherInfo
+{
+  IHasher * (*CreateHasher)();
+  CMethodId Id;
+  const wchar_t *Name;
+  UInt32 DigestSize;
+};
+
+void RegisterHasher(const CHasherInfo *hasher) throw();
+
+#define REGISTER_HASHER_NAME(x) CRegisterHasher ## x
+
+#define REGISTER_HASHER(x) struct REGISTER_HASHER_NAME(x) { \
+    REGISTER_HASHER_NAME(x)() { RegisterHasher(&g_HasherInfo); }}; \
+    static REGISTER_HASHER_NAME(x) g_RegisterHasher;
+
 #endif