From 65e9076c17fd36fe798d79251321b04a8ffbbe66 Mon Sep 17 00:00:00 2001 From: phacoxcll <36426650+phacoxcll@users.noreply.github.com> Date: Wed, 24 Apr 2019 16:39:54 -0500 Subject: [PATCH] Resolves an issue when checking content NUS. Fixes an error that prevented packing NUS content without a loaded base. --- 64Inject.sln | 9 ++++++ 64Inject/64Inject.csproj | 36 ++++++++++++++++++++--- 64Inject/64InjectGUI.Designer.cs | 44 ++++++++++++++--------------- 64Inject/64Injector.cs | 2 +- 64Inject/NusContent.cs | 2 +- 64Inject/Program.cs | 2 +- 64Inject/Properties/AssemblyInfo.cs | 2 +- 7 files changed, 67 insertions(+), 30 deletions(-) diff --git a/64Inject.sln b/64Inject.sln index bca5fef..8a805b4 100644 --- a/64Inject.sln +++ b/64Inject.sln @@ -19,6 +19,9 @@ Global Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 + Revision release|Any CPU = Revision release|Any CPU + Revision release|x64 = Revision release|x64 + Revision release|x86 = Revision release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {7980ACD9-F023-4721-BE4F-5C71343711D6}.Beta|Any CPU.ActiveCfg = Beta|Any CPU @@ -45,6 +48,12 @@ Global {7980ACD9-F023-4721-BE4F-5C71343711D6}.Release|x64.Build.0 = Release|x64 {7980ACD9-F023-4721-BE4F-5C71343711D6}.Release|x86.ActiveCfg = Release|x86 {7980ACD9-F023-4721-BE4F-5C71343711D6}.Release|x86.Build.0 = Release|x86 + {7980ACD9-F023-4721-BE4F-5C71343711D6}.Revision release|Any CPU.ActiveCfg = Revision release|Any CPU + {7980ACD9-F023-4721-BE4F-5C71343711D6}.Revision release|Any CPU.Build.0 = Revision release|Any CPU + {7980ACD9-F023-4721-BE4F-5C71343711D6}.Revision release|x64.ActiveCfg = Revision release|x64 + {7980ACD9-F023-4721-BE4F-5C71343711D6}.Revision release|x64.Build.0 = Revision release|x64 + {7980ACD9-F023-4721-BE4F-5C71343711D6}.Revision release|x86.ActiveCfg = Revision release|x86 + {7980ACD9-F023-4721-BE4F-5C71343711D6}.Revision release|x86.Build.0 = Revision release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/64Inject/64Inject.csproj b/64Inject/64Inject.csproj index 48096bf..23464e3 100644 --- a/64Inject/64Inject.csproj +++ b/64Inject/64Inject.csproj @@ -14,10 +14,8 @@ 512 icon.ico false - - - - + + 3.5 publish\ @@ -150,6 +148,36 @@ MinimumRecommendedRules.ruleset false + + bin\Revision release\ + TRACE + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + false + + + bin\x86\Revision release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + false + + + bin\x64\Revision release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + false + diff --git a/64Inject/64InjectGUI.Designer.cs b/64Inject/64InjectGUI.Designer.cs index fc25232..dd98699 100644 --- a/64Inject/64InjectGUI.Designer.cs +++ b/64Inject/64InjectGUI.Designer.cs @@ -121,8 +121,8 @@ private void InitializeComponent() // // textBoxShortName // - this.textBoxShortName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxShortName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.textBoxShortName.Location = new System.Drawing.Point(81, 58); this.textBoxShortName.MaxLength = 256; this.textBoxShortName.Name = "textBoxShortName"; @@ -168,8 +168,8 @@ private void InitializeComponent() // // textBoxRom // - this.textBoxRom.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxRom.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.textBoxRom.Location = new System.Drawing.Point(81, 6); this.textBoxRom.Name = "textBoxRom"; this.textBoxRom.Size = new System.Drawing.Size(557, 20); @@ -177,8 +177,8 @@ private void InitializeComponent() // // textBoxIni // - this.textBoxIni.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxIni.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.textBoxIni.Location = new System.Drawing.Point(81, 32); this.textBoxIni.Name = "textBoxIni"; this.textBoxIni.Size = new System.Drawing.Size(557, 20); @@ -186,8 +186,8 @@ private void InitializeComponent() // // buttonInject // - this.buttonInject.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.buttonInject.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.buttonInject.Enabled = false; this.buttonInject.Location = new System.Drawing.Point(3, 480); this.buttonInject.Name = "buttonInject"; @@ -494,8 +494,8 @@ private void InitializeComponent() // // textBoxLNLine2 // - this.textBoxLNLine2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxLNLine2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.textBoxLNLine2.Enabled = false; this.textBoxLNLine2.Location = new System.Drawing.Point(100, 110); this.textBoxLNLine2.MaxLength = 255; @@ -506,8 +506,8 @@ private void InitializeComponent() // // textBoxLNLine1 // - this.textBoxLNLine1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxLNLine1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.textBoxLNLine1.Enabled = false; this.textBoxLNLine1.Location = new System.Drawing.Point(100, 84); this.textBoxLNLine1.MaxLength = 255; @@ -590,9 +590,9 @@ private void InitializeComponent() this.labelLoadedBase.AutoSize = true; this.labelLoadedBase.Location = new System.Drawing.Point(146, 191); this.labelLoadedBase.Name = "labelLoadedBase"; - this.labelLoadedBase.Size = new System.Drawing.Size(69, 26); + this.labelLoadedBase.Size = new System.Drawing.Size(69, 13); this.labelLoadedBase.TabIndex = 15; - this.labelLoadedBase.Text = "Base loaded:\r\nSVN:"; + this.labelLoadedBase.Text = "Base loaded:\r\n"; // // panelValidKey // @@ -629,8 +629,8 @@ private void InitializeComponent() // // textBoxImagesDir // - this.textBoxImagesDir.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxImagesDir.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.textBoxImagesDir.Location = new System.Drawing.Point(120, 58); this.textBoxImagesDir.Name = "textBoxImagesDir"; this.textBoxImagesDir.Size = new System.Drawing.Size(518, 20); @@ -688,8 +688,8 @@ private void InitializeComponent() // // textBoxBaseFrom // - this.textBoxBaseFrom.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxBaseFrom.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.textBoxBaseFrom.Location = new System.Drawing.Point(120, 162); this.textBoxBaseFrom.Name = "textBoxBaseFrom"; this.textBoxBaseFrom.Size = new System.Drawing.Size(518, 20); @@ -697,8 +697,8 @@ private void InitializeComponent() // // textBoxIniDir // - this.textBoxIniDir.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxIniDir.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.textBoxIniDir.Location = new System.Drawing.Point(120, 32); this.textBoxIniDir.Name = "textBoxIniDir"; this.textBoxIniDir.Size = new System.Drawing.Size(518, 20); @@ -706,8 +706,8 @@ private void InitializeComponent() // // textBoxRomDir // - this.textBoxRomDir.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxRomDir.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.textBoxRomDir.Location = new System.Drawing.Point(120, 6); this.textBoxRomDir.Name = "textBoxRomDir"; this.textBoxRomDir.Size = new System.Drawing.Size(518, 20); diff --git a/64Inject/64Injector.cs b/64Inject/64Injector.cs index fba0251..9d6672e 100644 --- a/64Inject/64Injector.cs +++ b/64Inject/64Injector.cs @@ -10,7 +10,7 @@ namespace _64Inject { public class _64Injector { - public const string Release = "1.1 debug"; //CllVersionReplace "major.minor stability" + public const string Release = "1.1.1 debug"; //CllVersionReplace "major.minor.revision stability" public Cll.Log Log; diff --git a/64Inject/NusContent.cs b/64Inject/NusContent.cs index 82ec6e3..b3695e9 100644 --- a/64Inject/NusContent.cs +++ b/64Inject/NusContent.cs @@ -60,7 +60,7 @@ public static string Check(string path) File.Exists(path + "\\meta\\meta.xml")) { XmlDocument xmlMeta = new XmlDocument(); - xmlMeta.Load("base\\meta\\meta.xml"); + xmlMeta.Load(path + "\\meta\\meta.xml"); XmlNode meta_title_id = xmlMeta.SelectSingleNode("menu/title_id"); return meta_title_id.InnerText; } diff --git a/64Inject/Program.cs b/64Inject/Program.cs index 343ed2f..ba616fd 100644 --- a/64Inject/Program.cs +++ b/64Inject/Program.cs @@ -3,7 +3,7 @@ namespace _64Inject { - static class Program + class Program { [System.Runtime.InteropServices.DllImport("kernel32.dll")] static extern bool FreeConsole(); diff --git a/64Inject/Properties/AssemblyInfo.cs b/64Inject/Properties/AssemblyInfo.cs index a7284d0..a235a2a 100644 --- a/64Inject/Properties/AssemblyInfo.cs +++ b/64Inject/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // Puede especificar todos los valores o establecer como predeterminados los números de versión de compilación y de revisión // mediante el asterisco ('*'), como se muestra a continuación: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.8.0")] +[assembly: AssemblyVersion("1.1.14.1")] [assembly: AssemblyFileVersion("1.0.0.0")]