9.34

CPP/7zip/Archive/Zip/ZipRegister.cpp

@@ -5,14 +5,27 @@
 #include "../../Common/RegisterArc.h"
 
 #include "ZipHandler.h"
-static IInArchive *CreateArc() { return new NArchive::NZip::CHandler; }
-#ifndef EXTRACT_ONLY
-static IOutArchive *CreateArcOut() { return new NArchive::NZip::CHandler; }
-#else
-#define CreateArcOut 0
-#endif
+
+namespace NArchive {
+namespace NZip {
+
+IMP_CreateArcIn
+IMP_CreateArcOut
 
 static CArcInfo g_ArcInfo =
-  { L"zip", L"zip jar xpi odt ods docx xlsx", 0, 1, { 0x50, 0x4B, 0x03, 0x04 }, 4, false, CreateArc, CreateArcOut };
+  { "zip", "zip zipx jar xpi odt ods docx xlsx epub", 0, 1,
+  3 + 4 + 4 + 6,
+  {
+    4, 0x50, 0x4B, 0x03, 0x04,
+    4, 0x50, 0x4B, 0x05, 0x06,
+    6, 0x50, 0x4B, 0x30, 0x30, 0x50, 0x4B,
+  },
+  0,
+  NArcInfoFlags::kFindSignature |
+  NArcInfoFlags::kMultiSignature |
+  NArcInfoFlags::kUseGlobalOffset,
+  REF_CreateArc_Pair, IsArc_Zip };
 
 REGISTER_ARC(Zip)
+
+}}