Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-12-25 04:14:13 +08:00
Code Issues Projects Releases Wiki Activity

(PFS): try different encoding on failure.

Browse Source
This commit is contained in:
morkt 2018-10-25 16:44:58 +04:00
parent 5411ed7a76
commit c44d5e0c97
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ArcFormats/Artemis/ArcPFS.cs
View File

@ -56,19 +56,26 @@ namespace GameRes.Formats.Artemis
switch (version) switch (version)
{ {
case 6: case 6:
case 8: return OpenPf (file, version); case 8:
try
{
return OpenPf (file, version, PfsEncoding.Get<Encoding>());
}
catch (System.ArgumentException)
{
return OpenPf (file, version, GetAltEncoding());
}
case 2: return OpenPf2 (file); case 2: return OpenPf2 (file);
default: return null; default: return null;
} }
} }
ArcFile OpenPf (ArcView file, int version) ArcFile OpenPf (ArcView file, int version, Encoding encoding)
{ {
uint index_size = file.View.ReadUInt32 (3); uint index_size = file.View.ReadUInt32 (3);
int count = file.View.ReadInt32 (7); int count = file.View.ReadInt32 (7);
if (!IsSaneCount (count) || 7L + index_size > file.MaxOffset) if (!IsSaneCount (count) || 7L + index_size > file.MaxOffset)
return null; return null;
var encoding = PfsEncoding.Get<Encoding>();
var index = file.View.ReadBytes (7, index_size); var index = file.View.ReadBytes (7, index_size);
int index_offset = 4; int index_offset = 4;
var dir = new List<Entry> (count); var dir = new List<Entry> (count);
@ -77,7 +84,7 @@ namespace GameRes.Formats.Artemis
int name_length = index.ToInt32 (index_offset); int name_length = index.ToInt32 (index_offset);
var name = encoding.GetString (index, index_offset+4, name_length); var name = encoding.GetString (index, index_offset+4, name_length);
index_offset += name_length + 8; index_offset += name_length + 8;
var entry = FormatCatalog.Instance.Create<Entry> (name); var entry = Create<Entry> (name);
entry.Offset = index.ToUInt32 (index_offset); entry.Offset = index.ToUInt32 (index_offset);
entry.Size = index.ToUInt32 (index_offset+4); entry.Size = index.ToUInt32 (index_offset+4);
if (!entry.CheckPlacement (file.MaxOffset)) if (!entry.CheckPlacement (file.MaxOffset))
@ -110,7 +117,7 @@ namespace GameRes.Formats.Artemis
int name_length = index.ToInt32 (index_offset); int name_length = index.ToInt32 (index_offset);
var name = Encodings.cp932.GetString (index, index_offset+4, name_length); var name = Encodings.cp932.GetString (index, index_offset+4, name_length);
index_offset += name_length + 0x10; index_offset += name_length + 0x10;
var entry = FormatCatalog.Instance.Create<Entry> (name); var entry = Create<Entry> (name);
entry.Offset = index.ToUInt32 (index_offset); entry.Offset = index.ToUInt32 (index_offset);
entry.Size = index.ToUInt32 (index_offset+4); entry.Size = index.ToUInt32 (index_offset+4);
if (!entry.CheckPlacement (file.MaxOffset)) if (!entry.CheckPlacement (file.MaxOffset))
@ -129,6 +136,15 @@ namespace GameRes.Formats.Artemis
return input; return input;
return new ByteStringEncryptedStream (input, parc.Key); return new ByteStringEncryptedStream (input, parc.Key);
} }
Encoding GetAltEncoding ()
{
var enc = PfsEncoding.Get<Encoding>();
if (enc.CodePage == 932)
return Encoding.UTF8;
else
return Encodings.cp932;
}
} }
internal class PfsArchive : ArcFile internal class PfsArchive : ArcFile