Cool_Tools/Switch-Toolbox
1
0
Fork 0
mirror of synced 2025-02-26 06:49:45 +01:00
Code Releases Wiki Activity

Fix some bugs with LZ compression type 0x11

Browse Source
This commit is contained in:
KillzXGaming 2020-04-10 15:32:49 -04:00
parent fff31b2277
commit 245dc010a7
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Switch_Toolbox_Library/Compression/Formats/LZ77.cs
View File

@ -39,7 +39,7 @@ namespace Toolbox.Library
public Stream Decompress(Stream stream) public Stream Decompress(Stream stream)
{ {
using (var reader = new FileReader(stream)) using (var reader = new FileReader(stream, true))
{ {
if (isType11) if (isType11)
{ {

16
Switch_Toolbox_Library/Compression/LZ77_WII.cs
View File

@ -16,6 +16,9 @@ namespace Toolbox.Library
//Ported from //Ported from
//https://github.com/mistydemeo/quickbms/blob/5752a6a2a38e16211952553fcffa59570855ac42/included/nintendo.c#L58 //https://github.com/mistydemeo/quickbms/blob/5752a6a2a38e16211952553fcffa59570855ac42/included/nintendo.c#L58
// various code from DSDecmp: http://code.google.com/p/dsdecmp/
// original code of unlz77wii_raw10 from "Hector Martin <marcan@marcansoft.com>" http://wiibrew.org/wiki/Wii.py
// ported to C by Luigi Auriemma
public static byte[] Decompress11(byte[] input, int decomp_size) public static byte[] Decompress11(byte[] input, int decomp_size)
{ {
int i, j, disp = 0, len = 0, cdest; int i, j, disp = 0, len = 0, cdest;
@ -30,7 +33,7 @@ namespace Toolbox.Library
while (curr_size < decomp_size) while (curr_size < decomp_size)
{ {
if (inputOffset > input.Length) break; if (inputOffset >= input.Length) break;
flags = input[inputOffset++]; flags = input[inputOffset++];
for (i = 0; i < 8 && curr_size < decomp_size; i++) for (i = 0; i < 8 && curr_size < decomp_size; i++)
@ -52,7 +55,7 @@ namespace Toolbox.Library
// disp = def // disp = def
len = b1 << 4; len = b1 << 4;
if (inputOffset > input.Length) break; if (inputOffset >= input.Length) break;
bt = input[inputOffset++]; bt = input[inputOffset++];
len |= bt >> 4; len |= bt >> 4;
len += 0x11; len += 0x11;
@ -100,7 +103,7 @@ namespace Toolbox.Library
len = (b1 >> 4) + threshold; len = (b1 >> 4) + threshold;
disp = (b1 & 0x0F) << 8; disp = (b1 & 0x0F) << 8;
if (inputOffset > input.Length) break; if (inputOffset >= input.Length) break;
b2 = input[inputOffset++]; b2 = input[inputOffset++];
disp |= b2; disp |= b2;
@ -119,8 +122,6 @@ namespace Toolbox.Library
if (curr_size > decomp_size) if (curr_size > decomp_size)
{ {
//throw new Exception(String.Format("File {0:s} is not a valid LZ77 file; actual output size > output size in header", filein));
//Console.WriteLine(String.Format("File {0:s} is not a valid LZ77 file; actual output size > output size in header; {1:x} > {2:x}.", filein, curr_size, decomp_size));
break; break;
} }
} }
@ -128,6 +129,11 @@ namespace Toolbox.Library
{ {
if (inputOffset >= input.Length) break; if (inputOffset >= input.Length) break;
outdata[curr_size++] = input[inputOffset++]; outdata[curr_size++] = input[inputOffset++];
if (curr_size > decomp_size)
{
break;
}
} }
} }
} }