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

(Xp3Opener): altered signature lookup within executables.

Browse Source 
archives could reside within executable resources and not necessarily on
the 16-bytes boundary.
This commit is contained in:
morkt 2015-12-07 18:26:19 +04:00
parent 92caed4901
commit cf0d6e9e3c
1 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ArcFormats/KiriKiri/ArcXP3.cs
View File

@ -91,6 +91,8 @@ namespace GameRes.Formats.KiriKiri
{ {
Signatures = new uint[] { 0x0d335058, 0 }; Signatures = new uint[] { 0x0d335058, 0 };
} }
static readonly string SignatureBytes = "XP3\x0d\x0a\x20\x0a\x1a\x8b\x67\x01";
public override ResourceScheme Scheme public override ResourceScheme Scheme
{ {
@ -109,7 +111,7 @@ namespace GameRes.Formats.KiriKiri
long base_offset = 0; long base_offset = 0;
if (0x5a4d == file.View.ReadUInt16 (0)) // 'MZ' if (0x5a4d == file.View.ReadUInt16 (0)) // 'MZ'
base_offset = SkipExeHeader (file); base_offset = SkipExeHeader (file);
if (!file.View.AsciiEqual (base_offset, "XP3\x0d\x0a\x20\x0a\x1a\x8b\x67\x01")) if (!file.View.AsciiEqual (base_offset, SignatureBytes))
return null; return null;
long dir_offset = base_offset + file.View.ReadInt64 (base_offset+0x0b); long dir_offset = base_offset + file.View.ReadInt64 (base_offset+0x0b);
if (dir_offset < 0x13 || dir_offset >= file.MaxOffset) if (dir_offset < 0x13 || dir_offset >= file.MaxOffset)
@ -285,17 +287,46 @@ NextEntry:
{ {
uint size = file.View.ReadUInt32 (section_table+0x10); uint size = file.View.ReadUInt32 (section_table+0x10);
uint addr = file.View.ReadUInt32 (section_table+0x14); uint addr = file.View.ReadUInt32 (section_table+0x14);
if (file.View.AsciiEqual (section_table, ".rsrc\0"))
{
// look within EXE resource section
offset = addr;
break;
}
section_table += 0x28; section_table += 0x28;
if (0 != size) if (0 != size)
offset = Math.Max ((long)addr + size, offset); offset = Math.Max ((long)addr + size, offset);
} }
} }
} }
offset = (offset + 0xf) & ~(long)0xf; unsafe
for (; offset < file.MaxOffset; offset += 0x10)
{ {
if (file.View.AsciiEqual (offset, "XP3\x0d\x0a\x20\x0a\x1a\x8b\x67\x01")) while (offset < file.MaxOffset)
return offset; {
uint page_size = (uint)Math.Min (0x10000L, file.MaxOffset - offset);
if (page_size < 0x20)
break;
using (var view = file.CreateViewAccessor (offset, page_size))
{
byte* page_begin = view.GetPointer (offset);
byte* page_end = page_begin + page_size - 0x10;
try {
for (byte* ptr = page_begin; ptr != page_end; ++ptr)
{
int i = 0;
while (ptr[i] == SignatureBytes[i])
{
if (++i == SignatureBytes.Length)
return offset + (ptr - page_begin);
}
}
}
finally {
view.SafeMemoryMappedViewHandle.ReleasePointer();
}
}
offset += page_size - 0x10;
}
} }
return 0; return 0;
} }