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

(PAZ): lookup game title before encryption query.

Browse Source
This commit is contained in:
morkt 2017-01-11 06:52:02 +04:00
parent 2c20d845eb
commit 1633f93c87
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ArcFormats/Musica/ArcPAZ.cs
View File

@ -172,9 +172,8 @@ namespace GameRes.Formats.Musica
if (!file.Name.EndsWith (".paz", StringComparison.InvariantCultureIgnoreCase)) if (!file.Name.EndsWith (".paz", StringComparison.InvariantCultureIgnoreCase))
return null; return null;
uint signature = file.View.ReadUInt32 (0); uint signature = file.View.ReadUInt32 (0);
var arc_name = Path.GetFileNameWithoutExtension (file.Name).ToLowerInvariant();
// XXX encryption is queried for every .paz file // XXX encryption is queried for every .paz file
var scheme = QueryEncryption (arc_name, signature); var scheme = QueryEncryption (file.Name, signature);
uint start_offset = scheme.Version > 0 ? 0x20u : 0u; uint start_offset = scheme.Version > 0 ? 0x20u : 0u;
uint index_size = file.View.ReadUInt32 (start_offset); uint index_size = file.View.ReadUInt32 (start_offset);
start_offset += 4; start_offset += 4;
@ -196,6 +195,7 @@ namespace GameRes.Formats.Musica
arc_list.Add (part); arc_list.Add (part);
max_offset += part.Size; max_offset += part.Size;
} }
var arc_name = Path.GetFileNameWithoutExtension (file.Name).ToLowerInvariant();
bool is_audio = AudioPazNames.Contains (arc_name); bool is_audio = AudioPazNames.Contains (arc_name);
bool is_video = VideoPazNames.Contains (arc_name); bool is_video = VideoPazNames.Contains (arc_name);
Stream input = file.CreateStream (start_offset, index_size); Stream input = file.CreateStream (start_offset, index_size);
@ -342,9 +342,15 @@ namespace GameRes.Formats.Musica
PazScheme scheme = null; PazScheme scheme = null;
if (!KnownSchemes.TryGetValue (signature, out scheme) && KnownTitles.Count > 1) if (!KnownSchemes.TryGetValue (signature, out scheme) && KnownTitles.Count > 1)
{ {
var options = Query<PazOptions> (arcStrings.ArcEncryptedNotice); var title = FormatCatalog.Instance.LookupGame (arc_name);
scheme = options.Scheme; scheme = GetScheme (title);
if (null == scheme)
{
var options = Query<PazOptions> (arcStrings.ArcEncryptedNotice);
scheme = options.Scheme;
}
} }
arc_name = Path.GetFileNameWithoutExtension (arc_name).ToLowerInvariant();
if (null == scheme || !scheme.ArcKeys.ContainsKey (arc_name)) if (null == scheme || !scheme.ArcKeys.ContainsKey (arc_name))
throw new UnknownEncryptionScheme(); throw new UnknownEncryptionScheme();
return scheme; return scheme;