Mirrors/XCI-Explorer
2
0
Fork 0
mirror of https://github.com/StudentBlake/XCI-Explorer synced 2024-11-22 12:13:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #18 from garoxas/master

Browse source 
fix games with version string containing non-digit characters cannot be opened, fix Super Bomberman R cannot be opened #17
This commit is contained in:
StudentBlake 2018-08-28 13:24:10 -04:00 committed by GitHub
commit fc35e97e49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
XCI_Explorer/MainForm.cs
View file

@ -13,6 +13,7 @@ using XCI_Explorer.Helpers;
using XTSSharp; using XTSSharp;
using System.Net; using System.Net;
using System.Xml.Linq; using System.Xml.Linq;
using System.Text.RegularExpressions;
namespace XCI_Explorer { namespace XCI_Explorer {
public class MainForm : Form { public class MainForm : Form {
@ -502,7 +503,7 @@ namespace XCI_Explorer {
if (getMKey()) { if (getMKey()) {
using (FileStream fileStream = File.OpenRead(TB_File.Text)) { using (FileStream fileStream = File.OpenRead(TB_File.Text)) {
List<string> ncaTarget = new List<string>(); List<string> ncaTarget = new List<string>();
Version GameRevision = new Version(); string GameRevision = "";
for (int si = 0; si < SecureSize.Length; si++) { for (int si = 0; si < SecureSize.Length; si++) {
if (SecureSize[si] > 0x4E20000) continue; if (SecureSize[si] > 0x4E20000) continue;
@ -602,8 +603,17 @@ namespace XCI_Explorer {
NACP.NACP_Datas[0] = new NACP.NACP_Data(source.Skip(0x3000).Take(0x1000).ToArray()); NACP.NACP_Datas[0] = new NACP.NACP_Data(source.Skip(0x3000).Take(0x1000).ToArray());
string GameVer = NACP.NACP_Datas[0].GameVer.Replace("\0", ""); string GameVer = NACP.NACP_Datas[0].GameVer.Replace("\0", "");
if (Version.Parse(GameVer).CompareTo(GameRevision) > 0) { Version version1, version2;
GameRevision = Version.Parse(GameVer); if (!Version.TryParse(Regex.Replace(GameRevision, @"[^\d.].*$", ""), out version1))
{
version1 = new Version();
}
if (!Version.TryParse(Regex.Replace(GameVer, @"[^\d.].*$", ""), out version2))
{
version2 = new Version();
}
if (version2.CompareTo(version1) > 0) {
GameRevision = GameVer;
for (int i = 0; i < NACP.NACP_Strings.Length; i++) { for (int i = 0; i < NACP.NACP_Strings.Length; i++) {
NACP.NACP_Strings[i] = new NACP.NACP_String(source.Skip(i * 0x300).Take(0x300).ToArray()); NACP.NACP_Strings[i] = new NACP.NACP_String(source.Skip(i * 0x300).Take(0x300).ToArray());
@ -632,7 +642,7 @@ namespace XCI_Explorer {
} }
} }
TB_GameRev.Text = GameRevision.ToString(); TB_GameRev.Text = GameRevision;
CB_RegionName.SelectedIndex = 0; CB_RegionName.SelectedIndex = 0;
fileStream.Close(); fileStream.Close();
@ -863,7 +873,7 @@ namespace XCI_Explorer {
if (SecureSize[k] > num3) { if (SecureSize[k] > num3) {
gameNcaSize = SecureSize[k]; gameNcaSize = SecureSize[k];
gameNcaOffset = SecureOffset[k]; gameNcaOffset = SecureOffset[k];
num3 = SecureOffset[k]; num3 = SecureSize[k];
} }
} }
PFS0Offset = gameNcaOffset + 32768; PFS0Offset = gameNcaOffset + 32768;