Fixed Dark Souls Remastered file decompression

Atvaark · Jun 15, 2020 · 84bdc67 · 84bdc67
1 parent f248279
commit 84bdc67
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 22 deletions.
diff --git a/BinderTool.Core/BinderTool.Core.csproj b/BinderTool.Core/BinderTool.Core.csproj
@@ -59,9 +59,6 @@
     <Reference Include="BouncyCastle.Crypto, Version=1.8.4.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
       <HintPath>..\packages\BouncyCastle.1.8.4\lib\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
-      <HintPath>..\packages\ICSharpCode.SharpZipLib.dll.0.85.4.369\lib\net20\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -72,6 +69,9 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="Zlib.Portable, Version=1.11.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Zlib.Portable.1.11.0\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Bdf4\Bdf4FileStream.cs" />
@@ -119,7 +119,9 @@
     <Compile Include="Tpf\TpfFileEntry.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BinderTool.Core.Kraken\BinderTool.Core.Kraken.csproj">

diff --git a/BinderTool.Core/Dcx/DeflateCompression.cs b/BinderTool.Core/Dcx/DeflateCompression.cs
@@ -1,5 +1,5 @@
 using System.IO;
-using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
+using Ionic.Zlib;
 
 namespace BinderTool.Core.Dcx
 {
@@ -11,20 +11,18 @@ public class DeflateCompression : DcxCompression
         //public override MemoryStream CompressData(byte[] uncompressedData)
         //{
         //    MemoryStream compressedBufferStream = new MemoryStream();
-        //    using (DeflaterOutputStream deflaterStream = new DeflaterOutputStream(compressedBufferStream))
+        //    using (var zlibStream = new ZlibStream(compressedBufferStream, CompressionMode.Compress, (CompressionLevel)Level))
         //    {
-        //        deflaterStream.Write(uncompressedData, 0, uncompressedData.Length);
+        //        zlibStream.Write(uncompressedData, 0, uncompressedData.Length);
         //    }
+
         //    return compressedBufferStream;
         //}
 
         public override MemoryStream DecompressData(byte[] compressedData, int uncompressedSize)
         {
-            InflaterInputStream inflaterStream = new InflaterInputStream(new MemoryStream(compressedData));
-            MemoryStream outputStream = new MemoryStream();
-            inflaterStream.CopyTo(outputStream);
-            outputStream.Position = 0;
-            return outputStream;
+            var decompressedData = ZlibStream.UncompressBuffer(compressedData);
+            return new MemoryStream(decompressedData);
         }
 
         public static DeflateCompression Read(BinaryReader reader)

diff --git a/BinderTool.Core/Enfl/EntryFileListFile.cs b/BinderTool.Core/Enfl/EntryFileListFile.cs
@@ -1,6 +1,6 @@
 using System.IO;
 using System.Text;
-using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
+using Ionic.Zlib;
 
 namespace BinderTool.Core.Enfl
 {
@@ -88,11 +88,8 @@ private MemoryStream Decompress(Stream inputStream)
             int uncompressedSize = reader.ReadInt32();
 
             byte[] data = reader.ReadBytes(compressedSize);
-            InflaterInputStream inflaterStream = new InflaterInputStream(new MemoryStream(data));
-            MemoryStream decompressedStream = new MemoryStream();
-            inflaterStream.CopyTo(decompressedStream);
-            decompressedStream.Position = 0;
-            return decompressedStream;
+            byte[] uncompressData = ZlibStream.UncompressBuffer(data);
+            return new MemoryStream(uncompressData);
         }
     }
 }
diff --git a/BinderTool.Core/Properties/AssemblyInfo.cs b/BinderTool.Core/Properties/AssemblyInfo.cs
@@ -6,7 +6,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("BinderTool.Core")]
-[assembly: AssemblyCopyright("Copyright © 2019 Atvaark")]
+[assembly: AssemblyCopyright("Copyright © 2020 Atvaark")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]

diff --git a/BinderTool.Core/packages.config b/BinderTool.Core/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="BouncyCastle" version="1.8.4" targetFramework="net462" />
-  <package id="ICSharpCode.SharpZipLib.dll" version="0.85.4.369" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
+  <package id="Zlib.Portable" version="1.11.0" targetFramework="net462" />
 </packages>
diff --git a/BinderTool/Program.cs b/BinderTool/Program.cs
@@ -97,7 +97,7 @@ private static void ShowUsageInfo()
         {
             Console.WriteLine(
                 "BinderTool by Atvaark\n" +
-                "  A tool for unpacking Dark Souls II/III/Bloodborne/Sekiro Bdt, Bhd, Dcx, Sl2, Tpf, Param and Fmg files\n" +
+                "  A tool for unpacking Dark Souls I/II/III/Bloodborne/Sekiro Bdt, Bhd, Dcx, Sl2, Tpf, Param and Fmg files\n" +
                 "Usage:\n" +
                 "  BinderTool file_path [output_path]\n" +
                 "Examples:\n" +

diff --git a/BinderTool/Properties/AssemblyInfo.cs b/BinderTool/Properties/AssemblyInfo.cs
@@ -6,7 +6,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("BinderTool")]
-[assembly: AssemblyCopyright("Copyright © 2019 Atvaark")]
+[assembly: AssemblyCopyright("Copyright © 2020 Atvaark")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]