SabreTools/BinaryObjectScanner
1
0
Fork 0
mirror of https://github.com/SabreTools/BinaryObjectScanner.git synced 2026-09-23 15:24:45 +00:00
Code Issues 295 Packages Projects Releases 20 Wiki Activity

Handle last blocks more efficiently

Browse Source
This commit is contained in:
Matt Nadareski
2022-12-31 11:35:22 -08:00
parent 75a4371f36
commit 8a61f01e1b
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BurnOutSharp.Compression/MSZIP.cs
View File

@@ -19,9 +19,9 @@ namespace BurnOutSharp.Compression
/// <summary>
/// Decompress MSZIP data block
/// </summary>
public byte[] DecompressMSZIPData(byte[] data, byte[] previousBlock = null)
public byte[] DecompressMSZIPData(byte[] data, bool previousBlock = false)
{
if (previousBlock != null)
if (previousBlock)
_inflater.Reset();
_inflater.SetInput(buffer: data, 2, data.Length - 2);

14
BurnOutSharp.Wrappers/MicrosoftCabinet.cs
View File

@@ -217,19 +217,19 @@ namespace BurnOutSharp.Wrappers
// Store the last decompressed block for MS-ZIP
Compression.MSZIP mszip = new Compression.MSZIP();
byte[] lastDecompressed = null;
bool hasLastBlock = false;
List<byte> data = new List<byte>();
foreach (var dataBlock in folder.DataBlocks)
{
byte[] decompressed = null;
byte[] decompressed;
switch (folder.CompressionType & Models.MicrosoftCabinet.CompressionType.MASK_TYPE)
{
case Models.MicrosoftCabinet.CompressionType.TYPE_NONE:
decompressed = dataBlock.CompressedData;
break;
case Models.MicrosoftCabinet.CompressionType.TYPE_MSZIP:
decompressed = mszip.DecompressMSZIPData(dataBlock.CompressedData, lastDecompressed);
decompressed = mszip.DecompressMSZIPData(dataBlock.CompressedData, hasLastBlock);
break;
case Models.MicrosoftCabinet.CompressionType.TYPE_QUANTUM:
// TODO: UNIMPLEMENTED
@@ -245,9 +245,8 @@ namespace BurnOutSharp.Wrappers
return null;
}
lastDecompressed = decompressed;
if (decompressed != null)
data.AddRange(decompressed);
hasLastBlock = true;
data.AddRange(decompressed ?? new byte[0]);
}
return data.ToArray();
@@ -468,7 +467,8 @@ namespace BurnOutSharp.Wrappers
Console.WriteLine($" Folder {i}");
Console.WriteLine($" Cab start offset = {entry.CabStartOffset}");
Console.WriteLine($" Data count = {entry.DataCount}");
Console.WriteLine($" Compression type = {entry.CompressionType} ({entry.CompressionType & Models.MicrosoftCabinet.CompressionType.MASK_TYPE})");
Console.WriteLine($" Compression type = {entry.CompressionType}");
Console.WriteLine($" Masked compression type = {entry.CompressionType & Models.MicrosoftCabinet.CompressionType.MASK_TYPE}");
if (entry.ReservedData == null)
Console.WriteLine($" Reserved data = [NULL]");
else