Migrate ZSTDMT from NanaZip.Core to NanaZip.Codecs.

M2Team · Feb 4, 2024 · d8f5353 · d8f5353
1 parent bbb551e
commit d8f5353
Show file tree

Hide file tree

Showing 28 changed files with 114 additions and 164 deletions.
diff --git a/NanaZip.Codecs/NanaZip.Codecs.def b/NanaZip.Codecs/NanaZip.Codecs.def
@@ -123,3 +123,32 @@ LizardF_decompress
 LizardF_freeDecompressionContext
 LizardF_getErrorName
 LizardF_isError
+
+BROTLIMT_compressCCtx
+BROTLIMT_createCCtx
+BROTLIMT_createDCtx
+BROTLIMT_decompressDCtx
+BROTLIMT_freeCCtx
+BROTLIMT_freeDCtx
+BROTLIMT_isError
+LIZARDMT_compressCCtx
+LIZARDMT_createCCtx
+LIZARDMT_createDCtx
+LIZARDMT_decompressDCtx
+LIZARDMT_freeCCtx
+LIZARDMT_freeDCtx
+LIZARDMT_isError
+LZ4MT_compressCCtx
+LZ4MT_createCCtx
+LZ4MT_createDCtx
+LZ4MT_decompressDCtx
+LZ4MT_freeCCtx
+LZ4MT_freeDCtx
+LZ4MT_isError
+LZ5MT_compressCCtx
+LZ5MT_createCCtx
+LZ5MT_createDCtx
+LZ5MT_decompressDCtx
+LZ5MT_freeCCtx
+LZ5MT_freeDCtx
+LZ5MT_isError
diff --git a/NanaZip.Codecs/NanaZip.Codecs.props b/NanaZip.Codecs/NanaZip.Codecs.props
@@ -18,6 +18,7 @@
     <IncludePath>$(MSBuildThisFileDirectory)LZ4\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)LZ5\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)RHash\;$(IncludePath)</IncludePath>
+    <IncludePath>$(MSBuildThisFileDirectory)ZSTDMT\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>

diff --git a/NanaZip.Codecs/NanaZip.Codecs.vcxproj b/NanaZip.Codecs/NanaZip.Codecs.vcxproj
@@ -32,6 +32,7 @@
     <IncludePath>$(MSBuildThisFileDirectory)LZ5\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)RHash\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)xxHash\;$(IncludePath)</IncludePath>
+    <IncludePath>$(MSBuildThisFileDirectory)ZSTDMT\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -47,6 +48,19 @@
     <None Include="NanaZip.Codecs.props" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="ZSTDMT\brotli-mt_common.c" />
+    <ClCompile Include="ZSTDMT\brotli-mt_compress.c" />
+    <ClCompile Include="ZSTDMT\brotli-mt_decompress.c" />
+    <ClCompile Include="ZSTDMT\lizard-mt_common.c" />
+    <ClCompile Include="ZSTDMT\lizard-mt_compress.c" />
+    <ClCompile Include="ZSTDMT\lizard-mt_decompress.c" />
+    <ClCompile Include="ZSTDMT\lz4-mt_common.c" />
+    <ClCompile Include="ZSTDMT\lz4-mt_compress.c" />
+    <ClCompile Include="ZSTDMT\lz4-mt_decompress.c" />
+    <ClCompile Include="ZSTDMT\lz5-mt_common.c" />
+    <ClCompile Include="ZSTDMT\lz5-mt_compress.c" />
+    <ClCompile Include="ZSTDMT\lz5-mt_decompress.c" />
+    <ClCompile Include="ZSTDMT\zstd-mt_threading.c" />
     <ClCompile Include="Lizard\lizard_compress.c" />
     <ClCompile Include="Lizard\lizard_decompress.c" />
     <ClCompile Include="Lizard\lizard_frame.c" />
@@ -168,6 +182,13 @@
     <ClCompile Include="NanaZip.Codecs.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="ZSTDMT\brotli-mt.h" />
+    <ClInclude Include="ZSTDMT\list.h" />
+    <ClInclude Include="ZSTDMT\lizard-mt.h" />
+    <ClInclude Include="ZSTDMT\lz4-mt.h" />
+    <ClInclude Include="ZSTDMT\lz5-mt.h" />
+    <ClInclude Include="ZSTDMT\memmt.h" />
+    <ClInclude Include="ZSTDMT\threading.h" />
     <ClInclude Include="Lizard\bitstream.h" />
     <ClInclude Include="Lizard\error_private.h" />
     <ClInclude Include="Lizard\error_public.h" />

diff --git a/NanaZip.Codecs/NanaZip.Codecs.vcxproj.filters b/NanaZip.Codecs/NanaZip.Codecs.vcxproj.filters
@@ -242,6 +242,45 @@
     <ClCompile Include="Lizard\liz_huf_decompress.c">
       <Filter>Lizard</Filter>
     </ClCompile>
+    <ClCompile Include="ZSTDMT\brotli-mt_common.c">
+      <Filter>ZSTDMT</Filter>
+    </ClCompile>
+    <ClCompile Include="ZSTDMT\brotli-mt_compress.c">
+      <Filter>ZSTDMT</Filter>
+    </ClCompile>
+    <ClCompile Include="ZSTDMT\brotli-mt_decompress.c">
+      <Filter>ZSTDMT</Filter>
+    </ClCompile>
+    <ClCompile Include="ZSTDMT\lizard-mt_common.c">
+      <Filter>ZSTDMT</Filter>
+    </ClCompile>
+    <ClCompile Include="ZSTDMT\lizard-mt_compress.c">
+      <Filter>ZSTDMT</Filter>
+    </ClCompile>
+    <ClCompile Include="ZSTDMT\lizard-mt_decompress.c">
+      <Filter>ZSTDMT</Filter>
+    </ClCompile>
+    <ClCompile Include="ZSTDMT\lz4-mt_common.c">
+      <Filter>ZSTDMT</Filter>
+    </ClCompile>
+    <ClCompile Include="ZSTDMT\lz4-mt_compress.c">
+      <Filter>ZSTDMT</Filter>
+    </ClCompile>
+    <ClCompile Include="ZSTDMT\lz4-mt_decompress.c">
+      <Filter>ZSTDMT</Filter>
+    </ClCompile>
+    <ClCompile Include="ZSTDMT\lz5-mt_common.c">
+      <Filter>ZSTDMT</Filter>
+    </ClCompile>
+    <ClCompile Include="ZSTDMT\lz5-mt_compress.c">
+      <Filter>ZSTDMT</Filter>
+    </ClCompile>
+    <ClCompile Include="ZSTDMT\lz5-mt_decompress.c">
+      <Filter>ZSTDMT</Filter>
+    </ClCompile>
+    <ClCompile Include="ZSTDMT\zstd-mt_threading.c">
+      <Filter>ZSTDMT</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="NanaZip.Codecs.def" />
@@ -290,6 +329,9 @@
     <Filter Include="Lizard">
       <UniqueIdentifier>{3bd67c07-e7a9-462e-bfa1-a18141e2e67c}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ZSTDMT">
+      <UniqueIdentifier>{0f78d39c-0bbe-4715-9237-133b2a02b2fd}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="BLAKE3\blake3.h">
@@ -658,5 +700,26 @@
     <ClInclude Include="Lizard\mem.h">
       <Filter>Lizard</Filter>
     </ClInclude>
+    <ClInclude Include="ZSTDMT\brotli-mt.h">
+      <Filter>ZSTDMT</Filter>
+    </ClInclude>
+    <ClInclude Include="ZSTDMT\list.h">
+      <Filter>ZSTDMT</Filter>
+    </ClInclude>
+    <ClInclude Include="ZSTDMT\lizard-mt.h">
+      <Filter>ZSTDMT</Filter>
+    </ClInclude>
+    <ClInclude Include="ZSTDMT\lz4-mt.h">
+      <Filter>ZSTDMT</Filter>
+    </ClInclude>
+    <ClInclude Include="ZSTDMT\lz5-mt.h">
+      <Filter>ZSTDMT</Filter>
+    </ClInclude>
+    <ClInclude Include="ZSTDMT\memmt.h">
+      <Filter>ZSTDMT</Filter>
+    </ClInclude>
+    <ClInclude Include="ZSTDMT\threading.h">
+      <Filter>ZSTDMT</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/NanaZip.Core/ZSTDMT/brotli-mt.h → NanaZip.Codecs/ZSTDMT/brotli-mt.h b/NanaZip.Core/ZSTDMT/brotli-mt.h → NanaZip.Codecs/ZSTDMT/brotli-mt.h
diff --git a/NanaZip.Core/ZSTDMT/brotli-mt_common.c → NanaZip.Codecs/ZSTDMT/brotli-mt_common.c b/NanaZip.Core/ZSTDMT/brotli-mt_common.c → NanaZip.Codecs/ZSTDMT/brotli-mt_common.c
diff --git a/NanaZip.Core/ZSTDMT/brotli-mt_compress.c → NanaZip.Codecs/ZSTDMT/brotli-mt_compress.c b/NanaZip.Core/ZSTDMT/brotli-mt_compress.c → NanaZip.Codecs/ZSTDMT/brotli-mt_compress.c
diff --git a/NanaZip.Core/ZSTDMT/brotli-mt_decompress.c → NanaZip.Codecs/ZSTDMT/brotli-mt_decompress.c b/NanaZip.Core/ZSTDMT/brotli-mt_decompress.c → NanaZip.Codecs/ZSTDMT/brotli-mt_decompress.c
diff --git a/NanaZip.Core/ZSTDMT/list.h → NanaZip.Codecs/ZSTDMT/list.h b/NanaZip.Core/ZSTDMT/list.h → NanaZip.Codecs/ZSTDMT/list.h
diff --git a/NanaZip.Core/ZSTDMT/lizard-mt.h → NanaZip.Codecs/ZSTDMT/lizard-mt.h b/NanaZip.Core/ZSTDMT/lizard-mt.h → NanaZip.Codecs/ZSTDMT/lizard-mt.h
diff --git a/NanaZip.Core/ZSTDMT/lizard-mt_common.c → NanaZip.Codecs/ZSTDMT/lizard-mt_common.c b/NanaZip.Core/ZSTDMT/lizard-mt_common.c → NanaZip.Codecs/ZSTDMT/lizard-mt_common.c
diff --git a/NanaZip.Core/ZSTDMT/lizard-mt_compress.c → NanaZip.Codecs/ZSTDMT/lizard-mt_compress.c b/NanaZip.Core/ZSTDMT/lizard-mt_compress.c → NanaZip.Codecs/ZSTDMT/lizard-mt_compress.c
diff --git a/NanaZip.Core/ZSTDMT/lizard-mt_decompress.c → NanaZip.Codecs/ZSTDMT/lizard-mt_decompress.c b/NanaZip.Core/ZSTDMT/lizard-mt_decompress.c → NanaZip.Codecs/ZSTDMT/lizard-mt_decompress.c
diff --git a/NanaZip.Core/ZSTDMT/lz4-mt.h → NanaZip.Codecs/ZSTDMT/lz4-mt.h b/NanaZip.Core/ZSTDMT/lz4-mt.h → NanaZip.Codecs/ZSTDMT/lz4-mt.h
diff --git a/NanaZip.Core/ZSTDMT/lz4-mt_common.c → NanaZip.Codecs/ZSTDMT/lz4-mt_common.c b/NanaZip.Core/ZSTDMT/lz4-mt_common.c → NanaZip.Codecs/ZSTDMT/lz4-mt_common.c
diff --git a/NanaZip.Core/ZSTDMT/lz4-mt_compress.c → NanaZip.Codecs/ZSTDMT/lz4-mt_compress.c b/NanaZip.Core/ZSTDMT/lz4-mt_compress.c → NanaZip.Codecs/ZSTDMT/lz4-mt_compress.c
diff --git a/NanaZip.Core/ZSTDMT/lz4-mt_decompress.c → NanaZip.Codecs/ZSTDMT/lz4-mt_decompress.c b/NanaZip.Core/ZSTDMT/lz4-mt_decompress.c → NanaZip.Codecs/ZSTDMT/lz4-mt_decompress.c
diff --git a/NanaZip.Core/ZSTDMT/lz5-mt.h → NanaZip.Codecs/ZSTDMT/lz5-mt.h b/NanaZip.Core/ZSTDMT/lz5-mt.h → NanaZip.Codecs/ZSTDMT/lz5-mt.h
diff --git a/NanaZip.Core/ZSTDMT/lz5-mt_common.c → NanaZip.Codecs/ZSTDMT/lz5-mt_common.c b/NanaZip.Core/ZSTDMT/lz5-mt_common.c → NanaZip.Codecs/ZSTDMT/lz5-mt_common.c
diff --git a/NanaZip.Core/ZSTDMT/lz5-mt_compress.c → NanaZip.Codecs/ZSTDMT/lz5-mt_compress.c b/NanaZip.Core/ZSTDMT/lz5-mt_compress.c → NanaZip.Codecs/ZSTDMT/lz5-mt_compress.c
diff --git a/NanaZip.Core/ZSTDMT/lz5-mt_decompress.c → NanaZip.Codecs/ZSTDMT/lz5-mt_decompress.c b/NanaZip.Core/ZSTDMT/lz5-mt_decompress.c → NanaZip.Codecs/ZSTDMT/lz5-mt_decompress.c
diff --git a/NanaZip.Core/ZSTDMT/memmt.h → NanaZip.Codecs/ZSTDMT/memmt.h b/NanaZip.Core/ZSTDMT/memmt.h → NanaZip.Codecs/ZSTDMT/memmt.h
diff --git a/NanaZip.Core/ZSTDMT/threading.h → NanaZip.Codecs/ZSTDMT/threading.h b/NanaZip.Core/ZSTDMT/threading.h → NanaZip.Codecs/ZSTDMT/threading.h
diff --git a/NanaZip.Core/ZSTDMT/zstd-mt_threading.c → NanaZip.Codecs/ZSTDMT/zstd-mt_threading.c b/NanaZip.Core/ZSTDMT/zstd-mt_threading.c → NanaZip.Codecs/ZSTDMT/zstd-mt_threading.c
diff --git a/NanaZip.Core/NanaZip.Core.vcxproj b/NanaZip.Core/NanaZip.Core.vcxproj
@@ -26,7 +26,6 @@
     <IncludePath>$(MSBuildThisFileDirectory)xxHash\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)Zstandard\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)FastLZMA2\;$(IncludePath)</IncludePath>
-    <IncludePath>$(MSBuildThisFileDirectory)ZSTDMT\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -61,8 +60,6 @@
     <None Include="SevenZip\C\XzCrc64Opt.c" />
     <None Include="SevenZip\C\LzFindOpt.c" />
     <None Include="SevenZip\C\Sha1Opt.c" />
-    <None Include="ZSTDMT\LICENSE" />
-    <None Include="ZSTDMT\README.md" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Extensions\BLAKE3\Blake3Handler.cpp" />
@@ -435,19 +432,6 @@
     <ClCompile Include="SevenZip\C\XzDec.c" />
     <ClCompile Include="SevenZip\C\XzEnc.c" />
     <ClCompile Include="SevenZip\C\XzIn.c" />
-    <ClCompile Include="ZSTDMT\brotli-mt_common.c" />
-    <ClCompile Include="ZSTDMT\brotli-mt_compress.c" />
-    <ClCompile Include="ZSTDMT\brotli-mt_decompress.c" />
-    <ClCompile Include="ZSTDMT\lizard-mt_common.c" />
-    <ClCompile Include="ZSTDMT\lizard-mt_compress.c" />
-    <ClCompile Include="ZSTDMT\lizard-mt_decompress.c" />
-    <ClCompile Include="ZSTDMT\lz4-mt_common.c" />
-    <ClCompile Include="ZSTDMT\lz4-mt_compress.c" />
-    <ClCompile Include="ZSTDMT\lz4-mt_decompress.c" />
-    <ClCompile Include="ZSTDMT\lz5-mt_common.c" />
-    <ClCompile Include="ZSTDMT\lz5-mt_compress.c" />
-    <ClCompile Include="ZSTDMT\lz5-mt_decompress.c" />
-    <ClCompile Include="ZSTDMT\zstd-mt_threading.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Extensions\ZSCodecs\BrotliDecoder.h" />
@@ -773,13 +757,6 @@
     <ClInclude Include="SevenZip\C\Xz.h" />
     <ClInclude Include="SevenZip\C\XzCrc64.h" />
     <ClInclude Include="SevenZip\C\XzEnc.h" />
-    <ClInclude Include="ZSTDMT\brotli-mt.h" />
-    <ClInclude Include="ZSTDMT\list.h" />
-    <ClInclude Include="ZSTDMT\lizard-mt.h" />
-    <ClInclude Include="ZSTDMT\lz4-mt.h" />
-    <ClInclude Include="ZSTDMT\lz5-mt.h" />
-    <ClInclude Include="ZSTDMT\memmt.h" />
-    <ClInclude Include="ZSTDMT\threading.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="SevenZip\CPP\7zip\Guid.txt" />

diff --git a/NanaZip.Core/NanaZip.Core.vcxproj.filters b/NanaZip.Core/NanaZip.Core.vcxproj.filters
@@ -112,9 +112,6 @@
     <Filter Include="FastLZMA2">
       <UniqueIdentifier>{4d033b0f-6065-4d51-a2f8-736b34eb0a97}</UniqueIdentifier>
     </Filter>
-    <Filter Include="ZSTDMT">
-      <UniqueIdentifier>{02539d4f-19f3-4cf5-b37c-9e09fefd1b41}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Extensions\ZSCodecs">
       <UniqueIdentifier>{c1700c83-d324-448c-99e2-b2cb2b51d3ad}</UniqueIdentifier>
     </Filter>
@@ -171,12 +168,6 @@
     <None Include="FastLZMA2\LICENSE">
       <Filter>FastLZMA2</Filter>
     </None>
-    <None Include="ZSTDMT\LICENSE">
-      <Filter>ZSTDMT</Filter>
-    </None>
-    <None Include="ZSTDMT\README.md">
-      <Filter>ZSTDMT</Filter>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="SevenZip\C\7zStream.c">
@@ -1220,45 +1211,6 @@
     <ClCompile Include="Extensions\Heimdal\Md2Handler.cpp">
       <Filter>Extensions\Heimdal</Filter>
     </ClCompile>
-    <ClCompile Include="ZSTDMT\brotli-mt_common.c">
-      <Filter>ZSTDMT</Filter>
-    </ClCompile>
-    <ClCompile Include="ZSTDMT\brotli-mt_compress.c">
-      <Filter>ZSTDMT</Filter>
-    </ClCompile>
-    <ClCompile Include="ZSTDMT\brotli-mt_decompress.c">
-      <Filter>ZSTDMT</Filter>
-    </ClCompile>
-    <ClCompile Include="ZSTDMT\lizard-mt_common.c">
-      <Filter>ZSTDMT</Filter>
-    </ClCompile>
-    <ClCompile Include="ZSTDMT\lizard-mt_compress.c">
-      <Filter>ZSTDMT</Filter>
-    </ClCompile>
-    <ClCompile Include="ZSTDMT\lizard-mt_decompress.c">
-      <Filter>ZSTDMT</Filter>
-    </ClCompile>
-    <ClCompile Include="ZSTDMT\lz4-mt_common.c">
-      <Filter>ZSTDMT</Filter>
-    </ClCompile>
-    <ClCompile Include="ZSTDMT\lz4-mt_compress.c">
-      <Filter>ZSTDMT</Filter>
-    </ClCompile>
-    <ClCompile Include="ZSTDMT\lz4-mt_decompress.c">
-      <Filter>ZSTDMT</Filter>
-    </ClCompile>
-    <ClCompile Include="ZSTDMT\lz5-mt_common.c">
-      <Filter>ZSTDMT</Filter>
-    </ClCompile>
-    <ClCompile Include="ZSTDMT\lz5-mt_compress.c">
-      <Filter>ZSTDMT</Filter>
-    </ClCompile>
-    <ClCompile Include="ZSTDMT\lz5-mt_decompress.c">
-      <Filter>ZSTDMT</Filter>
-    </ClCompile>
-    <ClCompile Include="ZSTDMT\zstd-mt_threading.c">
-      <Filter>ZSTDMT</Filter>
-    </ClCompile>
     <ClCompile Include="Extensions\ZSCodecs\ZstdDecoder.cpp">
       <Filter>Extensions\ZSCodecs</Filter>
     </ClCompile>
@@ -2266,27 +2218,6 @@
     <ClInclude Include="FastLZMA2\util.h">
       <Filter>FastLZMA2</Filter>
     </ClInclude>
-    <ClInclude Include="ZSTDMT\brotli-mt.h">
-      <Filter>ZSTDMT</Filter>
-    </ClInclude>
-    <ClInclude Include="ZSTDMT\list.h">
-      <Filter>ZSTDMT</Filter>
-    </ClInclude>
-    <ClInclude Include="ZSTDMT\lizard-mt.h">
-      <Filter>ZSTDMT</Filter>
-    </ClInclude>
-    <ClInclude Include="ZSTDMT\lz4-mt.h">
-      <Filter>ZSTDMT</Filter>
-    </ClInclude>
-    <ClInclude Include="ZSTDMT\lz5-mt.h">
-      <Filter>ZSTDMT</Filter>
-    </ClInclude>
-    <ClInclude Include="ZSTDMT\memmt.h">
-      <Filter>ZSTDMT</Filter>
-    </ClInclude>
-    <ClInclude Include="ZSTDMT\threading.h">
-      <Filter>ZSTDMT</Filter>
-    </ClInclude>
     <ClInclude Include="Extensions\ZSCodecs\ZstdDecoder.h">
       <Filter>Extensions\ZSCodecs</Filter>
     </ClInclude>

diff --git a/NanaZip.Core/ZSTDMT/LICENSE b/NanaZip.Core/ZSTDMT/LICENSE
diff --git a/NanaZip.Core/ZSTDMT/README.md b/NanaZip.Core/ZSTDMT/README.md