Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
-improvements in reading the ini file -refactoring
Greedeks90078a9f11ae
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csprojindex a10c5187..9430689e 100644--- a/.Source/GTweak/GTweak.csproj+++ b/.Source/GTweak/GTweak.csproj@@ -247,11 +247,11 @@<Compile Include="Utilities\DisablingWinKeys.cs" /><Compile Include="Utilities\Helpers\RegistryHelp.cs" /><Compile Include="Utilities\Settings.cs" />- <Compile Include="Utilities\TakingOwnership.cs" />+ <Compile Include="Utilities\Helpers\TakingOwnership.cs" /><Compile Include="Utilities\Tweaks\ClearingMemory.cs" />- <Compile Include="Utilities\СonfigSettings.cs" />+ <Compile Include="Utilities\Helpers\INIManager.cs" /><Compile Include="Utilities\ViewNotification.cs" />- <Compile Include="Utilities\TrustedInstaller.cs" />+ <Compile Include="Utilities\Helpers\TrustedInstaller.cs" /><Compile Include="Utilities\Tweaks\ConfidentialityTweaks.cs" /><Compile Include="Utilities\Tweaks\Firewall.cs" /><Compile Include="Utilities\Tweaks\InterfaceTweaks.cs" />diff --git "a/.Source/GTweak/Utilities/\320\241onfigSettings.cs" b/.Source/GTweak/Utilities/Helpers/INIManager.cssimilarity index 53%rename from ".Source/GTweak/Utilities/\320\241onfigSettings.cs"rename to .Source/GTweak/Utilities/Helpers/INIManager.csindex cebbc723..cbb0aaa1 100644--- "a/.Source/GTweak/Utilities/\320\241onfigSettings.cs"+++ b/.Source/GTweak/Utilities/Helpers/INIManager.cs@@ -1,11 +1,12 @@-using System.Collections.Generic;+using System;+using System.Collections.Generic;using System.IO;using System.Runtime.InteropServices;using System.Text;-namespace GTweak.Utilities+namespace GTweak.Utilities.Helpers{- internal sealed class СonfigSettings+ internal sealed class INIManager{[DllImport("kernel32")]private static extern long WritePrivateProfileString(string section, string key, string value, string filePath);@@ -20,7 +21,7 @@ namespace GTweak.UtilitiesconfigServices = new Dictionary<string, string>(),configSystem = new Dictionary<string, string>();- internal СonfigSettings(string iniPath) => pathToConfig = new FileInfo(iniPath).FullName.ToString();+ internal INIManager(string iniPath) => pathToConfig = new FileInfo(iniPath).FullName.ToString();internal string ReadConfig(string section, string key){@@ -37,5 +38,36 @@ namespace GTweak.Utilities}internal void WriteConfig(string section, string key, string value) => WritePrivateProfileString(section, key, value, pathToConfig);+++ [DllImport("kernel32.dll")]+ private static extern int GetPrivateProfileSection(string section, byte[] lpszReturnBuffer, int size, string filePath);+ internal List<string> GetKeys(string section)+ {+ byte[] buffer = new byte[2048];+ GetPrivateProfileSection(section, buffer, 2048, pathToConfig);+ string[] tmp = Encoding.ASCII.GetString(buffer).Trim('\0').Split('\0');++ List<string> result = new List<string>();++ foreach (string entry in tmp)+ result.Add(entry.Remove(0, entry.IndexOf("=", StringComparison.InvariantCulture)).Substring(1));++ return result;+ }++ internal List<string> GetSection(string section)+ {+ byte[] buffer = new byte[2048];+ GetPrivateProfileSection(section, buffer, 2048, pathToConfig);+ string[] temp = Encoding.ASCII.GetString(buffer).Trim('\0').Split('\0');++ List<string> result = new List<string>();++ foreach (string entry in temp)+ result.Add(entry.Substring(0, entry.IndexOf("=")));++ return result;+ }}}diff --git a/.Source/GTweak/Utilities/TakingOwnership.cs b/.Source/GTweak/Utilities/Helpers/TakingOwnership.cssimilarity index 99%rename from .Source/GTweak/Utilities/TakingOwnership.csrename to .Source/GTweak/Utilities/Helpers/TakingOwnership.csindex 1a6e2594..1c80705a 100644--- a/.Source/GTweak/Utilities/TakingOwnership.cs+++ b/.Source/GTweak/Utilities/Helpers/TakingOwnership.cs@@ -1,7 +1,7 @@using System;using System.Runtime.InteropServices;-namespace GTweak.Utilities+namespace GTweak.Utilities.Helpers{internal class TakingOwnership{diff --git a/.Source/GTweak/Utilities/TrustedInstaller.cs b/.Source/GTweak/Utilities/Helpers/TrustedInstaller.cssimilarity index 99%rename from .Source/GTweak/Utilities/TrustedInstaller.csrename to .Source/GTweak/Utilities/Helpers/TrustedInstaller.csindex f56fa3ab..7c89daff 100644--- a/.Source/GTweak/Utilities/TrustedInstaller.cs+++ b/.Source/GTweak/Utilities/Helpers/TrustedInstaller.cs@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;using System.Security.Principal;using System.ServiceProcess;-namespace GTweak.Utilities+namespace GTweak.Utilities.Helpers{internal sealed class TrustedInstaller{diff --git a/.Source/GTweak/Utilities/Settings.cs b/.Source/GTweak/Utilities/Settings.csindex 4da1d90a..6bf1be10 100644--- a/.Source/GTweak/Utilities/Settings.cs+++ b/.Source/GTweak/Utilities/Settings.cs@@ -111,8 +111,8 @@ namespace GTweak.Utilitiesinternal static void SaveFileConfig(){- if (СonfigSettings.configConfidentiality.Count == 0 && СonfigSettings.configInterface.Count == 0- && СonfigSettings.configServices.Count == 0 && СonfigSettings.configSystem.Count == 0)+ if (INIManager.configConfidentiality.Count == 0 && INIManager.configInterface.Count == 0+ && INIManager.configServices.Count == 0 && INIManager.configSystem.Count == 0)new ViewNotification().Show("", (string)Application.Current.Resources["title1_notification"], (string)Application.Current.Resources["export_warning_notification"]);else@@ -138,20 +138,20 @@ namespace GTweak.Utilitiesif (File.Exists(PathConfig))File.Delete(PathConfig);- СonfigSettings settingsFileINI = new СonfigSettings(PathConfig);+ INIManager settingsFileINI = new INIManager(PathConfig);settingsFileINI.WriteConfig("GTweak", "Author", "Greedeks");settingsFileINI.WriteConfig("GTweak", "Release", "v4");- foreach (KeyValuePair<string, string> addConfidentiality in СonfigSettings.configConfidentiality)+ foreach (KeyValuePair<string, string> addConfidentiality in INIManager.configConfidentiality)settingsFileINI.WriteConfig("Confidentiality Tweaks", addConfidentiality.Key, addConfidentiality.Value);- foreach (KeyValuePair<string, string> addInterface in СonfigSettings.configInterface)+ foreach (KeyValuePair<string, string> addInterface in INIManager.configInterface)settingsFileINI.WriteConfig("Interface Tweaks", addInterface.Key, addInterface.Value);- foreach (KeyValuePair<string, string> addServices in СonfigSettings.configServices)+ foreach (KeyValuePair<string, string> addServices in INIManager.configServices)settingsFileINI.WriteConfig("Services Tweaks", addServices.Key, addServices.Value);- foreach (KeyValuePair<string, string> addSystem in СonfigSettings.configSystem)+ foreach (KeyValuePair<string, string> addSystem in INIManager.configSystem)settingsFileINI.WriteConfig("System Tweaks", addSystem.Key, addSystem.Value);}catch (Exception ex) { Debug.WriteLine(ex.Message.ToString()); }@@ -170,7 +170,7 @@ namespace GTweak.Utilitiesif (isResult == true){PathConfig = openFileDialog.FileName;- СonfigSettings settingsFileINI = new СonfigSettings(PathConfig);+ INIManager settingsFileINI = new INIManager(PathConfig);if (settingsFileINI.ReadConfig("GTweak", "Author").Contains("Greedeks") && settingsFileINI.ReadConfig("GTweak", "Release").Contains("v4")){diff --git a/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs b/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.csindex b34b81d4..ac38a09d 100644--- a/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs+++ b/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs@@ -255,8 +255,8 @@ namespace GTweak.Utilities.Tweaksinternal static void UseСonfidentiality(string tweak, bool isChoose){- СonfigSettings.configConfidentiality.Remove(tweak);- СonfigSettings.configConfidentiality.Add(tweak, Convert.ToString(isChoose));+ INIManager.configConfidentiality.Remove(tweak);+ INIManager.configConfidentiality.Add(tweak, Convert.ToString(isChoose));switch (tweak){diff --git a/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs b/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.csindex 674fec6b..6f7c816c 100644--- a/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs+++ b/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs@@ -1,8 +1,6 @@-using GTweak.Core.ViewModel;-using GTweak.Utilities.Helpers;+using GTweak.Utilities.Helpers;using GTweak.View;using Microsoft.Win32;-using Newtonsoft.Json.Linq;using System;using System.Diagnostics;using System.IO;@@ -362,8 +360,8 @@ namespace GTweak.Utilities.Tweaksinternal static void UseInterface(string tweak, bool isChoose){- СonfigSettings.configInterface.Remove(tweak);- СonfigSettings.configInterface.Add(tweak, Convert.ToString(isChoose));+ INIManager.configInterface.Remove(tweak);+ INIManager.configInterface.Add(tweak, Convert.ToString(isChoose));switch (tweak){diff --git a/.Source/GTweak/Utilities/Tweaks/ServicesTweaks.cs b/.Source/GTweak/Utilities/Tweaks/ServicesTweaks.csindex 83da4055..6c3ea8eb 100644--- a/.Source/GTweak/Utilities/Tweaks/ServicesTweaks.cs+++ b/.Source/GTweak/Utilities/Tweaks/ServicesTweaks.cs@@ -364,8 +364,8 @@ namespace GTweak.Utilities.Tweaksinternal static void UseServices(string tweak, bool isChoose){- СonfigSettings.configServices.Remove(tweak);- СonfigSettings.configServices.Add(tweak, Convert.ToString(isChoose));+ INIManager.configServices.Remove(tweak);+ INIManager.configServices.Add(tweak, Convert.ToString(isChoose));switch (tweak){diff --git a/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs b/.Source/GTweak/Utilities/Tweaks/SystemTweaks.csindex b98878af..dc95e156 100644--- a/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs+++ b/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs@@ -342,8 +342,8 @@ namespace GTweak.Utilities.Tweaksprivate static extern bool SystemParametersInfo(uint _uiAction, uint _uiParam, uint[] _pvParam, uint _fWinIni);internal static void UseSystem(string tweak, bool isChoose){- СonfigSettings.configSystem.Remove(tweak);- СonfigSettings.configSystem.Add(tweak, Convert.ToString(isChoose));+ INIManager.configSystem.Remove(tweak);+ INIManager.configSystem.Add(tweak, Convert.ToString(isChoose));switch (tweak){diff --git a/.Source/GTweak/View/SystemView.xaml.cs b/.Source/GTweak/View/SystemView.xaml.csindex f50eedcd..6071661d 100644--- a/.Source/GTweak/View/SystemView.xaml.cs+++ b/.Source/GTweak/View/SystemView.xaml.cs@@ -52,8 +52,8 @@ namespace GTweak.Viewprivate void Sliders_PreviewMouseUp(object sender, MouseButtonEventArgs e){Slider slider = (Slider)sender;- СonfigSettings.configSystem.Remove(slider.Name);- СonfigSettings.configSystem.Add(slider.Name, Convert.ToString(slider.Value));+ INIManager.configSystem.Remove(slider.Name);+ INIManager.configSystem.Add(slider.Name, Convert.ToString(slider.Value));}private void Sliders_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)@@ -94,8 +94,8 @@ namespace GTweak.Viewif (!SystemTweaks.isTweakWorkingAntivirus){SystemTweaks.isTweakWorkingAntivirus = true;- СonfigSettings.configSystem.Remove(toggleButton.Name);- СonfigSettings.configSystem.Add(toggleButton.Name, Convert.ToString(toggleButton.State));+ INIManager.configSystem.Remove(toggleButton.Name);+ INIManager.configSystem.Add(toggleButton.Name, Convert.ToString(toggleButton.State));SystemTweaks.UseSystem(toggleButton.Name, toggleButton.State);new ViewNotification().Show("", (string)FindResource("title1_notification"), (string)FindResource("windefender_notification"));}diff --git a/.Source/GTweak/Windows/ImportWindow.xaml.cs b/.Source/GTweak/Windows/ImportWindow.xaml.csindex aaef97a5..5f970592 100644--- a/.Source/GTweak/Windows/ImportWindow.xaml.cs+++ b/.Source/GTweak/Windows/ImportWindow.xaml.cs@@ -1,6 +1,9 @@using GTweak.Utilities;+using GTweak.Utilities.Helpers;using GTweak.Utilities.Tweaks;using System;+using System.Collections.Generic;+using System.Linq;using System.Threading;using System.Threading.Tasks;using System.Windows;@@ -45,131 +48,135 @@ namespace GTweak.Windowsprivate async Task SortByPageDate(CancellationToken _token, IProgress<int> _progress){+ List<string> tempSection = new List<string>(), tempKeys = new List<string>();++ INIManager iniManager = new INIManager(Settings.PathConfig);+for (int i = 1; i <= 100; i++){_token.ThrowIfCancellationRequested();- СonfigSettings configSettings = new СonfigSettings(Settings.PathConfig);- if (i == 2 & configSettings.IsThereSection("Confidentiality Tweaks"))+ if (i == 2 & iniManager.IsThereSection("Confidentiality Tweaks")){- for (byte number = 1; number <= 18; number++)+ tempSection.Clear(); tempKeys.Clear();++ tempSection = iniManager.GetSection("Confidentiality Tweaks");+ tempKeys = iniManager.GetKeys("Confidentiality Tweaks");++ var acceptanceList = tempSection.Zip(tempKeys, (t, v) => new { Tweak = t, Value = v });++ foreach (var set in acceptanceList){- string value = configSettings.ReadConfig("Confidentiality Tweaks", "TglButton" + number);- if (!string.IsNullOrEmpty(value))+ await Task.Delay(700);+ Parallel.Invoke(() => ConfidentialityTweaks.UseСonfidentiality(set.Tweak, Convert.ToBoolean(set.Value)));++ switch (set.Tweak){- await Task.Delay(700);- Parallel.Invoke(() => ConfidentialityTweaks.UseСonfidentiality("TglButton" + number, Convert.ToBoolean(value)));- switch (number)- {- case 8:- case 15:- isRestartNeed = true;- break;- }+ case "TglButton8":+ case "TglButton15":+ isRestartNeed = true;+ break;}}}- if (i == 30 & configSettings.IsThereSection("Interface Tweaks"))+ if (i == 30 & iniManager.IsThereSection("Interface Tweaks")){- for (byte number = 1; number <= 28; number++)+ tempSection.Clear(); tempKeys.Clear();++ tempSection = iniManager.GetSection("Interface Tweaks");+ tempKeys = iniManager.GetKeys("Interface Tweaks");++ var acceptanceList = tempSection.Zip(tempKeys, (t, v) => new { Tweak = t, Value = v });++ foreach (var set in acceptanceList){- string value = configSettings.ReadConfig("Interface Tweaks", "TglButton" + number);- if (!string.IsNullOrEmpty(value))- {- await Task.Delay(700);- Parallel.Invoke(() => InterfaceTweaks.UseInterface("TglButton" + number, Convert.ToBoolean(value)));+ await Task.Delay(700);+ Parallel.Invoke(() => InterfaceTweaks.UseInterface(set.Tweak, Convert.ToBoolean(set.Value)));- switch (number)- {- case 1:- case 2:- case 3:- case 4:- case 5:- case 10:- case 11:- case 12:- case 26:- case 27:- isLogoutNeed = true;- break;- case 22:- isRestartNeed = true;- break;- }+ switch (set.Tweak)+ {+ case "TglButton1":+ case "TglButton2":+ case "TglButton3":+ case "TglButton4":+ case "TglButton5":+ case "TglButton10":+ case "TglButton11":+ case "TglButton12":+ case "TglButton26":+ case "TglButton27":+ isLogoutNeed = true;+ break;+ case "TglButton22":+ isRestartNeed = true;+ break;}}}- if (i == 50 & configSettings.IsThereSection("Services Tweaks"))+ if (i == 50 & iniManager.IsThereSection("Services Tweaks")){- for (byte number = 1; number <= 28; number++)+ tempSection.Clear(); tempKeys.Clear();++ tempSection = iniManager.GetSection("Services Tweaks");+ tempKeys = iniManager.GetKeys("Services Tweaks");++ var acceptanceList = tempSection.Zip(tempKeys, (t, v) => new { Tweak = t, Value = v });++ foreach (var set in acceptanceList){- string value = configSettings.ReadConfig("Services Tweaks", "TglButton" + number);- if (!string.IsNullOrEmpty(value))- {- await Task.Delay(700);- Parallel.Invoke(() => ServicesTweaks.UseServices("TglButton" + number, Convert.ToBoolean(value)));- isRestartNeed = true;- }+ await Task.Delay(700);+ Parallel.Invoke(() => ServicesTweaks.UseServices(set.Tweak, Convert.ToBoolean(set.Value)));+ isRestartNeed = true;}}- if (i == 80 & configSettings.IsThereSection("System Tweaks"))+ if (i == 80 & iniManager.IsThereSection("System Tweaks")){- for (byte number = 1; number <= 3; number++)- {- string value = configSettings.ReadConfig("System Tweaks", "Slider" + number);+ tempSection.Clear(); tempKeys.Clear();- if (!string.IsNullOrEmpty(value))- {- await Task.Delay(700);- SystemTweaks.UseSystemSliders("Slider" + number, Convert.ToUInt32(value));- }+ tempSection = iniManager.GetSection("System Tweaks");+ tempKeys = iniManager.GetKeys("System Tweaks");- }- for (byte number = 1; number <= 23; number++)+ var acceptanceList = tempSection.Zip(tempKeys, (t, v) => new { Tweak = t, Value = v });++ foreach (var set in acceptanceList){- string value = configSettings.ReadConfig("System Tweaks", "TglButton" + number);+ await Task.Delay(700);- if (!string.IsNullOrEmpty(value))+ if (set.Tweak != "TglButton8"){- await Task.Delay(700);+ if (set.Tweak.Contains("TglButton"))+ Parallel.Invoke(() => SystemTweaks.UseSystem(set.Tweak, Convert.ToBoolean(set.Value)));+ else+ SystemTweaks.UseSystemSliders(set.Tweak, Convert.ToUInt32(set.Value));- if ("TglButton" + number != "TglButton8")+ switch (set.Tweak){- Parallel.Invoke(() => SystemTweaks.UseSystem("TglButton" + number, Convert.ToBoolean(value)));- new ViewNotification().Show("restart");-- switch (number)- {- case 7:- case 8:- case 9:- case 10:- case 12:- case 13:- case 14:- case 15:- case 20:- isRestartNeed = true;- break;- case 2:- isLogoutNeed = true;- break;- }+ case "TglButton7":+ case "TglButton9":+ case "TglButton10":+ case "TglButton12":+ case "TglButton13":+ case "TglButton14":+ case "TglButton15":+ case "TglButton20":+ isRestartNeed = true;+ break;+ case "TglButton2":+ isLogoutNeed = true;+ break;}- else+ }+ else+ {+ if (!SystemTweaks.isTweakWorkingAntivirus){- if (!SystemTweaks.isTweakWorkingAntivirus)- {- SystemTweaks.isTweakWorkingAntivirus = true;- SystemTweaks.UseSystem("TglButton" + number, Convert.ToBoolean(value));- await Task.Delay(20000);- }+ SystemTweaks.isTweakWorkingAntivirus = true;+ SystemTweaks.UseSystem(set.Tweak, Convert.ToBoolean(set.Value));+ await Task.Delay(20000);}-}}}diff --git a/.Source/GTweak/Windows/NotificationWindow.xaml.cs b/.Source/GTweak/Windows/NotificationWindow.xaml.csindex 55b15bbb..c086929d 100644--- a/.Source/GTweak/Windows/NotificationWindow.xaml.cs+++ b/.Source/GTweak/Windows/NotificationWindow.xaml.cs@@ -2,7 +2,6 @@using System;using System.ComponentModel;using System.Diagnostics;-using System.Threading.Tasks;using System.Windows;using System.Windows.Controls;using System.Windows.Input;