Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
fix empty values for HardwareData (using temporary storage). сompliance with naming conventions for fields with the private modifier.
Greedeks15ad044cb001
diff --git a/.Source/GTweak/Core/RelayCommand.cs b/.Source/GTweak/Core/RelayCommand.csindex 35fd2ad6..9af60e2c 100644--- a/.Source/GTweak/Core/RelayCommand.cs+++ b/.Source/GTweak/Core/RelayCommand.cs@@ -5,8 +5,8 @@ namespace GTweak.Core{internal class RelayCommand : ICommand{- private readonly Action<object> execute;- private readonly Func<object, bool> canExecute;+ private readonly Action<object> _execute;+ private readonly Func<object, bool> _canExecute;public event EventHandler CanExecuteChanged{@@ -15,10 +15,10 @@ namespace GTweak.Core}public RelayCommand(Action<object> _execute, Func<object, bool> _canExecute = null){- execute = _execute;- canExecute = _canExecute;+ this._execute = _execute;+ this._canExecute = _canExecute;}- public bool CanExecute(object parameter) => canExecute == null || canExecute(parameter);- public void Execute(object parameter) => execute(parameter);+ public bool CanExecute(object parameter) => _canExecute == null || _canExecute(parameter);+ public void Execute(object parameter) => _execute(parameter);}}diff --git a/.Source/GTweak/Core/ViewModel/DataSystemVM.cs b/.Source/GTweak/Core/ViewModel/DataSystemVM.csindex 7ac2d8ba..ab3dffd0 100644--- a/.Source/GTweak/Core/ViewModel/DataSystemVM.cs+++ b/.Source/GTweak/Core/ViewModel/DataSystemVM.cs@@ -9,27 +9,27 @@ namespace GTweak.Core.ViewModel{internal class DataSystemVM : ViewModelBase{- private readonly DataSystemModel model;- private ObservableCollection<DataSystemModel> collection;+ private readonly DataSystemModel _model;+ private ObservableCollection<DataSystemModel> _collection;public ObservableCollection<DataSystemModel> DisplayData{- get => collection;- set { collection = value; OnPropertyChanged(); }+ get => _collection;+ set { _collection = value; OnPropertyChanged(); }}public DataSystemModel this[string name] => DisplayData.FirstOrDefault(d => d.Name == name);public int SetBlurValue{- get => model.BlurValue;- set { model.BlurValue = value; OnPropertyChanged(); }+ get => _model.BlurValue;+ set { _model.BlurValue = value; OnPropertyChanged(); }}public Visibility SetVisibility{- get => model.IpVisibility;- set { model.IpVisibility = value; OnPropertyChanged(); }+ get => _model.IpVisibility;+ set { _model.IpVisibility = value; OnPropertyChanged(); }}public bool StateButton@@ -40,7 +40,7 @@ namespace GTweak.Core.ViewModelpublic DataSystemVM(){- model = new DataSystemModel();+ _model = new DataSystemModel();DisplayData = new ObservableCollection<DataSystemModel>{diff --git a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.csindex c2e77007..6dbc28f2 100644--- a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs+++ b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs@@ -49,14 +49,16 @@ namespace GTweak.Utilities.Configurationinternal static bool IsNeedUpdate { get; private set; } = false;internal static string DownloadVersion { get; private set; } = string.Empty;- internal static string WindowsClientVersion { get; set; } = string.Empty;+ internal static string WindowsClientVersion { get; set; } = Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion", "ProductName", string.Empty)?.ToString() ?? string.Empty;internal static string WindowsBuildVersion { get; set; } = string.Empty;internal static Dictionary<byte, bool> IsWindowsVersion = default;- internal static readonly Dictionary<string, string> HardwareData = new Dictionary<string, string>()+ private static (string Storage, string Audio, string NetAdapter) _tempData = (Storage: string.Empty, Audio: string.Empty, NetAdapter: string.Empty);++ internal static Dictionary<string, string> HardwareData = new Dictionary<string, string>(){- { "Windows", Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion", "ProductName", string.Empty)?.ToString() ?? string.Empty },+ { "Windows", WindowsClientVersion },{ "BIOS", string.Empty },{ "Mode", string.Empty },@@ -114,6 +116,10 @@ namespace GTweak.Utilities.ConfigurationGetAudioDevices,GetNetworkAdapters);++ HardwareData["Storage"] = _tempData.Storage;+ HardwareData["Audio"] = _tempData.Audio;+ HardwareData["NetAdapter"] = _tempData.NetAdapter;}internal void GetOperatingSystemInfo()@@ -265,7 +271,7 @@ namespace GTweak.Utilities.Configuration/// </summary>private static void GetStorageDevices(){- HardwareData["Storage"] = string.Empty;+ _tempData.Storage = string.Empty;bool isMsftWorking = false;try@@ -293,7 +299,7 @@ namespace GTweak.Utilities.Configurationif (storageType == "(Unspecified)" && ((ushort)managementObj["BusType"]) == 7)storageType = "(Media-Type)";- HardwareData["Storage"] += $"{SizeCalculationHelper((ulong)managementObj["Size"])} [{data}] {storageType}\n";+ _tempData.Storage += $"{SizeCalculationHelper((ulong)managementObj["Size"])} [{data}] {storageType}\n";}}else@@ -314,11 +320,11 @@ namespace GTweak.Utilities.Configurationif ((storageType == "(Unspecified)" || storageType == "(HDD)") && (string.IsNullOrEmpty(interfaceType) || interfaceType.IndexOf("USB", StringComparison.OrdinalIgnoreCase) >= 0))storageType = "(Media-Type)";- HardwareData["Storage"] += $"{SizeCalculationHelper((ulong)managementObj["Size"])} [{data}] {storageType}\n";+ _tempData.Storage += $"{SizeCalculationHelper((ulong)managementObj["Size"])} [{data}] {storageType}\n";}}- HardwareData["Storage"] = HardwareData["Storage"].TrimEnd('\n');+ _tempData.Storage = _tempData.Storage.TrimEnd('\n');}/// <summary>@@ -357,7 +363,7 @@ namespace GTweak.Utilities.Configurationreturn (false, string.Empty);}- HardwareData["Audio"] = string.Empty;+ _tempData.Audio = string.Empty;using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select DeviceID, Name, Caption, Description from Win32_SoundDevice where Status = 'OK'", new EnumerationOptions { ReturnImmediately = true })){foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())@@ -365,12 +371,12 @@ namespace GTweak.Utilities.Configuration(bool isUsbDevice, string data) = IsUsbAudioDevice(managementObj["DeviceID"].ToString());if (isUsbDevice && !string.IsNullOrEmpty(data))- HardwareData["Audio"] += $"{data}\n";+ _tempData.Audio += $"{data}\n";else- HardwareData["Audio"] += $"{new[] { "Name", "Caption", "Description" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info))}\n" ?? string.Empty;+ _tempData.Audio += $"{new[] { "Name", "Caption", "Description" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info))}\n" ?? string.Empty;}}- HardwareData["Audio"] = HardwareData["Audio"].TrimEnd('\n');+ _tempData.Audio = _tempData.Audio.TrimEnd('\n');}private static string SizeCalculationHelper<T>(T sizeInBytes) where T : struct, IConvertible@@ -387,10 +393,10 @@ namespace GTweak.Utilities.Configurationprivate void GetNetworkAdapters(){- HardwareData["NetAdapter"] = string.Empty;+ _tempData.NetAdapter = string.Empty;foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name, Description, ProductName, Manufacturer from Win32_NetworkAdapter where NetConnectionStatus=2 or NetConnectionStatus=7", new EnumerationOptions { ReturnImmediately = true }).Get())- HardwareData["NetAdapter"] += $"{new[] { "Name", "Description", "ProductName", "Manufacturer" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info))}\n" ?? string.Empty;- HardwareData["NetAdapter"] = HardwareData["NetAdapter"].TrimEnd('\n');+ _tempData.NetAdapter += $"{new[] { "Name", "Description", "ProductName", "Manufacturer" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info))}\n" ?? string.Empty;+ _tempData.NetAdapter = _tempData.NetAdapter.TrimEnd('\n');}internal bool IsNetworkAvailable()diff --git a/.Source/GTweak/Utilities/Controls/BlockRunTweaker.cs b/.Source/GTweak/Utilities/Controls/BlockRunTweaker.csindex 53e4dafe..a21ab8e8 100644--- a/.Source/GTweak/Utilities/Controls/BlockRunTweaker.cs+++ b/.Source/GTweak/Utilities/Controls/BlockRunTweaker.cs@@ -16,11 +16,11 @@ namespace GTweak.Utilities.Controlsprivate static extern bool ShowWindow(IntPtr handle, int cmdShow);[DllImport("user32.dll")]private static extern int SetForegroundWindow(IntPtr handle);- private static readonly Mutex mutex = new Mutex(false, "GTweak");+ private static readonly Mutex _mutex = new Mutex(false, "GTweak");internal static void CheckingApplicationCopies(){- if (!mutex.WaitOne(150, false))+ if (!_mutex.WaitOne(150, false)){using (Mutex mutex = new Mutex(false, @"Global\" + "GTweak")){diff --git a/.Source/GTweak/Utilities/Controls/ErrorLogging.cs b/.Source/GTweak/Utilities/Controls/ErrorLogging.csindex e82b5611..2eb4409e 100644--- a/.Source/GTweak/Utilities/Controls/ErrorLogging.cs+++ b/.Source/GTweak/Utilities/Controls/ErrorLogging.cs@@ -9,7 +9,7 @@ namespace GTweak.Utilities.Controls{internal class ErrorLogging{- private static readonly string logFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "GTweak_Error.log");+ private static readonly string _logFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "GTweak_Error.log");internal static void LogWritingFile(Exception ex, [CallerMemberName] string memberName = "") => Task.Run(() => LogToFile(ex, memberName)).Wait();@@ -19,13 +19,13 @@ namespace GTweak.Utilities.Controls{try{- using var stream = new FileStream(logFilePath, FileMode.Append, FileAccess.Write, FileShare.Read);+ using var stream = new FileStream(_logFilePath, FileMode.Append, FileAccess.Write, FileShare.Read);using var writer = new StreamWriter(stream, new UTF8Encoding(false));await writer.WriteLineAsync($"[{DateTime.Now}]\nMember: {memberName}\nError: {ex.Message}\nStack Trace:\n{ex.StackTrace}\n");await writer.FlushAsync();Process.Start(new ProcessStartInfo{- FileName = logFilePath,+ FileName = _logFilePath,UseShellExecute = true});}diff --git a/.Source/GTweak/Utilities/Controls/SettingsRepository.cs b/.Source/GTweak/Utilities/Controls/SettingsRepository.csindex ad50e2f7..c4084390 100644--- a/.Source/GTweak/Utilities/Controls/SettingsRepository.cs+++ b/.Source/GTweak/Utilities/Controls/SettingsRepository.cs@@ -36,7 +36,7 @@ namespace GTweak.Utilities.Controlsinternal static readonly string currentName = AppDomain.CurrentDomain.FriendlyName;internal static readonly string currentLocation = Assembly.GetExecutingAssembly().Location;- private static readonly Dictionary<string, Action> parameterUpdates = new Dictionary<string, Action>+ private static readonly Dictionary<string, Action> _settingsRefreshActions = new Dictionary<string, Action>{{ "Notification", () => IsViewNotification = RegistryHelp.GetValue(StoragePaths.RegistryLocation, "Notification", IsViewNotification) },{ "Update", () => IsUpdateCheckRequired = RegistryHelp.GetValue(StoragePaths.RegistryLocation, "Update", IsUpdateCheckRequired) },@@ -89,7 +89,7 @@ namespace GTweak.Utilities.Controls}else{- foreach (Action executeUpdate in parameterUpdates.Values)+ foreach (Action executeUpdate in _settingsRefreshActions.Values)executeUpdate();}}@@ -97,7 +97,7 @@ namespace GTweak.Utilities.Controlsinternal static void ChangingParameters<T>(T value, string subkey){RegistryHelp.Write(Registry.CurrentUser, @"Software\GTweak", subkey, value.ToString(), RegistryValueKind.String);- parameterUpdates[subkey]();+ _settingsRefreshActions[subkey]();}internal static void SaveFileConfig()diff --git a/.Source/GTweak/Utilities/Controls/ViewNotification.cs b/.Source/GTweak/Utilities/Controls/ViewNotification.csindex b3488abe..c693225c 100644--- a/.Source/GTweak/Utilities/Controls/ViewNotification.cs+++ b/.Source/GTweak/Utilities/Controls/ViewNotification.cs@@ -6,18 +6,18 @@ namespace GTweak.Utilities.Controls{internal sealed class ViewNotification{- private static bool isAlreadyLaunch = false;- private readonly int msec = default;+ private static bool _isAlreadyLaunch = false;+ private readonly int _msec = default;- internal ViewNotification(int delay = 100) => msec = delay;+ internal ViewNotification(int delay = 100) => _msec = delay;internal async void Show(string action, string tittle = "", string content = ""){- if (SettingsRepository.IsViewNotification && !isAlreadyLaunch)+ if (SettingsRepository.IsViewNotification && !_isAlreadyLaunch){await Application.Current.Dispatcher.InvokeAsync(async delegate{- isAlreadyLaunch = true;+ _isAlreadyLaunch = true;NotificationWindow notificationWindow = new NotificationWindow{@@ -31,9 +31,9 @@ namespace GTweak.Utilities.ControlsActionNotice = action,};- await Task.Delay(msec);+ await Task.Delay(_msec);notificationWindow.Show();- notificationWindow.Closed += delegate { isAlreadyLaunch = false; };+ notificationWindow.Closed += delegate { _isAlreadyLaunch = false; };});}}diff --git a/.Source/GTweak/Utilities/Helpers/BackgroundQueue.cs b/.Source/GTweak/Utilities/Helpers/BackgroundQueue.csindex 05289a3b..5f99b396 100644--- a/.Source/GTweak/Utilities/Helpers/BackgroundQueue.cs+++ b/.Source/GTweak/Utilities/Helpers/BackgroundQueue.cs@@ -6,42 +6,42 @@ namespace GTweak.Utilities.Helpers{internal sealed class BackgroundQueue{- private Task previousTask = Task.FromResult(true);- private readonly object key = new object();+ private Task _previousTask = Task.FromResult(true);+ private readonly object _key = new object();internal Task QueueTask(Action action){- lock (key)+ lock (_key){- previousTask = previousTask.ContinueWith(t => action()+ _previousTask = _previousTask.ContinueWith(t => action(), CancellationToken.None, TaskContinuationOptions.None, TaskScheduler.Default);- return previousTask;+ return _previousTask;}}internal Task<T> QueueTask<T>(Func<T> func){- lock (key)+ lock (_key){- var task = previousTask.ContinueWith(t => func()+ var task = _previousTask.ContinueWith(t => func(), CancellationToken.None, TaskContinuationOptions.None, TaskScheduler.Default);- previousTask = task;+ _previousTask = task;return task;}}internal Task QueueCompleted(Action action){- lock (key)+ lock (_key){- previousTask = previousTask.ContinueWith(t => action(),+ _previousTask = _previousTask.ContinueWith(t => action(),CancellationToken.None,TaskContinuationOptions.None,TaskScheduler.Default);- return previousTask;+ return _previousTask;}}}diff --git a/.Source/GTweak/Utilities/Helpers/Managers/INIManager.cs b/.Source/GTweak/Utilities/Helpers/Managers/INIManager.csindex 34cd9af8..49c1ad41 100644--- a/.Source/GTweak/Utilities/Helpers/Managers/INIManager.cs+++ b/.Source/GTweak/Utilities/Helpers/Managers/INIManager.cs@@ -15,7 +15,7 @@ namespace GTweak.Utilities.Helpers.Managers[DllImport("kernel32.dll")]private static extern int GetPrivateProfileSection(string section, StringBuilder retVal, int size, string filePath);- private readonly string pathToConfig;+ private readonly string _pathToConfig;internal static Dictionary<string, string>TempTweaksConf = new Dictionary<string, string>(),@@ -30,23 +30,23 @@ namespace GTweak.Utilities.Helpers.Managersinternal const string SectionSvc = "Services Tweaks";internal const string SectionSys = "System Tweaks";- internal INIManager(string iniPath) => pathToConfig = new FileInfo(iniPath).FullName.ToString();+ internal INIManager(string iniPath) => _pathToConfig = new FileInfo(iniPath).FullName.ToString();internal string Read(string section, string key){StringBuilder retValue = new StringBuilder(255);- GetPrivateProfileString(section, key, "", retValue, 255, pathToConfig);+ GetPrivateProfileString(section, key, "", retValue, 255, _pathToConfig);return retValue.ToString();}- internal void Write(string section, string key, string value) => WritePrivateProfileString(section, key, value, pathToConfig);+ internal void Write(string section, string key, string value) => WritePrivateProfileString(section, key, value, _pathToConfig);internal void WriteAll(string section, Dictionary<string, string> selectedDictionary){if (selectedDictionary.Count == 0) return;foreach (KeyValuePair<string, string> addKeyValue in selectedDictionary)- WritePrivateProfileString(section, addKeyValue.Key, addKeyValue.Value, pathToConfig);+ WritePrivateProfileString(section, addKeyValue.Key, addKeyValue.Value, _pathToConfig);}internal static void TempWrite<T>(Dictionary<string, string> selectedDictionary, string tweak, T value)@@ -60,7 +60,7 @@ namespace GTweak.Utilities.Helpers.Managersinternal bool IsThereSection(string section){StringBuilder retValue = new StringBuilder(255);- GetPrivateProfileSection(section, retValue, 255, pathToConfig);+ GetPrivateProfileSection(section, retValue, 255, _pathToConfig);return !string.IsNullOrEmpty(retValue.ToString());}@@ -69,7 +69,7 @@ namespace GTweak.Utilities.Helpers.Managersinternal List<string> GetKeysOrValue(string section, bool isGetKey = true){byte[] buffer = new byte[2048];- GetPrivateProfileSection(section, buffer, 2048, pathToConfig);+ GetPrivateProfileSection(section, buffer, 2048, _pathToConfig);string[] temp = Encoding.ASCII.GetString(buffer).Trim('\0').Split('\0');List<string> result = new List<string>();diff --git a/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs b/.Source/GTweak/Utilities/Helpers/RegistryHelp.csindex b1574e66..9499770d 100644--- a/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs+++ b/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs@@ -64,10 +64,7 @@ namespace GTweak.Utilities.Helpers{Task.Run(delegate{- try- {- registrykey.CreateSubKey(subkey);- }+ try { registrykey.CreateSubKey(subkey); }catch (Exception ex) { ErrorLogging.LogDebug(ex); }}).Wait();}diff --git a/.Source/GTweak/Utilities/Tweaks/DefenderManager/BackupRights.cs b/.Source/GTweak/Utilities/Tweaks/DefenderManager/BackupRights.csindex b1949231..6da3a88b 100644--- a/.Source/GTweak/Utilities/Tweaks/DefenderManager/BackupRights.cs+++ b/.Source/GTweak/Utilities/Tweaks/DefenderManager/BackupRights.cs@@ -11,11 +11,11 @@ namespace GTweak.Utilities.Tweaks.DefenderManager{internal class BackupRights : TaskSchedulerManager{- private static readonly string folderBackupPath = Path.Combine(StoragePaths.SystemDisk, @"Windows\System32\Config\WDBackup_GTweak");- private static readonly string jsonFilePath = Path.Combine(folderBackupPath, "BackupData.json");- private static readonly string aclFilePath = Path.Combine(folderBackupPath, "BackupRights.acl");+ private static readonly string _folderBackupPath = Path.Combine(StoragePaths.SystemDisk, @"Windows\System32\Config\WDBackup_GTweak");+ private static readonly string _jsonFilePath = Path.Combine(_folderBackupPath, "BackupData.json");+ private static readonly string _aclFilePath = Path.Combine(_folderBackupPath, "BackupRights.acl");- private static readonly Dictionary<string, RegistryKey> StorageRegPaths = new Dictionary<string, RegistryKey>+ private static readonly Dictionary<string, RegistryKey> _storageRegPaths = new Dictionary<string, RegistryKey>{{ @"SYSTEM\CurrentControlSet\Services\WinDefend", Registry.LocalMachine },{ @"SYSTEM\CurrentControlSet\Services\SecurityHealthService", Registry.LocalMachine },@@ -51,16 +51,16 @@ namespace GTweak.Utilities.Tweaks.DefenderManagerinternal static void ExportRights(){- if (Directory.Exists(folderBackupPath) == false)+ if (Directory.Exists(_folderBackupPath) == false){try{- Directory.CreateDirectory(folderBackupPath);+ Directory.CreateDirectory(_folderBackupPath);var allValues = new Dictionary<string, Dictionary<string, object>>();var aclDataDict = new Dictionary<string, string>();- foreach (var entry in StorageRegPaths)+ foreach (var entry in _storageRegPaths){string path = entry.Key;RegistryKey baseKey = entry.Value;@@ -80,8 +80,8 @@ namespace GTweak.Utilities.Tweaks.DefenderManageraclDataDict[path] = aclData;}- File.WriteAllText(jsonFilePath, JsonConvert.SerializeObject(allValues, Formatting.Indented));- File.WriteAllText(aclFilePath, JsonConvert.SerializeObject(aclDataDict, Formatting.Indented));+ File.WriteAllText(_jsonFilePath, JsonConvert.SerializeObject(allValues, Formatting.Indented));+ File.WriteAllText(_aclFilePath, JsonConvert.SerializeObject(aclDataDict, Formatting.Indented));}catch (Exception ex) { ErrorLogging.LogDebug(ex); }}@@ -90,14 +90,14 @@ namespace GTweak.Utilities.Tweaks.DefenderManagerinternal static void ImportRights(){- if (File.Exists(jsonFilePath) && File.Exists(aclFilePath))+ if (File.Exists(_jsonFilePath) && File.Exists(_aclFilePath)){try{- var allValues = JsonConvert.DeserializeObject<Dictionary<string, Dictionary<string, object>>>(File.ReadAllText(jsonFilePath));- var aclDataDict = JsonConvert.DeserializeObject<Dictionary<string, string>>(File.ReadAllText(aclFilePath));+ var allValues = JsonConvert.DeserializeObject<Dictionary<string, Dictionary<string, object>>>(File.ReadAllText(_jsonFilePath));+ var aclDataDict = JsonConvert.DeserializeObject<Dictionary<string, string>>(File.ReadAllText(_aclFilePath));- foreach (var entry in StorageRegPaths)+ foreach (var entry in _storageRegPaths){string path = entry.Key;RegistryKey baseKey = entry.Value;diff --git a/.Source/GTweak/Utilities/Tweaks/Firewall.cs b/.Source/GTweak/Utilities/Tweaks/Firewall.csindex 61a02c08..1f4aa8bc 100644--- a/.Source/GTweak/Utilities/Tweaks/Firewall.cs+++ b/.Source/GTweak/Utilities/Tweaks/Firewall.cs@@ -11,14 +11,14 @@ namespace GTweak.Utilities.Tweaks{internal class Firewall : TaskSchedulerManager{- private static readonly SortedList<string, string> NameRules = new SortedList<string, string>+ private static readonly SortedList<string, string> _nameRules = new SortedList<string, string>{["Update"] = @"GTweak - Windows Update blocking",["Domain"] = @"GTweak - Spy domain names",["WDefender"] = @"GTweak - Windows Defender blocking"};- private static readonly SortedList<string, string> PathsForPrograms = new SortedList<string, string>+ private static readonly SortedList<string, string> _сollectExecutablePaths = new SortedList<string, string>{["MoUso"] = File.Exists($@"{StoragePaths.SystemDisk}Windows\UUS\amd64\MoUsoCoreWorker.exe")? $@"{StoragePaths.SystemDisk}Windows\UUS\amd64\MoUsoCoreWorker.exe" : $@"{StoragePaths.SystemDisk}Windows\System32\MoUsoCoreWorker.exe",@@ -44,8 +44,8 @@ namespace GTweak.Utilities.Tweaks{Parallel.ForEach(new[]{- (PathsForPrograms["MoUso"], NameRules["Update"]),- (PathsForPrograms["Uso"], $"{NameRules["Update"]} (Update Orchestrator)")+ (_сollectExecutablePaths["MoUso"], _nameRules["Update"]),+ (_сollectExecutablePaths["Uso"], $"{_nameRules["Update"]} (Update Orchestrator)")},executableFiles =>{@@ -114,21 +114,21 @@ namespace GTweak.Utilities.TweaksfirewallRule.Description = "Spy domain names";firewallRule.Enabled = true;firewallRule.InterfaceTypes = "All";- firewallRule.Name = NameRules["Domain"];+ firewallRule.Name = _nameRules["Domain"];if (isChoose){- if (CheckRulesWindows(NameRules["Domain"]))- firewallPolicy.Rules.Remove(NameRules["Domain"]);+ if (CheckRulesWindows(_nameRules["Domain"]))+ firewallPolicy.Rules.Remove(_nameRules["Domain"]);firewallPolicy.Rules.Add(firewallRule);}else- firewallPolicy.Rules.Remove(NameRules["Domain"]);+ firewallPolicy.Rules.Remove(_nameRules["Domain"]);}protected static void BlockWDefender(bool isChoose){- try { Parallel.Invoke(() => { ChangeRules(isChoose, PathsForPrograms["WD"], NameRules["WDefender"], NET_FW_RULE_DIRECTION_.NET_FW_RULE_DIR_OUT, "blocking Windows Defender database updates"); }); }+ try { Parallel.Invoke(() => { ChangeRules(isChoose, _сollectExecutablePaths["WD"], _nameRules["WDefender"], NET_FW_RULE_DIRECTION_.NET_FW_RULE_DIR_OUT, "blocking Windows Defender database updates"); }); }catch (Exception ex) { Debug.Write(ex.Message); }}}diff --git a/.Source/GTweak/Utilities/Tweaks/ServicesTweaks.cs b/.Source/GTweak/Utilities/Tweaks/ServicesTweaks.csindex 14eb2e3e..ced946b8 100644--- a/.Source/GTweak/Utilities/Tweaks/ServicesTweaks.cs+++ b/.Source/GTweak/Utilities/Tweaks/ServicesTweaks.cs@@ -16,7 +16,7 @@ namespace GTweak.Utilities.Tweaks{internal sealed class ServicesTweaks : Firewall{- private static readonly Dictionary<string, (string Default, string Blocked)> UpdateFilesWin = new Dictionary<string, (string Default, string Blocked)>()+ private static readonly Dictionary<string, (string Default, string Blocked)> _updateFilesWin = new Dictionary<string, (string Default, string Blocked)>(){{ "Uso", ("usoclient.exe", "BlockUOrchestrator-GTweak.exe") },{ "Worker", ("MoUsoCoreWorker.exe", "BlockUpdate-GTweak.exe") },@@ -118,7 +118,7 @@ namespace GTweak.Utilities.TweaksRegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanServer", "Start", "4") ||RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation", "Start", "4");- servicesV.TglButton15.StateNA = UpdateFilesWin.All(key => File.Exists(FilesPathUpdate(key.Value.Default)) || File.Exists(FilesPathUpdate(key.Value.Default, true)));+ servicesV.TglButton15.StateNA = _updateFilesWin.All(key => File.Exists(FilesPathUpdate(key.Value.Default)) || File.Exists(FilesPathUpdate(key.Value.Default, true)));servicesV.TglButton16.StateNA =RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\PolicyAgent", "Start", "4") ||@@ -328,7 +328,7 @@ namespace GTweak.Utilities.TweaksbackgroundWorker.DoWork += delegate{string argurment = default;- foreach (var key in UpdateFilesWin)+ foreach (var key in _updateFilesWin)argurment += isChoose ? $"rename {FilesPathUpdate(key.Value.Default)} {key.Value.Blocked} & " : $"rename {FilesPathUpdate(key.Value.Blocked)} {key.Value.Default} & ";TrustedInstaller.CreateProcessAsTrustedInstaller(SettingsRepository.PID, $"cmd.exe /c {argurment.Substring(0, argurment.Length - 3)}");diff --git a/.Source/GTweak/Utilities/Tweaks/SystemMaintenance.cs b/.Source/GTweak/Utilities/Tweaks/SystemMaintenance.csindex a573f26b..eda8ba01 100644--- a/.Source/GTweak/Utilities/Tweaks/SystemMaintenance.cs+++ b/.Source/GTweak/Utilities/Tweaks/SystemMaintenance.cs@@ -15,9 +15,9 @@ namespace GTweak.Utilities.Tweaksprivate static extern int DisableSR([MarshalAs(UnmanagedType.LPWStr)] string Drive);[DllImport("srclient.dll")]private static extern int SRRemoveRestorePoint(int index);- private static readonly ManagementClass RestorePoint = new ManagementClass(new ManagementScope(@"\\localhost\root\default"), new ManagementPath("SystemRestore"), new ObjectGetOptions());- private static ManagementBaseObject InParams, OutParams;- private static bool isWorkingCreatePoint = false;+ private static readonly ManagementClass _restorePoint = new ManagementClass(new ManagementScope(@"\\localhost\root\default"), new ManagementPath("SystemRestore"), new ObjectGetOptions());+ private static ManagementBaseObject _inParams, _outParams;+ private static bool _isWorkingCreatePoint = false;internal static bool IsSystemRestoreDisabled => RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore", "RPSessionInterval", "0");@@ -41,11 +41,11 @@ namespace GTweak.Utilities.Tweaksinternal static void CreateRestorePoint(){- if (isWorkingCreatePoint) return;+ if (_isWorkingCreatePoint) return;try{- isWorkingCreatePoint = true;+ _isWorkingCreatePoint = true;RegistryHelp.Write(Registry.LocalMachine, @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore", "SystemRestorePointCreationFrequency", 0, RegistryValueKind.DWord);EnableRecovery();@@ -56,23 +56,23 @@ namespace GTweak.Utilities.TweaksSRRemoveRestorePoint(Convert.ToInt32(managementObj["SequenceNumber"]));}- InParams = RestorePoint.GetMethodParameters("CreateRestorePoint");- InParams["Description"] = (string)Application.Current.Resources["textpoint_more"];- InParams["EventType"] = 100;- InParams["RestorePointType"] = 12;- OutParams = RestorePoint.InvokeMethod("CreateRestorePoint", InParams, null);+ _inParams = _restorePoint.GetMethodParameters("CreateRestorePoint");+ _inParams["Description"] = (string)Application.Current.Resources["textpoint_more"];+ _inParams["EventType"] = 100;+ _inParams["RestorePointType"] = 12;+ _outParams = _restorePoint.InvokeMethod("CreateRestorePoint", _inParams, null);- if ((uint)OutParams["ReturnValue"] == 0)+ if ((uint)_outParams["ReturnValue"] == 0)new ViewNotification(300).Show("", "info", "successpoint_notification");elsenew ViewNotification(300).Show("", "warn", "notsuccessfulpoint_notification");- isWorkingCreatePoint = false;+ _isWorkingCreatePoint = false;RegistryHelp.DeleteValue(Registry.LocalMachine, @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SystemRestore", "SystemRestorePointCreationFrequency");}catch{- isWorkingCreatePoint = false;+ _isWorkingCreatePoint = false;new ViewNotification().Show("", "warn", "notsuccessfulpoint_notification");}}@@ -114,10 +114,10 @@ namespace GTweak.Utilities.TweaksCommandExecutor.RunCommand("/c sc config wbengine start= demand && sc config swprv start= demand && sc config vds start= demand && sc config VSS start= demand");- InParams = RestorePoint.GetMethodParameters("Enable");- InParams["WaitTillEnabled"] = true;- InParams["Drive"] = System.IO.Path.GetPathRoot(Environment.SystemDirectory);- RestorePoint.InvokeMethod("Enable", InParams, null);+ _inParams = _restorePoint.GetMethodParameters("Enable");+ _inParams["WaitTillEnabled"] = true;+ _inParams["Drive"] = System.IO.Path.GetPathRoot(Environment.SystemDirectory);+ _restorePoint.InvokeMethod("Enable", _inParams, null);}}}diff --git a/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs b/.Source/GTweak/Utilities/Tweaks/SystemTweaks.csindex 7761d169..ff758ca5 100644--- a/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs+++ b/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs@@ -29,8 +29,8 @@ namespace GTweak.Utilities.Tweaksinternal sealed class SystemTweaks : Firewall{internal static bool isTweakWorkingAntivirus = false;- private static bool isNetshState = false, isBluetoothStatus = false;- private readonly string activeGuid = RegistryHelp.GetValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes", "ActivePowerScheme", string.Empty);+ private static bool _isNetshState = false, _isBluetoothStatus = false;+ private readonly string _activeGuid = RegistryHelp.GetValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes", "ActivePowerScheme", string.Empty);internal void AnalyzeAndUpdate(SystemView systemV){@@ -110,7 +110,7 @@ namespace GTweak.Utilities.TweakssystemV.TglButton12.StateNA = IsTaskEnabled(memoryDiagTasks);- systemV.TglButton13.StateNA = isNetshState;+ systemV.TglButton13.StateNA = _isNetshState;systemV.TglButton14.StateNA =RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management", "LargeSystemCache", "1");@@ -127,10 +127,10 @@ namespace GTweak.Utilities.TweakssystemV.TglButton17.StateNA =RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers", "DisableAutoplay", "1");- systemV.TglButton18.StateNA = !RegistryHelp.GetValue($@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\{activeGuid}", "Description", string.Empty).Contains("-18") &&- !RegistryHelp.GetValue($@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\{activeGuid}", "FriendlyName", string.Empty).Contains("-19");+ systemV.TglButton18.StateNA = !RegistryHelp.GetValue($@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\{_activeGuid}", "Description", string.Empty).Contains("-18") &&+ !RegistryHelp.GetValue($@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\{_activeGuid}", "FriendlyName", string.Empty).Contains("-19");- systemV.TglButton19.StateNA = isBluetoothStatus;+ systemV.TglButton19.StateNA = _isBluetoothStatus;systemV.TglButton20.StateNA =RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\mpssvc", "Start", "4");@@ -160,15 +160,15 @@ namespace GTweak.Utilities.Tweakstry{using var managementObj = new ManagementObjectSearcher("SELECT DeviceID FROM Win32_PnPEntity WHERE Service='BthLEEnum'").Get();- isBluetoothStatus = managementObj.Cast<ManagementObject>().Any();+ _isBluetoothStatus = managementObj.Cast<ManagementObject>().Any();}- catch { isBluetoothStatus = false; }+ catch { _isBluetoothStatus = false; }}internal async void ViewNetshState(){string getStateNetsh = await CommandExecutor.GetCommandOutput("/c chcp 65001 & netsh int teredo show state & netsh int ipv6 isatap show state & netsh int isatap show state & netsh int ipv6 6to4 show state", false);- isNetshState = getStateNetsh.Contains("default") || getStateNetsh.Contains("enabled");+ _isNetshState = getStateNetsh.Contains("default") || getStateNetsh.Contains("enabled");}[DllImport("user32.dll")]@@ -304,12 +304,12 @@ namespace GTweak.Utilities.Tweaksstring argStateNetshSecond, argStateNetsh;if (isChoose){- isNetshState = false;+ _isNetshState = false;argStateNetsh = argStateNetshSecond = @"disabled";}else{- isNetshState = true;+ _isNetshState = true;argStateNetshSecond = @"enabled";argStateNetsh = @"default";}@@ -363,7 +363,7 @@ namespace GTweak.Utilities.Tweaks$bluetooth = $radios | ? { $_.Kind -eq 'Bluetooth' }[Windows.Devices.Radios.RadioState,Windows.System.Devices,ContentType=WindowsRuntime] | Out-NullAwait ($bluetooth.SetStateAsync(" + (isChoose ? "'off'" : "'on'") + ")) ([Windows.Devices.Radios.RadioAccessStatus]) | Out-Null", true);- isBluetoothStatus = !isChoose;+ _isBluetoothStatus = !isChoose;break;case "TglButton20":RegistryHelp.Write(Registry.LocalMachine, @"SYSTEM\CurrentControlSet\Services\mpssvc", "Start", isChoose ? 4 : 2, RegistryValueKind.DWord);diff --git a/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs b/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.csindex f0323779..2aa79303 100644--- a/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs+++ b/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs@@ -14,8 +14,8 @@ namespace GTweak.Utilities.Tweaksinternal sealed class UninstallingPakages : TaskSchedulerManager{internal static bool IsOneDriveInstalled => File.Exists(Environment.ExpandEnvironmentVariables(@"%userprofile%\AppData\Local\Microsoft\OneDrive\OneDrive.exe"));- private static bool isLocalAccount = false;- private static readonly string pathPackage = Path.Combine(StoragePaths.SystemDisk, "Program Files", "WindowsApps");+ private static bool _isLocalAccount = false;+ private static readonly string _pathPackage = Path.Combine(StoragePaths.SystemDisk, "Program Files", "WindowsApps");internal static HashSet<string> InstalledPackages = new HashSet<string>();internal static readonly Dictionary<string, (string Alias, bool IsUnavailable, List<string> Scripts)> PackagesDetails = new Dictionary<string, (string Alias, bool IsUnavailable, List<string> Scripts)>()@@ -115,7 +115,7 @@ namespace GTweak.Utilities.Tweaksforeach (string getScript in Scripts ?? Enumerable.Empty<string>()){- TrustedInstaller.CreateProcessAsTrustedInstaller(SettingsRepository.PID, $@"cmd.exe /c for /d %i in (""{pathPackage}\*{getScript}*"") do rd /s /q ""%i""");+ TrustedInstaller.CreateProcessAsTrustedInstaller(SettingsRepository.PID, $@"cmd.exe /c for /d %i in (""{_pathPackage}\*{getScript}*"") do rd /s /q ""%i""");await RunPowerShell($"{argument} \"Get-AppxPackage -Name {getScript} -AllUsers | Remove-AppxPackage\"");}@@ -335,7 +335,7 @@ namespace GTweak.Utilities.TweaksRegistryHelp.DeleteFolderTree(Registry.ClassesRoot, @"Wow6432Node\CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}");CommandExecutor.RunCommand($@"/c rd /s /q %userprofile%\AppData\Local\Microsoft\OneDrive & rd /s /q %userprofile%\AppData\Local\OneDrive &- rd /s /q ""%allusersprofile%\Microsoft OneDrive"" & rd /s /q {StoragePaths.SystemDisk}OneDriveTemp{(isLocalAccount ? @" & rd /s /q %userprofile%\OneDrive" : "")}");+ rd /s /q ""%allusersprofile%\Microsoft OneDrive"" & rd /s /q {StoragePaths.SystemDisk}OneDriveTemp{(_isLocalAccount ? @" & rd /s /q %userprofile%\OneDrive" : "")}");}});}@@ -370,7 +370,7 @@ namespace GTweak.Utilities.Tweaksinternal async void CheckingForLocalAccount(){string output = await CommandExecutor.GetCommandOutput("Get-LocalUser | Where-Object { $_.Enabled -match 'True'} | Select-Object -ExpandProperty PrincipalSource");- isLocalAccount = !output.Contains("MicrosoftAccount");+ _isLocalAccount = !output.Contains("MicrosoftAccount");}}}diff --git a/.Source/GTweak/View/DataSystemView.xaml.cs b/.Source/GTweak/View/DataSystemView.xaml.csindex 95abe43d..b420db1a 100644--- a/.Source/GTweak/View/DataSystemView.xaml.cs+++ b/.Source/GTweak/View/DataSystemView.xaml.cs@@ -18,8 +18,8 @@ namespace GTweak.View{public partial class DataSystemView : UserControl{- private readonly DispatcherTimer timer = default;- private TimeSpan time = TimeSpan.FromSeconds(0);+ private readonly DispatcherTimer _timer = default;+ private TimeSpan _time = TimeSpan.FromSeconds(0);public DataSystemView(){@@ -36,9 +36,9 @@ namespace GTweak.ViewDataContext = new DataSystemVM();};- timer = new DispatcherTimer(new TimeSpan(0, 0, 1), DispatcherPriority.Normal, async delegate+ _timer = new DispatcherTimer(new TimeSpan(0, 0, 1), DispatcherPriority.Normal, async delegate{- if (time.TotalSeconds % 2 == 0)+ if (_time.TotalSeconds % 2 == 0){BackgroundQueue backgroundQueue = new BackgroundQueue();await backgroundQueue.QueueTask(async delegate@@ -55,16 +55,16 @@ namespace GTweak.ViewIpAddress.Effect.BeginAnimation(BlurEffect.RadiusProperty, doubleAnim);}}- else if (time.TotalSeconds % 5 == 0)+ else if (_time.TotalSeconds % 5 == 0){BackgroundQueue backgroundQueue = new BackgroundQueue();await backgroundQueue.QueueTask(delegate { new SystemDiagnostics().GetUserIpAddress(); });DataContext = new DataSystemVM();}- time = time.Add(TimeSpan.FromSeconds(+1));+ _time = _time.Add(TimeSpan.FromSeconds(+1));}, Application.Current.Dispatcher);- timer.Start();+ _timer.Start();RAMLoad.Value = new MonitoringSystem().GetMemoryUsage;CPULoad.Value = MonitoringSystem.GetProcessorUsage;@@ -187,6 +187,6 @@ namespace GTweak.View}}- private void Page_Unloaded(object sender, RoutedEventArgs e) => timer.Stop();+ private void Page_Unloaded(object sender, RoutedEventArgs e) => _timer.Stop();}}diff --git a/.Source/GTweak/View/PakagesView.xaml.cs b/.Source/GTweak/View/PakagesView.xaml.csindex f99d2d7d..228a8d2d 100644--- a/.Source/GTweak/View/PakagesView.xaml.cs+++ b/.Source/GTweak/View/PakagesView.xaml.cs@@ -20,17 +20,17 @@ namespace GTweak.View{public partial class PakagesView : UserControl{- private readonly DispatcherTimer timer;- private TimeSpan time = TimeSpan.FromSeconds(0);- private bool isWebViewRemoval = false;+ private readonly DispatcherTimer _timer;+ private TimeSpan _time = TimeSpan.FromSeconds(0);+ private bool _isWebViewRemoval = false;public PakagesView(){InitializeComponent();- timer = new DispatcherTimer(new TimeSpan(0, 0, 1), DispatcherPriority.Normal, delegate+ _timer = new DispatcherTimer(new TimeSpan(0, 0, 1), DispatcherPriority.Normal, delegate{- if (time.TotalSeconds % 5 == 0)+ if (_time.TotalSeconds % 5 == 0){BackgroundWorker backgroundWorker = new BackgroundWorker();backgroundWorker.DoWork += delegate { new UninstallingPakages().LoadInstalledPackages(); };@@ -38,10 +38,10 @@ namespace GTweak.ViewbackgroundWorker.RunWorkerAsync();}- time = time.Add(TimeSpan.FromSeconds(+1));+ _time = _time.Add(TimeSpan.FromSeconds(+1));}, Application.Current.Dispatcher);- timer.Start();+ _timer.Start();}private void Apps_MouseEnter(object sender, MouseEventArgs e)@@ -94,7 +94,7 @@ namespace GTweak.ViewBtnDelete.PreviewMouseLeftButtonDown += DeleteHandler;BtnCancel.PreviewMouseLeftButtonDown += CancelHandler;- isWebViewRemoval = await tcs.Task;+ _isWebViewRemoval = await tcs.Task;OverlayAnimation(1, 0, 0.25, (s, e) => Overlay.Visibility = Visibility.Collapsed);}@@ -108,7 +108,7 @@ namespace GTweak.ViewUpdateViewStatePakages();});- await UninstallingPakages.DeletingPackage(packageName, isWebViewRemoval);+ await UninstallingPakages.DeletingPackage(packageName, _isWebViewRemoval);await Task.Delay(3000);