Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2025-01-12 04:49:32 +08:00
Code Issues Projects Releases Wiki Activity

(PakOpener): fixed compressed entries handling (#37)

Browse Source
This commit is contained in:
morkt 2016-10-14 12:35:56 +04:00
parent 5142cd0884
commit bf619c3f34
1 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ArcFormats/NitroPlus/ArcNitro.cs
View File

@ -33,7 +33,7 @@ using GameRes.Utility;
namespace GameRes.Formats.NitroPlus namespace GameRes.Formats.NitroPlus
{ {
internal class PakEntry : Entry internal class PakEntry : PackedEntry
{ {
public uint Key; public uint Key;
} }
@ -102,6 +102,7 @@ namespace GameRes.Formats.NitroPlus
return null; return null;
var name = Encodings.cp932.GetString (name_buf, 0, name_length); var name = Encodings.cp932.GetString (name_buf, 0, name_length);
var entry = FormatCatalog.Instance.Create<PackedEntry> (name); var entry = FormatCatalog.Instance.Create<PackedEntry> (name);
entry.Offset = base_offset + header.ReadUInt32(); entry.Offset = base_offset + header.ReadUInt32();
entry.UnpackedSize = header.ReadUInt32(); entry.UnpackedSize = header.ReadUInt32();
entry.Size = header.ReadUInt32(); entry.Size = header.ReadUInt32();
@ -109,6 +110,7 @@ namespace GameRes.Formats.NitroPlus
uint psize = header.ReadUInt32(); uint psize = header.ReadUInt32();
if (entry.IsPacked) if (entry.IsPacked)
entry.Size = psize; entry.Size = psize;
if (!entry.CheckPlacement (file.MaxOffset)) if (!entry.CheckPlacement (file.MaxOffset))
return null; return null;
dir.Add (entry); dir.Add (entry);
@ -159,21 +161,17 @@ namespace GameRes.Formats.NitroPlus
if (name_len != header.Read (name_buf, 0, name_len)) if (name_len != header.Read (name_buf, 0, name_len))
return null; return null;
uint key = GetKey (name_buf, name_len); uint key = GetKey (name_buf, name_len);
uint offset = header.ReadUInt32() ^ key; var name = Encodings.cp932.GetString (name_buf, 0, name_len);
uint size = header.ReadUInt32() ^ key; var entry = FormatCatalog.Instance.Create<PakEntry> (name);
uint val1 = header.ReadUInt32() ^ key; entry.Offset = (header.ReadUInt32() ^ key) + base_offset;
uint val2 = header.ReadUInt32() ^ key; entry.UnpackedSize = (header.ReadUInt32() ^ key);
uint val3 = header.ReadUInt32() ^ key; uint ignored = (header.ReadUInt32() ^ key);
entry.IsPacked = (header.ReadUInt32() ^ key) != 0;
var entry = new PakEntry { uint packed_size = (header.ReadUInt32() ^ key);
Name = Encodings.cp932.GetString (name_buf, 0, name_len), entry.Key = key;
Offset = base_offset+offset, entry.Size = entry.IsPacked ? packed_size : entry.UnpackedSize;
Size = size,
Key = key,
};
if (!entry.CheckPlacement (file.MaxOffset)) if (!entry.CheckPlacement (file.MaxOffset))
return null; return null;
entry.Type = FormatCatalog.Instance.GetTypeFromName (entry.Name);
dir.Add (entry); dir.Add (entry);
} }
return dir; return dir;
@ -194,27 +192,14 @@ namespace GameRes.Formats.NitroPlus
public override Stream OpenEntry (ArcFile arc, Entry entry) public override Stream OpenEntry (ArcFile arc, Entry entry)
{ {
var pak_entry = entry as PakEntry; var pak_entry = entry as PakEntry;
if (pak_entry != null) if (pak_entry != null && !pak_entry.IsPacked)
return OpenV3Entry (arc, pak_entry); return OpenV3Entry (arc, pak_entry);
Stream input = arc.File.CreateStream (entry.Offset, entry.Size);
var packed_entry = entry as PackedEntry; var packed_entry = entry as PackedEntry;
if (packed_entry != null && packed_entry.IsPacked) if (packed_entry != null && packed_entry.IsPacked)
return UnpackV2Entry (arc, packed_entry); input = new ZLibStream (input, CompressionMode.Decompress);
return arc.File.CreateStream (entry.Offset, entry.Size); return input;
}
private Stream UnpackV2Entry (ArcFile arc, PackedEntry entry)
{
var input = arc.File.CreateStream (entry.Offset, entry.Size);
try
{
return new ZLibStream (input, CompressionMode.Decompress);
}
catch
{
input.Dispose();
throw;
}
} }
private Stream OpenV3Entry (ArcFile arc, PakEntry entry) private Stream OpenV3Entry (ArcFile arc, PakEntry entry)
@ -230,7 +215,7 @@ namespace GameRes.Formats.NitroPlus
key = Binary.RotR (key, 8); key = Binary.RotR (key, 8);
} }
if (enc_size == entry.Size) if (enc_size == entry.Size)
return new MemoryStream (buf, false); return new MemoryStream (buf);
return new PrefixStream (buf, arc.File.CreateStream (entry.Offset+enc_size, entry.Size-enc_size)); return new PrefixStream (buf, arc.File.CreateStream (entry.Offset+enc_size, entry.Size-enc_size));
} }
} }