Make 7-Zip mainline Zstandard decoder, Zstandard official decoder and…

… Zstandard official encoder side-by-side in NanaZip.Core project.
M2Team · May 16, 2024 · 92ddadb · 92ddadb
1 parent f235dc8
commit 92ddadb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/....Core/Extensions/ZSCodecs/ZstdDecoder.cpp → ...Core/Extensions/ZSCodecs/Zstd2Decoder.cpp b/....Core/Extensions/ZSCodecs/ZstdDecoder.cpp → ...Core/Extensions/ZSCodecs/Zstd2Decoder.cpp
diff --git a/....Core/Extensions/ZSCodecs/ZstdHandler.cpp → ...Core/Extensions/ZSCodecs/Zstd2Handler.cpp b/....Core/Extensions/ZSCodecs/ZstdHandler.cpp → ...Core/Extensions/ZSCodecs/Zstd2Handler.cpp
@@ -366,7 +366,7 @@ Z7_COM7F_IMF(CHandler::SetProperties(const wchar_t * const *names, const PROPVAR
 static const Byte k_Signature[] = "0xFD2FB522..28";
 
 REGISTER_ARC_IO(
-  "zstd", "zst zstd tzst tzstd", "* * .tar .tar", 0x0e,
+  "zstd", "zst zstd tzst tzstd", "* * .tar .tar", 0x0e + 1,
   k_Signature,
   0,
   NArcInfoFlags::kKeepName,

diff --git a/NanaZip.Core/NanaZip.Core.vcxproj b/NanaZip.Core/NanaZip.Core.vcxproj
@@ -74,9 +74,9 @@
     <ClCompile Include="Extensions\ZSCodecs\Lz5Handler.cpp" />
     <ClCompile Include="Extensions\ZSCodecs\Lz5Register.cpp" />
     <ClCompile Include="Extensions\ZSCodecs\LzHandler.cpp" />
-    <ClCompile Include="Extensions\ZSCodecs\ZstdDecoder.cpp" />
+    <ClCompile Include="Extensions\ZSCodecs\Zstd2Decoder.cpp" />
     <ClCompile Include="Extensions\ZSCodecs\ZstdEncoder.cpp" />
-    <ClCompile Include="Extensions\ZSCodecs\ZstdHandler.cpp" />
+    <ClCompile Include="Extensions\ZSCodecs\Zstd2Handler.cpp" />
     <ClCompile Include="Extensions\ZSCodecs\ZstdRegister.cpp" />
     <ClCompile Include="SevenZip\CPP\7zip\Archive\7z\7zCompressionMode.cpp" />
     <ClCompile Include="SevenZip\CPP\7zip\Archive\7z\7zDecode.cpp" />

diff --git a/NanaZip.Core/NanaZip.Core.vcxproj.filters b/NanaZip.Core/NanaZip.Core.vcxproj.filters
@@ -917,7 +917,7 @@
     <ClCompile Include="SevenZip\CPP\Common\Sha1Prepare.cpp">
       <Filter>SevenZip\CPP\Common</Filter>
     </ClCompile>
-    <ClCompile Include="Extensions\ZSCodecs\ZstdDecoder.cpp">
+    <ClCompile Include="Extensions\ZSCodecs\Zstd2Decoder.cpp">
       <Filter>Extensions\ZSCodecs</Filter>
     </ClCompile>
     <ClCompile Include="Extensions\ZSCodecs\ZstdRegister.cpp">
@@ -983,7 +983,7 @@
     <ClCompile Include="Extensions\ZSCodecs\LzHandler.cpp">
       <Filter>Extensions\ZSCodecs</Filter>
     </ClCompile>
-    <ClCompile Include="Extensions\ZSCodecs\ZstdHandler.cpp">
+    <ClCompile Include="Extensions\ZSCodecs\Zstd2Handler.cpp">
       <Filter>Extensions\ZSCodecs</Filter>
     </ClCompile>
     <ClCompile Include="SevenZip\C\Xxh64.c">