Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
fix OneDriveSetup path resolution & argument trimming
Greedeks1e98b25effd7
diff --git a/.Source/GTweak/Modules/Common/PathTargets.cs b/.Source/GTweak/Modules/Common/PathTargets.csindex d9d7c835..6f0f6de9 100644--- a/.Source/GTweak/Modules/Common/PathTargets.cs+++ b/.Source/GTweak/Modules/Common/PathTargets.cs@@ -16,6 +16,7 @@ namespace GTweak.Modules.Commoninternal static readonly (string Key, string Value)[] OneDriveSetupKeys ={(@"HKEY_CURRENT_USER\Software\Microsoft\OneDrive", "OneDriveTrigger"),+ (@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OneDriveSetup.exe", "UninstallString"),(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OneDriveSetup.exe", "UninstallString"),(@"HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\OneDriveSetup.exe", "UninstallString"),};@@ -299,6 +300,28 @@ namespace GTweak.Modules.Commonreturn string.Empty;}+ private static string ExtractExecutablePath(string raw)+ {+ raw = raw.Trim();++ if (raw.StartsWith("\""))+ {+ int nextQuote = raw.IndexOf('"', 1);+ if (nextQuote > 0)+ {+ return raw.Substring(1, nextQuote - 1);+ }+ }++ int exeIndex = raw.IndexOf(".exe", StringComparison.OrdinalIgnoreCase);+ if (exeIndex >= 0)+ {+ return raw.Substring(0, exeIndex + 4).Trim('"');+ }++ return null;+ }+internal static readonly string CommandShell = FindExecutablePath("cmd.exe");internal static readonly string PowerShell = FindExecutablePath("pwsh.exe", "powershell.exe");@@ -315,13 +338,27 @@ namespace GTweak.Modules.Common{foreach (var (key, value) in Registry.OneDriveSetupKeys){- string path = RegistryHelper.GetValue<string>(key, value, null);+ string rawValue = RegistryHelper.GetValue<string>(key, value, null);+ if (string.IsNullOrWhiteSpace(rawValue))+ {+ continue;+ }++ string path = ExtractExecutablePath(rawValue);if (string.IsNullOrEmpty(path)){continue;}- path = value == "OneDriveTrigger" ? Path.Combine(Path.GetDirectoryName(path), "OneDriveSetup.exe") : path.Split(new[] { " /" }, StringSplitOptions.None)[0].Trim('"');+ if (value == "OneDriveTrigger")+ {+ string dir = Path.GetDirectoryName(path);+ if (string.IsNullOrEmpty(dir))+ {+ continue;+ }+ path = Path.Combine(dir, "OneDriveSetup.exe");+ }if (File.Exists(path)){@@ -383,6 +420,7 @@ namespace GTweak.Modules.CommonPath.Combine(Folders.OneDrive, "Update", "OneDrive.exe"),Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Microsoft OneDrive", "OneDrive.exe"),Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "Microsoft OneDrive", "OneDrive.exe"),+ Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft", "OneDrive", "OneDrive.exe"),};internal static readonly string DisablingWD = Path.Combine(Folders.DefenderBackup, "DisablingWD.exe");diff --git a/.Source/GTweak/Modules/Tweaks/AppxPackageHandler.cs b/.Source/GTweak/Modules/Tweaks/AppxPackageHandler.csindex f3e0b18a..e1120b68 100644--- a/.Source/GTweak/Modules/Tweaks/AppxPackageHandler.cs+++ b/.Source/GTweak/Modules/Tweaks/AppxPackageHandler.cs@@ -183,6 +183,7 @@ namespace GTweak.Modules.Tweaks{RegistryHelper.DeleteFolderTree(Registry.ClassesRoot, @"CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}");RegistryHelper.DeleteFolderTree(Registry.ClassesRoot, @"Wow6432Node\CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}");+ RegistryHelper.DeleteFolderTree(Registry.CurrentUser, @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OneDriveSetup.exe");SetTaskState(false, oneDriveTask);