From b826632c7bd89009a6747e5620a1a6b8bcd043cd Mon Sep 17 00:00:00 2001 From: Mikhail Thompson Date: Fri, 31 May 2024 13:23:08 +0200 Subject: [PATCH] cleanup --- Rectify11.Phase2/Helper.cs | 4 +-- Rectify11.Phase2/Program.cs | 18 +++++----- .../TabControlWithoutHeader.Designer.cs | 36 ------------------- .../Controls/TabControlWithoutHeader.cs | 21 ----------- RectifyControlPanel2 | 2 +- 5 files changed, 12 insertions(+), 69 deletions(-) delete mode 100644 Rectify11Installer/Controls/TabControlWithoutHeader.Designer.cs delete mode 100644 Rectify11Installer/Controls/TabControlWithoutHeader.cs diff --git a/Rectify11.Phase2/Helper.cs b/Rectify11.Phase2/Helper.cs index fc3eb7c8e..05828fcc8 100644 --- a/Rectify11.Phase2/Helper.cs +++ b/Rectify11.Phase2/Helper.cs @@ -71,7 +71,7 @@ public static bool SafeFileCopy(string src, string dest) return false; } } - public static bool InstallWow64Dlll(string file) + public static bool InstallWow64Dll(string file) { // whatever, its only for a few cases try @@ -107,7 +107,7 @@ public static void ImportReg(string path) } catch (Exception ex) { - Console.WriteLine(Path.GetFileName(path) + " failed.", ex); + Console.WriteLine(Path.GetFileName(path) + " failed." + ex.ToString()); } } public static string FixString(string path, bool x86) diff --git a/Rectify11.Phase2/Program.cs b/Rectify11.Phase2/Program.cs index c13501843..5855bd8ad 100644 --- a/Rectify11.Phase2/Program.cs +++ b/Rectify11.Phase2/Program.cs @@ -45,15 +45,15 @@ private static void Main(string[] args) } // copy necessary files - InstallSys32Dll("iconres.dll"); ImportReg(Path.Combine(Variables.r11Files, "icons.reg")); InstallSys32Dll("duires.dll"); + InstallSys32Dll("iconres.dll"); InstallSys32Dll("ImmersiveFontHandler.dll"); InstallSys32Dll("twinuifonts.dll"); - InstallWow64Dlll("iconres.dll"); - InstallWow64Dlll("duires.dll"); - InstallWow64Dlll("ImmersiveFontHandler.dll"); - InstallWow64Dlll("twinuifonts.dll"); + InstallWow64Dll("iconres.dll"); + InstallWow64Dll("duires.dll"); + InstallWow64Dll("ImmersiveFontHandler.dll"); + InstallWow64Dll("twinuifonts.dll"); InstallFonts(); r11Reg?.Close(); @@ -255,9 +255,9 @@ private static void Main(string[] args) } for (int k = 0; k < uninstallFiles.Length; k++) { - if (uninstallFiles[k].Contains("mmc.exe")) + if (uninstallFiles[k].Contains("mmc.exe")) { - foreach (var process in Process.GetProcessesByName("mmc")) + foreach (var process in Process.GetProcessesByName("mmc")) { process.Kill(); } @@ -326,11 +326,11 @@ private static void Main(string[] args) } } - SafeFileDeletion(Path.Combine(Variables.sys32Folder,"iconres.dll")); + SafeFileDeletion(Path.Combine(Variables.sys32Folder, "iconres.dll")); SafeFileDeletion(Path.Combine(Variables.sys32Folder, "duires.dll")); SafeFileDeletion(Path.Combine(Variables.sys32Folder, "ImmersiveFontHandler.dll")); SafeFileDeletion(Path.Combine(Variables.sys32Folder, "twinuifonts.dll")); - SafeFileDeletion(Path.Combine(Variables.sysWOWFolder,"iconres.dll")); + SafeFileDeletion(Path.Combine(Variables.sysWOWFolder, "iconres.dll")); SafeFileDeletion(Path.Combine(Variables.sysWOWFolder, "duires.dll")); SafeFileDeletion(Path.Combine(Variables.sysWOWFolder, "ImmersiveFontHandler.dll")); SafeFileDeletion(Path.Combine(Variables.sysWOWFolder, "twinuifonts.dll")); diff --git a/Rectify11Installer/Controls/TabControlWithoutHeader.Designer.cs b/Rectify11Installer/Controls/TabControlWithoutHeader.Designer.cs deleted file mode 100644 index ed21e83d3..000000000 --- a/Rectify11Installer/Controls/TabControlWithoutHeader.Designer.cs +++ /dev/null @@ -1,36 +0,0 @@ -namespace Rectify11Installer.Controls -{ - partial class TabControlWithoutHeader - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - components = new System.ComponentModel.Container(); - } - - #endregion - } -} diff --git a/Rectify11Installer/Controls/TabControlWithoutHeader.cs b/Rectify11Installer/Controls/TabControlWithoutHeader.cs deleted file mode 100644 index 1a8963a3c..000000000 --- a/Rectify11Installer/Controls/TabControlWithoutHeader.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Windows.Forms; - -namespace Rectify11Installer.Controls -{ - public partial class TabControlWithoutHeader : TabControl - { - public TabControlWithoutHeader() - { - if (!this.DesignMode) this.Multiline = true; - } - - //protected override void WndProc(ref Message m) - //{ - // if (m.Msg == 0x1328 && !this.DesignMode) - // m.Result = new IntPtr(1); - // else - // base.WndProc(ref m); - //} - } -} diff --git a/RectifyControlPanel2 b/RectifyControlPanel2 index 8dbdd0ca4..0007d9b37 160000 --- a/RectifyControlPanel2 +++ b/RectifyControlPanel2 @@ -1 +1 @@ -Subproject commit 8dbdd0ca43f97067b5514000f0e6abd8dfd1303e +Subproject commit 0007d9b37f0c529fb86428de30c5d528d8ff9b29