From 413cec427b17fa34669abd1bd0f1f5fd83bf7e31 Mon Sep 17 00:00:00 2001 From: Alessio Di Giacomo Date: Sat, 4 Aug 2018 17:35:45 +0200 Subject: [PATCH] Add a 'compatibility warning' inside the Resolution tab - Add the red exclamation image into Resources - Apply the compatibility flag for mgs2_sse.exe when applying settings - Disable the 'Anti-aliasing' popup message inside graphics tab --- mgs2 v's fix/ConfSheet.cs | 9 +- mgs2 v's fix/Form1.Designer.cs | 32 ++++ mgs2 v's fix/Form1.cs | 45 ++++-- mgs2 v's fix/Ocelot.cs | 146 ++++++++++++------ mgs2 v's fix/Program.cs | 46 +++--- mgs2 v's fix/Properties/Resources.Designer.cs | 10 ++ mgs2 v's fix/Properties/Resources.resx | 3 + mgs2 v's fix/Resources/Configuration_file.zip | Bin 521 -> 551 bytes mgs2 v's fix/Resources/exclamation.png | Bin 0 -> 15729 bytes mgs2 v's fix/mgs2 v's fix.csproj | 1 + 10 files changed, 209 insertions(+), 83 deletions(-) create mode 100644 mgs2 v's fix/Resources/exclamation.png diff --git a/mgs2 v's fix/ConfSheet.cs b/mgs2 v's fix/ConfSheet.cs index 5bba735..e0520f5 100644 --- a/mgs2 v's fix/ConfSheet.cs +++ b/mgs2 v's fix/ConfSheet.cs @@ -12,8 +12,9 @@ public class ConfSheet public Dictionary Controls; public Dictionary Graphics; public Dictionary Sound; + public Dictionary Others; + - public ConfSheet() { @@ -61,6 +62,12 @@ public ConfSheet() }; + this.Others = new Dictionary + { + {"CompatibilityWarningDisplayed",null}, + + }; + } diff --git a/mgs2 v's fix/Form1.Designer.cs b/mgs2 v's fix/Form1.Designer.cs index c922340..04f8822 100644 --- a/mgs2 v's fix/Form1.Designer.cs +++ b/mgs2 v's fix/Form1.Designer.cs @@ -136,6 +136,8 @@ private void InitializeComponent() this.lbl_ManualLink = new System.Windows.Forms.Label(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.pic_background = new System.Windows.Forms.PictureBox(); + this.pictureBox4 = new System.Windows.Forms.PictureBox(); + this.help_compatibilityWarning = new System.Windows.Forms.Label(); this.tabControl1.SuspendLayout(); this.tab_Resolution.SuspendLayout(); this.tab_Controls.SuspendLayout(); @@ -161,6 +163,7 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.otagif)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pic_background)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); this.SuspendLayout(); // // btn_startGame @@ -225,6 +228,8 @@ private void InitializeComponent() // tab_Resolution // this.tab_Resolution.BackColor = System.Drawing.Color.White; + this.tab_Resolution.Controls.Add(this.help_compatibilityWarning); + this.tab_Resolution.Controls.Add(this.pictureBox4); this.tab_Resolution.Controls.Add(this.help_resolution); this.tab_Resolution.Controls.Add(this.chb_OptimizedFOV); this.tab_Resolution.Controls.Add(this.lbl_OptimizedFOV); @@ -1937,6 +1942,30 @@ private void InitializeComponent() this.pic_background.TabIndex = 9; this.pic_background.TabStop = false; // + // pictureBox4 + // + this.pictureBox4.Cursor = System.Windows.Forms.Cursors.Default; + this.pictureBox4.Image = global::mgs2_v_s_fix.Properties.Resources.exclamation; + this.pictureBox4.Location = new System.Drawing.Point(99, 187); + this.pictureBox4.Name = "pictureBox4"; + this.pictureBox4.Size = new System.Drawing.Size(42, 42); + this.pictureBox4.TabIndex = 15; + this.pictureBox4.TabStop = false; + // + // help_compatibilityWarning + // + this.help_compatibilityWarning.Anchor = System.Windows.Forms.AnchorStyles.None; + this.help_compatibilityWarning.AutoSize = true; + this.help_compatibilityWarning.Cursor = System.Windows.Forms.Cursors.Hand; + this.help_compatibilityWarning.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.help_compatibilityWarning.Location = new System.Drawing.Point(147, 199); + this.help_compatibilityWarning.Name = "help_compatibilityWarning"; + this.help_compatibilityWarning.Size = new System.Drawing.Size(306, 19); + this.help_compatibilityWarning.TabIndex = 16; + this.help_compatibilityWarning.Text = "Check the compatibility flags! More info here!"; + this.help_compatibilityWarning.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.help_compatibilityWarning.Click += new System.EventHandler(this.help_compatibilityWarning_Click); + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -2000,6 +2029,7 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.otagif)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pic_background)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -2114,6 +2144,8 @@ private void InitializeComponent() private System.Windows.Forms.Label label18; private System.Windows.Forms.PictureBox ptb_GitHubLogo; private System.Windows.Forms.Label lbl_checkForUpdate; + private System.Windows.Forms.Label help_compatibilityWarning; + private System.Windows.Forms.PictureBox pictureBox4; } } diff --git a/mgs2 v's fix/Form1.cs b/mgs2 v's fix/Form1.cs index 7e1c716..d8552fd 100644 --- a/mgs2 v's fix/Form1.cs +++ b/mgs2 v's fix/Form1.cs @@ -81,7 +81,7 @@ public Form1() setNewBackground(); - Ocelot.console("[+] Form1 constructor has done. Waiting user input."); + Ocelot.PrintToDebugConsole("[+] Form1 constructor has done. Waiting user input."); // Bind lbl_checkForUpdate.Text to default text @@ -95,14 +95,14 @@ private void btn_startGame_Click(object sender, EventArgs e) { Ocelot.startGame(); - Ocelot.console("[+] Start game button pressed"); + Ocelot.PrintToDebugConsole("[+] Start game button pressed"); } private void btn_settings_Click(object sender, EventArgs e) { - Ocelot.console("[ ] Settings button pressed"); + Ocelot.PrintToDebugConsole("[ ] Settings button pressed"); // Check if INI contain all field and/or uncompiled fields @@ -135,7 +135,7 @@ private void btn_settings_Click(object sender, EventArgs e) return; } - Ocelot.console("[ ] Settings - settings from internal config correctly attached to setupper"); + Ocelot.PrintToDebugConsole("[ ] Settings - settings from internal config correctly attached to setupper"); // Settings Mode btn_startGame.Visible = false; @@ -157,14 +157,28 @@ private void btn_settings_Click(object sender, EventArgs e) abt_Contacts.Checked = true; - Ocelot.console("[+] Settings has been displayed."); + // Must display the warning about winXP compatiblity? + + if (!Ocelot.InternalConfiguration.Others["CompatibilityWarningDisplayed"].Equals("true")) + { + // Display it! + + Ocelot.showMessage("compatibilityWarning"); + + // Not display anymore + + Ocelot.InternalConfiguration.Others["CompatibilityWarningDisplayed"] = "true"; + + } + + Ocelot.PrintToDebugConsole("[+] Settings has been displayed."); } private void btn_saveSettings_Click(object sender, EventArgs e) { - Ocelot.console("[ ] Save button pressed"); + Ocelot.PrintToDebugConsole("[ ] Save button pressed"); load_SetupperConfig_SetTo_InternalConfig(); @@ -187,7 +201,7 @@ private void btn_saveSettings_Click(object sender, EventArgs e) pictureBox2.Visible = false; lbl_ManualLink.Visible = false; - Ocelot.console("[+] Save has been saved (!)"); + Ocelot.PrintToDebugConsole("[+] Save has been saved (!)"); } @@ -195,7 +209,7 @@ private void btn_exit_Click(object sender, EventArgs e) { Application.Exit(); - Ocelot.console("[+] Exit button pressed"); + Ocelot.PrintToDebugConsole("[+] Exit button pressed"); } @@ -266,12 +280,12 @@ public bool load_InternalConfig_SetTo_SetupperConfig() if (lst_vga_list.SelectedIndex == -1) { - Ocelot.console("[!] -VVV- No VGA Selected."); + Ocelot.PrintToDebugConsole("[!] -VVV- No VGA Selected."); if (Ocelot.vgaList.Count == 0) { - Ocelot.console("[!] -WHY?- No VGA found on system. Awaiting manual input."); + Ocelot.PrintToDebugConsole("[!] -WHY?- No VGA found on system. Awaiting manual input."); // Strange case: // V's wasn't able to understand which video cards are available @@ -281,7 +295,7 @@ public bool load_InternalConfig_SetTo_SetupperConfig() if (explicitedVGAName!= null && !explicitedVGAName.Equals("") && explicitedVGAName.Length > 0) { - Ocelot.console("[!] -RESULT?- Found a manual inserted one: "+ explicitedVGAName); + Ocelot.PrintToDebugConsole("[!] -RESULT?- Found a manual inserted one: "+ explicitedVGAName); // Manually inserted lst_vga_list.Items.Add(explicitedVGAName); @@ -292,7 +306,7 @@ public bool load_InternalConfig_SetTo_SetupperConfig() { // Prompt a message to V's Wiki - Ocelot.console("[!] -RESULT?- NO MANUAL INPUT. SHOWING MANUAL and ABORTING."); + Ocelot.PrintToDebugConsole("[!] -RESULT?- NO MANUAL INPUT. SHOWING MANUAL and ABORTING."); Ocelot.showMessage("no_vga"); @@ -1415,6 +1429,11 @@ private void ptb_comPLAY_Click(object sender, EventArgs e) } } + private void help_compatibilityWarning_Click(object sender, EventArgs e) + { + Ocelot.showMessage("compatibilityWarning"); + } + #endregion #region UPDATE @@ -1433,7 +1452,7 @@ private async void ptb_GitHubLogo_Click(object sender, EventArgs e) UPDATE_checkInProgress = true; - lbl_checkForUpdate.Text = "Checking..."; + lbl_checkForUpdate.Text = "...Checking..."; // Set the async UPDATE_AVAILABILITY remoteStatus = await Task.Run(() => Ocelot.CheckForUpdatesAsync()); diff --git a/mgs2 v's fix/Ocelot.cs b/mgs2 v's fix/Ocelot.cs index a5eeefa..72b1a8e 100644 --- a/mgs2 v's fix/Ocelot.cs +++ b/mgs2 v's fix/Ocelot.cs @@ -24,7 +24,7 @@ class Ocelot { // Current version of the V's Fix - Format is YYMMDD - public const string VERSION = "180614"; + public const string VERSION = "180804"; // UPDATE @@ -113,7 +113,16 @@ public static void checkConfFileIntegrity() } } - if (needOfAutoConfig) { Ocelot.console("[+] Configuration_file.ini seem missing some key. Need to autoconfig!"); } + foreach (KeyValuePair entry in InternalConfiguration.Others) + { + if (!ConfFile.KeyExists(entry.Key, "Others")) + { + ConfFile.Write(entry.Key, "", "Others"); + needOfAutoConfig = true; + } + } + + if (needOfAutoConfig) { Ocelot.PrintToDebugConsole("[+] Configuration_file.ini seem missing some key. Need to autoconfig!"); } return; @@ -127,7 +136,7 @@ public static void load_INI_SetTo_InternalConfig() // Time to pair Key-Value from Configuration_file.ini and // set it to Ocelot.dataFromConfFile - Ocelot.console("[ ] .ini contain a valid configuration. Loading from it..."); + Ocelot.PrintToDebugConsole("[ ] .ini contain a valid configuration. Loading from it..."); foreach(var entry in InternalConfiguration.Resolution.ToList()) { @@ -161,7 +170,15 @@ public static void load_INI_SetTo_InternalConfig() } - Ocelot.console("[ ] Information from .ini succesfully loaded into setupper!"); + foreach (var entry in InternalConfiguration.Others.ToList()) + { + + var tempstring = ConfFile.Read(entry.Key.ToString(), "Others"); + InternalConfiguration.Others[entry.Key] = tempstring; + + } + + Ocelot.PrintToDebugConsole("[ ] Information from .ini succesfully loaded into setupper!"); return; } @@ -196,7 +213,14 @@ internal static void load_InternalConfig_SetTo_INI() } - Ocelot.console("[ ] InternalConfig succesfully exported into Configuration_file.ini"); + foreach (KeyValuePair entry in InternalConfiguration.Others) + { + + ConfFile.Write(entry.Key, entry.Value, "Others"); + + } + + Ocelot.PrintToDebugConsole("[ ] InternalConfig succesfully exported into Configuration_file.ini"); return; } @@ -770,27 +794,6 @@ internal static void load_InternalConfig_SetTo_MGS() Unzip.UnZippa("V_s_sweetFX.zip"); - try - { - - // 2: Trying to automatically apply the Windows XP SP3 Compatibility Mode - - string registry_path = "Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers\\"; - string game_exe_path = Application.StartupPath + "\\mgs2_sse.exe"; - Microsoft.Win32.RegistryKey key; - - key = Microsoft.Win32.Registry.CurrentUser.CreateSubKey(registry_path); - - key.SetValue(game_exe_path, "~ RUNASADMIN WINXPSP3", Microsoft.Win32.RegistryValueKind.String); - key.Close(); - - } - - catch - { - // BIG NOPE - } - } #endregion @@ -950,6 +953,10 @@ internal static void load_InternalConfig_SetTo_MGS() */ + // Set the compatibility flags + + setCompatibilityFlags(); + } catch @@ -958,7 +965,7 @@ internal static void load_InternalConfig_SetTo_MGS() } - Ocelot.console("[ ] InternalConfig succesfully exported into mgs2.ini"); + Ocelot.PrintToDebugConsole("[ ] InternalConfig succesfully exported into mgs2.ini"); if (Ocelot.debugMode) { @@ -973,7 +980,7 @@ internal static void load_InternalConfig_SetTo_MGS() public static void startAutoconfig() { - Ocelot.console("[ ] Autoconfig started. I'm looking for a nice config..."); + Ocelot.PrintToDebugConsole("[ ] Autoconfig started. I'm looking for a nice config..."); ConfSheet defaultConfig = new ConfSheet(); // Resolution @@ -1030,7 +1037,7 @@ public static void startAutoconfig() } - Ocelot.console("[!] -VVV- No VGA Selected."); + Ocelot.PrintToDebugConsole("[!] -VVV- No VGA Selected."); if(vgaList.Count == 0) { @@ -1050,7 +1057,7 @@ public static void startAutoconfig() defaultConfig.Resolution["GraphicAdapterName"] = explicitedVGAName; - Ocelot.console("[!] -AUTOCONFIG- Found a manual inserted one: " + explicitedVGAName); + Ocelot.PrintToDebugConsole("[!] -AUTOCONFIG- Found a manual inserted one: " + explicitedVGAName); } } @@ -1103,9 +1110,15 @@ public static void startAutoconfig() defaultConfig.Sound["SoundQuality"]="high"; defaultConfig.Sound["FixAfterPlaying"] = "true"; + // Others + + defaultConfig.Others["CompatibilityWarningDisplayed"] = "false"; + + // Finished! + InternalConfiguration = defaultConfig; - Ocelot.console("[+] Autoconfig finished. InternalConfiguration Filled"); + Ocelot.PrintToDebugConsole("[+] Autoconfig finished. InternalConfiguration Filled"); Ocelot.needOfAutoConfig = false; @@ -1335,7 +1348,6 @@ public static void showMessage(string code) case "unzipping_error": - // TODO change this MessageBox.Show( "V's Fix isn't able to create some files into game's directory.\nFix require full permission to create,delete and extract file into that directory. Try to run the fix using 'Admin rights'!", "Guru meditation", MessageBoxButtons.OK, MessageBoxIcon.Error); @@ -1380,20 +1392,57 @@ public static void showMessage(string code) break; + case "compatibilityWarning": + + MessageBox.Show( + "CompatibilityWarning", + "we", MessageBoxButtons.OK, MessageBoxIcon.Information); + + break; + default: - // TODO change this MessageBox.Show("You shouldn't be able to read this message: /", "Can't do a sh*t!", MessageBoxButtons.OK, MessageBoxIcon.Error); break; } - Ocelot.console("[!] Showed a messagebox with code: "+code); + Ocelot.PrintToDebugConsole("[!] Showed a messagebox with code: "+code); + } + + // Apply the 'Windows XP SP3 Compatibility Mode' and 'Run as Admin' flags + + private static void setCompatibilityFlags() + { + + try + { + string registry_path = "Software\\Microsoft\\Windows NT\\CurrentVersion\\AppCompatFlags\\Layers\\"; + string game_exe_path = Application.StartupPath + "\\mgs2_sse.exe"; + Microsoft.Win32.RegistryKey key; + + key = Microsoft.Win32.Registry.CurrentUser.CreateSubKey(registry_path); + + key.SetValue(game_exe_path, "~ RUNASADMIN WINXPSP3", Microsoft.Win32.RegistryValueKind.String); + key.Close(); + + PrintToDebugConsole("[ :) ] Compatibility flags set!"); + + } + + catch + { + // Signal to debugger + + PrintToDebugConsole("[ :( ] Exception while setting compatibility flags!"); + + } + } // write message into console (and into a file, if debug mode is enabled) - public static void console(string output) + public static void PrintToDebugConsole(string output) { output = DateTime.Now.ToString("hh.mm.ss.fff") + " -> " + output; @@ -1409,38 +1458,43 @@ public static void console(string output) public static void debug_printInternalConfig() { - Ocelot.console("[D] ----------"); - Ocelot.console("[D] Printing InternalConfig:"); + Ocelot.PrintToDebugConsole("[D] ----------"); + Ocelot.PrintToDebugConsole("[D] Printing InternalConfig:"); - Ocelot.console("[D] - VGA List:"); + Ocelot.PrintToDebugConsole("[D] - VGA List:"); foreach (string single_vga in Ocelot.vgaList) { - Ocelot.console("[D] "+single_vga); + Ocelot.PrintToDebugConsole("[D] "+single_vga); } foreach (KeyValuePair entry in InternalConfiguration.Resolution) { - Ocelot.console("[D] Key: "+entry.Key+" -> Value: "+entry.Value); + Ocelot.PrintToDebugConsole("[D] Key: "+entry.Key+" -> Value: "+entry.Value); } foreach (KeyValuePair entry in InternalConfiguration.Controls) { - Ocelot.console("[D] Key: " + entry.Key + " -> Value: " + entry.Value); + Ocelot.PrintToDebugConsole("[D] Key: " + entry.Key + " -> Value: " + entry.Value); } foreach (KeyValuePair entry in InternalConfiguration.Graphics) { - Ocelot.console("[D] Key: " + entry.Key + " -> Value: " + entry.Value); + Ocelot.PrintToDebugConsole("[D] Key: " + entry.Key + " -> Value: " + entry.Value); } foreach (KeyValuePair entry in InternalConfiguration.Sound) { - Ocelot.console("[D] Key: " + entry.Key + " -> Value: " + entry.Value); + Ocelot.PrintToDebugConsole("[D] Key: " + entry.Key + " -> Value: " + entry.Value); + } + + foreach (KeyValuePair entry in InternalConfiguration.Others) + { + Ocelot.PrintToDebugConsole("[D] Key: " + entry.Key + " -> Value: " + entry.Value); } - Ocelot.console("[D] END"); + Ocelot.PrintToDebugConsole("[D] END"); } @@ -1557,7 +1611,7 @@ public static async Task CheckForUpdatesAsync() int localVersion = getIntFromThisString(VERSION); int remoteVersion = getIntFromThisString(response.VERSION); - console("CurrentVersion: "+ localVersion+" LatestVersion: "+remoteVersion); + PrintToDebugConsole("CurrentVersion: "+ localVersion+" LatestVersion: "+remoteVersion); if (remoteVersion>localVersion) { @@ -1605,7 +1659,7 @@ public static int getIntFromThisString(string inputString) { // Do nothing - Ocelot.console(e.Message); + Ocelot.PrintToDebugConsole(e.Message); } diff --git a/mgs2 v's fix/Program.cs b/mgs2 v's fix/Program.cs index 74f30c0..717e055 100644 --- a/mgs2 v's fix/Program.cs +++ b/mgs2 v's fix/Program.cs @@ -39,9 +39,9 @@ static void Main(string[] args) Ocelot.debugMode = true; - Ocelot.console("[!][!][!][!][!][!][!][!][!][!][!][!]"); - Ocelot.console("[!]"); - Ocelot.console("[!] Fix started at "+ DateTime.UtcNow+" (UCT)"); + Ocelot.PrintToDebugConsole("[!][!][!][!][!][!][!][!][!][!][!][!]"); + Ocelot.PrintToDebugConsole("[!]"); + Ocelot.PrintToDebugConsole("[!] Fix started at "+ DateTime.UtcNow+" (UCT)"); } @@ -59,7 +59,7 @@ static void Main(string[] args) // Neither fix will try to install/extract anything // V's Fix will now close - Ocelot.console("[!] Fix is inside wrong folder. Closing."); + Ocelot.PrintToDebugConsole("[!] Fix is inside wrong folder. Closing."); } @@ -80,7 +80,7 @@ static void Main(string[] args) Ocelot.showMessage("tip_patcher"); - Ocelot.console("[ ] Game is not patched. Applying V's 2.0 Homemade Patcher"); + Ocelot.PrintToDebugConsole("[ ] Game is not patched. Applying V's 2.0 Homemade Patcher"); Unzip.UnZippa("1_homemade_patcher.zip"); @@ -88,19 +88,19 @@ static void Main(string[] args) cmd = Process.Start(new ProcessStartInfo("AreaChecker.exe")); cmd.WaitForExit(); - Ocelot.console("[ ] || [X] AreaChecker.exe finished"); + Ocelot.PrintToDebugConsole("[ ] || [X] AreaChecker.exe finished"); cmd = Process.Start(new ProcessStartInfo("VOXPatch.exe")); cmd.WaitForExit(); - Ocelot.console("[ ] || [X] VOXPatch.exe finished"); + Ocelot.PrintToDebugConsole("[ ] || [X] VOXPatch.exe finished"); File.Delete(Application.StartupPath + "\\AreaChecker.exe"); File.Delete(Application.StartupPath + "\\VOXPatch.exe"); File.Create(Application.StartupPath + "\\_patch2.0_applied.sss"); - Ocelot.console("[X] V's 2.0 Homemade Patcher succesfully used!"); + Ocelot.PrintToDebugConsole("[X] V's 2.0 Homemade Patcher succesfully used!"); } @@ -108,13 +108,13 @@ static void Main(string[] args) if (!(System.IO.File.Exists(Application.StartupPath + "\\_audio_fix_applied.sss"))) { //Nope - Ocelot.console("[ ] Audio not patched. Applying Audio Fix"); + Ocelot.PrintToDebugConsole("[ ] Audio not patched. Applying Audio Fix"); Unzip.UnZippa("2_audio_fix.zip"); File.Create(Application.StartupPath + "\\_audio_fix_applied.sss"); - Ocelot.console("[X] Audio Fix succesfully applied!"); + Ocelot.PrintToDebugConsole("[X] Audio Fix succesfully applied!"); } @@ -122,13 +122,13 @@ static void Main(string[] args) if (!(System.IO.File.Exists(Application.StartupPath + "\\_fixed_exe_applied.sss"))) { //Nope - Ocelot.console("[ ] Fixed exe not applied. Applying it"); + Ocelot.PrintToDebugConsole("[ ] Fixed exe not applied. Applying it"); Unzip.UnZippa("3_fixed_exe.zip",true); File.Create(Application.StartupPath + "\\_fixed_exe_applied.sss"); - Ocelot.console("[X] Fixed Exe succesfully applied!"); + Ocelot.PrintToDebugConsole("[X] Fixed Exe succesfully applied!"); } @@ -142,11 +142,11 @@ static void Main(string[] args) if (System.IO.File.Exists(Application.StartupPath + "\\_MGS2SConfig.oldandcrappy")) { File.Delete(Application.StartupPath + "\\_MGS2SConfig.oldandcrappy"); - Ocelot.console("[X] _MGS2SConfig.oldandcrappy deleted"); + Ocelot.PrintToDebugConsole("[X] _MGS2SConfig.oldandcrappy deleted"); } System.IO.File.Move("MGS2SConfig.exe", "_MGS2SConfig.oldandcrappy"); - Ocelot.console("[X] MSG2Config.exe nuked"); + Ocelot.PrintToDebugConsole("[X] MSG2Config.exe nuked"); } // Boycott useless original config .ini file @@ -158,11 +158,11 @@ static void Main(string[] args) if (System.IO.File.Exists(Application.StartupPath + "\\_MGS2SSET.oldandcrappy")) { File.Delete(Application.StartupPath + "\\_MGS2SSET.oldandcrappy"); - Ocelot.console("[X] _MGS2SSET.oldandcrappy deleted"); + Ocelot.PrintToDebugConsole("[X] _MGS2SSET.oldandcrappy deleted"); } System.IO.File.Move("MGS2SSET.ini", "_MGS2SSET.oldandcrappy"); - Ocelot.console("[X] MGS2SSET.ini nuked"); + Ocelot.PrintToDebugConsole("[X] MGS2SSET.ini nuked"); } // Boycott useless non-sse executable @@ -174,11 +174,11 @@ static void Main(string[] args) if (System.IO.File.Exists(Application.StartupPath + "\\_mgs2.exe.oldandcrappy")) { File.Delete(Application.StartupPath + "\\_mgs2.exe.oldandcrappy"); - Ocelot.console("[X] _mgs2.exe.oldandcrappy deleted"); + Ocelot.PrintToDebugConsole("[X] _mgs2.exe.oldandcrappy deleted"); } System.IO.File.Move("mgs2.exe", "_mgs2.exe.oldandcrappy"); - Ocelot.console("[X] mgs2.exe nuked"); + Ocelot.PrintToDebugConsole("[X] mgs2.exe nuked"); } // V's Setupper has been used in the past? @@ -187,11 +187,11 @@ static void Main(string[] args) { //Nope // Deploying a basic .ini - Ocelot.console("[ ] No Configuration_file.ini . Deploying it"); + Ocelot.PrintToDebugConsole("[ ] No Configuration_file.ini . Deploying it"); Unzip.UnZippa("Configuration_file.zip"); - Ocelot.console("[X] Configuration_file.ini now it's there!"); + Ocelot.PrintToDebugConsole("[X] Configuration_file.ini now it's there!"); } @@ -202,7 +202,7 @@ static void Main(string[] args) } catch (Exception e) { - Ocelot.console(e.ToString()); + Ocelot.PrintToDebugConsole(e.ToString()); forbidStart = true; } @@ -214,7 +214,7 @@ static void Main(string[] args) // All patch applied. // Now I'm sure there aren't old files inside the directory - Ocelot.console("[!] forbidStart is false. Starting winform"); + Ocelot.PrintToDebugConsole("[!] forbidStart is false. Starting winform"); Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); @@ -227,7 +227,7 @@ static void Main(string[] args) if (Ocelot.debugMode) Ocelot.showMessage("debug_mode"); Ocelot.showMessage("initiating_error"); - Ocelot.console("[!] forbidStart is true. Closing."); + Ocelot.PrintToDebugConsole("[!] forbidStart is true. Closing."); } diff --git a/mgs2 v's fix/Properties/Resources.Designer.cs b/mgs2 v's fix/Properties/Resources.Designer.cs index 97e9d29..557aa67 100644 --- a/mgs2 v's fix/Properties/Resources.Designer.cs +++ b/mgs2 v's fix/Properties/Resources.Designer.cs @@ -190,6 +190,16 @@ internal static System.Drawing.Bitmap cP { } } + /// + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap exclamation { + get { + object obj = ResourceManager.GetObject("exclamation", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Cerca una risorsa localizzata di tipo System.Byte[]. /// diff --git a/mgs2 v's fix/Properties/Resources.resx b/mgs2 v's fix/Properties/Resources.resx index 124ac83..404d6af 100644 --- a/mgs2 v's fix/Properties/Resources.resx +++ b/mgs2 v's fix/Properties/Resources.resx @@ -220,4 +220,7 @@ ..\Resources\GitHubLogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/mgs2 v's fix/Resources/Configuration_file.zip b/mgs2 v's fix/Resources/Configuration_file.zip index cbd59de5cf7634df493705fae844341a344a3427..bfb0d2678e1255dec7ffed530cc6dd93e8c00129 100644 GIT binary patch delta 483 zcmeBVSI3}u@?>tf z&Guu%F3;!%vAd-**mYrTAORI+eJ!RDJ+LSt*I_q@GVF6%XK z-}S4;U(OwuzfyA}uYP;!*H=GZIA1=b^5F4q=2=rDdnZ__8M4cCY>bG>TBy^;R@_pu zkz;?tq6tTXLmpaxaaZ?^-CL>sE@tCvNyB&V_h;3gHn6;3zv)%$A4#{EX^WO#R=#=3 zM#Jgytrd0Nfis+fzQ(pVA1D==Q2KCYp+njh{slju_(b}0J!M_&`t9S5`k(PPEPTVm z=Q3~I?O2-=;eJ%F=A^)$GiN)lJ^v`5CoN#{DmHXqs#hkz_pZAJ3Hn~$K^3K?bCciC zYn!GqXJcEEp#Jrpd^4wqF_%qQe6_^;?|-p+CygE1*LwFGKecP5 WKy9pSz-VM(1i}m;y%HFU3=9C}anxo2 delta 466 zcmZ3^(#awo;LXe;!oa}5!Qi!gr%ytZ{qk@|1_rT-;&Sx?-rk2D1op9ilD`(Le@QH# z%Q7P;d*Rhv4x&d6n^>RJ%PTu%r}Oc;wP)~!%OB33`95Rj*&~UZ*Q)hxO3E`2^=>WT zI9B2`X)epc2hy$6I36vrx)>;;-sRTCHnZfCW9Nbkk4vn4C!74dv94?Oq5}fA&zszI zT)E}%qBmuB^Ov7=++80vTc_QuVcT_g5j!i9#v2#e3y*Zkd=nGa6KP)Hb>+c&wuiP= zMur)ibpEvL3RCo+Y_8jE6|Upeo-zG(`7v$wwU?gmP0=qof8oJ~6xF%gRH`>Tv@#o<)wu6!Xv`;_p+Y^6iLSA5K1lzKk7d~HlqIfH4Z;0hY z%kxH?_E!9#%PxGE!7{<|qL-ifmH+#9v^;pIByFy@H$K3dkx8BbOQ16W1D-(z7#Sd- xF!=(brk=BPaAee%%ZwQZe{g~5y$_Z@pRRt1F~FOZ4Wx<@2s40mH!#u|7yx|$#Y6xA diff --git a/mgs2 v's fix/Resources/exclamation.png b/mgs2 v's fix/Resources/exclamation.png new file mode 100644 index 0000000000000000000000000000000000000000..c146af920ac0c27f0026df18e5d5324ba3d6bff7 GIT binary patch literal 15729 zcmeI3X>b!&9Ke@|K#M4XRy@EEluqZrl3?3ZTQs${L0Y`n?!Klg$!^SUN!k$) z&~fT09-{*~sFi{oiYKF^SlZEH7?0w3R21+U9Rx(JP*LlQ`gW7%cuk*m)DO{19ffHLB4G%?-oq+eTAL`3ll_u${7=pu%xgFuSw6#!vC6@HW_snb*a}> zsueWW2WpJvats)q7N?oFG7e*j+rl^*hl{z$XtOeQ+G?j6yP2`ERyWHyjj5N(R|x-k zVnP#J>%Syb4oY5Av#Lf}nvTcgmbl#_$3isYcDre-jkej$(8H{>N-CEyOUkTdlA%0) zpztvzClErWmQ(1T~;$R zYh!u2@q$I7B*<~)LJy64XO=pX2>3Y__+Tr#%vShz1es#i>0<5nxmMVd)~qB+Pb5bG zw!Ofq+-S1o_@a4aL2POrRhEorZjL~Jt&$X#lXy_&_rbYaL{VVff~~~n7qJ;=)-z+UWmoi9BhBm8ujK*gCCQEd?7(KW6H{ zjk($(Ls-<0izpXUfVK<0rlD<^K3~$uhZdvnW|rf%gT}{ey$S>moukbRD;=2%6NfM0 z=qM-iXN8YkBi;-oT*D_*>0TozQRF5y&c#4!2=>HZY{O*2+z2$Yht|&Iu=pRWfx<2O zXDcweE%bk1flTl6&72ehf{z|*+abm17A?7yx%+A87#P0)Jn3r^8w3gUa;_D`l-w@R z_h%Uw%GGM)P4>*++n()bUrmYU#%qKr;RyJxUNRS^Y?gCn>)Si;pC-~ zHH>mOEXM+}0DSPU&5SOi&J4pN@NAPDi*Tw>jBp`9N2QR5&M31ywW~G@PgJR+#&jNumDzr<#RFPhQ5Q=!>rG_(O9nr%iyGm#4=QT5qU)ev=7ly+;u>U`?p zT`=$!JDql?hep+CM2(mL;d;LauY!tpwmV=YJq9)84Qv=GFw2k%Om;-p{i@#hNiDn^ zhBxAL`c8b?v`8U34CkzAw*0t7D-TzEc+mEb~v;6;K9&j+y*TnG@nNO0l# zAXb740fH9^E<7K^N^l`S@FKy5=Yv=YE(8c(B)IT=5G%oj0Ktm{7oHDdCAbhEc#+`3 z^Fgcx7Xkz?5?pvbh?U?%fZ#=f3(p6!5?lxnyhw22`5;z;3ju-`2`)Sz#7b}>K=2~L zh3A7<2`&T(UL?5id=M+ag#f{e1Q(tUVkNi`Ab64B!t+6_1Q!AXFA`jMK8TgzLV(~! zf(y?Fu@YPe5WGlm;rSp|f(rqH7qPesGtagH2|myohfl6P*SG5ceCpN6SJnn7s_lG= zx^*Q*{rU&|Jw#D0R*E{jgre9r6m^FD!1X&Xp{Owjs{EzF#NH!odKVb3JZ;x4dv?q& z9Nar@>v?;(iD&#WrPTlJjCG-dGZ$YrFv0TBRj-J%>hGy6J#|CT4aJA|7q2?`kacuaZs^x6eaa{e_BFwY)+Zu0BY?%O_|{C(9IWeXaPIUj!T{XHj6 zySV7SS=Ti5^xGf5YaL^3dv)5ELgdDdV|^Pd_P@}%^_wYECw1AEtseJB@8b2}@0V_G zW0vpz?nv!gNAnb;^hvq<^AGoR9BN;&>eaSmTW>ONxM=LDgXi>I`oYx;S9^c{Vd{=K zn+p0r>%ZzlP_oisHUz_GwpH9|SU&N#b+dbxemZa9^quEyIbj=BGo$0+W#3fHSZU}T z<8i)L+Rd(5ZCJQXxcB9o3={gM@0eU>5MEmJ+u#xJ>PPp1?%%GQUeGtLOFZYuWr{*XBCkg@;&Y`zfxO?N9A~qVpr!aPGXa z=u5UeeD~9iM^9GYmd9_IJ20NQbK;7xS~_>Fd49{+=0m@nU$*`58^N+rM_s`dzVGaw z>63qoZXbXAgil>B&z^6nU4Bh%&;5n#iz-5&A3RBY=c_o?SKaYgd6(yR?V;$ZifaEe IWlL842}sgh6951J literal 0 HcmV?d00001 diff --git a/mgs2 v's fix/mgs2 v's fix.csproj b/mgs2 v's fix/mgs2 v's fix.csproj index e1e7ec6..0d50443 100644 --- a/mgs2 v's fix/mgs2 v's fix.csproj +++ b/mgs2 v's fix/mgs2 v's fix.csproj @@ -184,6 +184,7 @@ +