use privexec instead of advancedrun

Rectify11 · Oct 8, 2023 · c61d093 · c61d093
1 parent 3bec8ed
commit c61d093
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 351 deletions.
diff --git a/Rectify11.Phase2/Program.cs b/Rectify11.Phase2/Program.cs
@@ -41,7 +41,6 @@ private static void Main(string[] args)
                     {
                         x86Files = (string[])r11Reg.GetValue("x86PendingFiles");
                     }
-
                 }
 
                 // copy necessary files
@@ -302,7 +301,6 @@ private static void Main(string[] args)
                         {
                             for (int j = 0; j < dirsi.Length; j++)
                             {
-                                Console.WriteLine("j=" + dirsi[j]);
                                 if (Directory.GetFiles(dirsi[j]).Length == 0)
                                 {
                                     Directory.Delete(dirsi[j], true);
@@ -345,9 +343,8 @@ private static void InstallFonts()
                 if (!File.Exists(MarlettBackupDest))
                 {
                     File.Move(MarlettDest, MarlettBackupDest);
-                    File.Copy(marlett, MarlettDest);
                 }
-                else SafeFileCopy(marlett, MarlettDest);
+                SafeFileCopy(marlett, MarlettDest);
 
                 var BackIconsDest = Path.Combine(Variables.windir, "Fonts", "BackIcons.ttf");
                 var backicons = Path.Combine(Variables.r11Files, "BackIcons.ttf");

diff --git a/Rectify11Installer/Core/Backend/Common.cs b/Rectify11Installer/Core/Backend/Common.cs
@@ -22,7 +22,7 @@ public static bool WriteFiles(bool icons, bool themes)
             {
                 if (icons)
                 {
-                    if (!Helper.SafeFileOperation(Path.Combine(Variables.r11Folder, "aRun.exe"), Properties.Resources.AdvancedRun, Helper.OperationType.Write))
+                    if (!Helper.SafeFileOperation(Path.Combine(Variables.r11Folder, "wsudo.exe"), Properties.Resources.wsudo, Helper.OperationType.Write))
                         return false;
                     if (!Helper.SafeFileOperation(Path.Combine(Variables.r11Folder, "Rectify11.Phase2.exe"), Properties.Resources.Rectify11Phase2, Helper.OperationType.Write))
                         return false;
@@ -235,9 +235,12 @@ public static bool Cleanup()
                 Helper.SafeDirectoryDeletion(Path.Combine(Variables.r11Folder, "themes"), false);
                 Helper.SafeFileDeletion(Path.Combine(Variables.r11Folder, "themes.7z"));
                 Helper.SafeFileDeletion(Path.Combine(Variables.r11Folder, "7za.exe"));
-                Helper.SafeFileDeletion(Path.Combine(Variables.r11Folder, "aRun.exe"));
+                Helper.SafeFileDeletion(Path.Combine(Variables.r11Folder, "wsudo.exe"));
                 Helper.SafeFileDeletion(Path.Combine(Variables.r11Folder, "ResourceHacker.exe"));
-                if (Directory.Exists(Path.Combine(Variables.r11Folder, "extras")))
+                Helper.SafeFileDeletion(Path.Combine(Variables.r11Folder, "ResourceHacker.ini"));
+                Helper.SafeFileDeletion(Path.Combine(Variables.r11Folder, "Rectify11.Phase2.exe"));
+
+				if (Directory.Exists(Path.Combine(Variables.r11Folder, "extras")))
                 {
                     if (Directory.GetDirectories(Path.Combine(Variables.r11Folder, "extras")).Length == 0)
                     {

diff --git a/Rectify11Installer/Core/Backend/Extras.cs b/Rectify11Installer/Core/Backend/Extras.cs
@@ -227,11 +227,11 @@ private static bool InstallShell()
                     Arguments = " -r"
                 };
                 int num = InstallOptions.CMenuStyle;
-                string text = (string)Properties.Resources.ResourceManager.GetObject("config" + num);
-                File.WriteAllText(Path.Combine(Variables.Windir, "nilesoft", "shell.nss"), text);
                 if (num == 1 || num == 2)
                 {
-                    var shlInstproc2 = Process.Start(shlinfo2);
+					string text = (string)Properties.Resources.ResourceManager.GetObject("config" + num);
+					File.WriteAllText(Path.Combine(Variables.Windir, "nilesoft", "shell.nss"), text);
+					var shlInstproc2 = Process.Start(shlinfo2);
                     shlInstproc2.WaitForExit();
                 }
                 if (num == 3 || num == 4)

diff --git a/Rectify11Installer/Core/Backend/Icons.cs b/Rectify11Installer/Core/Backend/Icons.cs
@@ -131,8 +131,7 @@ public static bool Uninstall()
         {
             try
             {
-                Helper.SafeFileOperation(Path.Combine(Variables.r11Folder, "Rectify11.Phase2.exe"), Properties.Resources.Rectify11Phase2, Helper.OperationType.Write);
-                Helper.SafeFileOperation(Path.Combine(Variables.r11Folder, "aRun.exe"), Properties.Resources.AdvancedRun, Helper.OperationType.Write);
+                Common.WriteFiles(true, false);
                 Registry.LocalMachine.OpenSubKey(@"SOFTWARE", true)
                     ?.CreateSubKey("Rectify11", true)
                     ?.SetValue("UninstallFiles", UninstallOptions.uninstIconsList.ToArray());
@@ -144,7 +143,7 @@ public static bool Uninstall()
                 }
 
                 Helper.SafeFileDeletion(Path.Combine(Variables.r11Folder, "Rectify11.Phase2.exe"));
-                Helper.SafeFileDeletion(Path.Combine(Variables.r11Folder, "aRun.exe"));
+                Helper.SafeFileDeletion(Path.Combine(Variables.r11Folder, "wsudo.exe"));
 
                 Logger.WriteLine("Icons.Uninstall() succeeded.");
                 Logger.WriteLine("══════════════════════════════════════════════");

diff --git a/Rectify11Installer/Core/Backend/Themes.cs b/Rectify11Installer/Core/Backend/Themes.cs
@@ -424,7 +424,6 @@ private static bool InstallMsstyles()
 				File.Copy(themefiles[i].FullName, Path.Combine(Variables.Windir, "Resources", "Themes", themefiles[i].Name), true);
 			}
 
-			File.WriteAllBytes(Path.Combine(Variables.r11Folder, "aRun1.exe"), Properties.Resources.AdvancedRun);
 			for (var i = 0; i < msstyleDirList.Length; i++)
 			{
 				try
@@ -438,7 +437,6 @@ private static bool InstallMsstyles()
 					return false;
 				}
 			}
-			File.Delete(Path.Combine(Variables.r11Folder, "aRun1.exe"));
 			return true;
 		}
 		private static bool UninstallMfe()

diff --git a/Rectify11Installer/Core/Helpers.cs b/Rectify11Installer/Core/Helpers.cs
@@ -357,10 +357,9 @@ public static bool SafeDirectoryDeletion(string path, bool ischild)
         }
         public static void RunAsTI(string file,string param)
         {
-            Interaction.Shell(Path.Combine(Variables.r11Folder, "aRun.exe")
-                    + " /EXEFilename " + '"' + file + '"'
-                    + " /CommandLine " + "\'" + param + "\'"
-                    + " /WaitProcess 1 /RunAs 8 /Run", AppWinStyle.NormalFocus, true);
+            Interaction.Shell(Path.Combine(Variables.r11Folder, "wsudo.exe")
+                    + " -T " + file
+                    + " " + param, AppWinStyle.NormalFocus, true);
         }
         #endregion
         #region Private Methods

diff --git a/Rectify11Installer/Properties/Resources.Designer.cs b/Rectify11Installer/Properties/Resources.Designer.cs