Merge branch 'hotfix/use-unsigned-integers'

Kaplas80 · Mar 11, 2020 · fba8a9a · fba8a9a
2 parents 0ce149b + 2d8e767
commit fba8a9a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
     <PropertyGroup>
-        <Version>1.2.1</Version>
+        <Version>1.2.2</Version>
         <Product>ParManager</Product>
 
         <Authors>Kaplas</Authors>

diff --git a/ParLibrary/Converter/ParArchiveReader.cs b/ParLibrary/Converter/ParArchiveReader.cs
@@ -122,9 +122,9 @@ public NodeContainerFormat Convert(BinaryFormat source)
             for (int i = 0; i < totalFileCount; i++)
             {
                 uint compressionFlag = reader.ReadUInt32();
-                int size = reader.ReadInt32();
-                int compressedSize = reader.ReadInt32();
-                int offset = reader.ReadInt32();
+                uint size = reader.ReadUInt32();
+                uint compressedSize = reader.ReadUInt32();
+                uint offset = reader.ReadUInt32();
                 int attributes = reader.ReadInt32();
                 int unknown2 = reader.ReadInt32();
                 int unknown3 = reader.ReadInt32();

diff --git a/ParLibrary/Converter/ParArchiveWriter.cs b/ParLibrary/Converter/ParArchiveWriter.cs
@@ -341,8 +341,8 @@ private static void WriteFiles(DataWriter writer, IEnumerable<Node> files, long
 
                 writer.Write(parFile.IsCompressed ? 0x80000000 : 0x00000000);
                 writer.Write(parFile.DecompressedSize);
-                writer.Write((int)node.Stream.Length);
-                writer.Write((int)dataPosition);
+                writer.Write((uint)node.Stream.Length);
+                writer.Write((uint)dataPosition);
                 writer.Write(attributes);
                 writer.Write(parFile.Unknown2);
                 writer.Write(parFile.Unknown3);

diff --git a/ParLibrary/ParFile.cs b/ParLibrary/ParFile.cs
@@ -41,7 +41,7 @@ public ParFile(DataStream stream)
 
             this.CanBeCompressed = true;
             this.IsCompressed = false;
-            this.DecompressedSize = (int)stream.Length;
+            this.DecompressedSize = (uint)stream.Length;
             this.Attributes = 0x00000020;
             this.Unknown2 = 0x00000000;
             this.Unknown3 = 0x00000000;
@@ -59,7 +59,7 @@ public ParFile(DataStream stream, long offset, long length)
         {
             this.CanBeCompressed = true;
             this.IsCompressed = false;
-            this.DecompressedSize = (int)length;
+            this.DecompressedSize = (uint)length;
             this.Attributes = 0x00000020;
             this.Unknown2 = 0x00000000;
             this.Unknown3 = 0x00000000;
@@ -79,7 +79,7 @@ public ParFile(DataStream stream, long offset, long length)
         /// <summary>
         /// Gets or sets the file size (decompressed).
         /// </summary>
-        public int DecompressedSize { get; set; }
+        public uint DecompressedSize { get; set; }
 
         /// <summary>
         /// Gets or sets the file attributes.

diff --git a/Tests/ParLib.UnitTests/SllzTests.cs b/Tests/ParLib.UnitTests/SllzTests.cs
@@ -5,6 +5,7 @@ namespace ParLib.UnitTests
 {
     using System.Text;
     using NUnit.Framework;
+    using ParLibrary;
     using ParLibrary.Sllz;
     using Yarhl.FileFormat;
     using Yarhl.IO;
@@ -27,19 +28,19 @@ public void TestSllz(byte compressorVersion)
             byte[] buffer = Encoding.ASCII.GetBytes(sampleText);
 
             DataStream dataStream = DataStreamFactory.FromArray(buffer, 0, buffer.Length);
-            using var binaryFormat = new BinaryFormat(dataStream);
+            using var binaryFormat = new ParFile(dataStream);
 
             var parameters = new CompressorParameters
             {
                 Endianness = 0x00,
                 Version = compressorVersion,
             };
 
-            var compressedBinaryFormat = (BinaryFormat)ConvertFormat.With<Compressor, CompressorParameters>(parameters, binaryFormat);
-            var decompressedBinaryFormat = (BinaryFormat)ConvertFormat.With<Decompressor>(compressedBinaryFormat);
+            var compressedBinaryFormat = (ParFile)ConvertFormat.With<Compressor, CompressorParameters>(parameters, binaryFormat);
+            var decompressedBinaryFormat = (ParFile)ConvertFormat.With<Decompressor>(compressedBinaryFormat);
 
             Assert.IsTrue(compressedBinaryFormat.Stream.Length < decompressedBinaryFormat.Stream.Length);
             Assert.IsTrue(dataStream.Compare(decompressedBinaryFormat.Stream));
         }
     }
-}
+}