Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
-correction
Greedeks380d75bafd14
diff --git a/.Source/GTweak/Languages/en/Lang.xaml b/.Source/GTweak/Languages/en/Lang.xamlindex e01c0659..dfb3d1ba 100644--- a/.Source/GTweak/Languages/en/Lang.xaml+++ b/.Source/GTweak/Languages/en/Lang.xaml@@ -234,7 +234,7 @@<v:String x:Key="MixedReality_applications">Mixed Reality</v:String><v:String x:Key="BingWeather_applications">Bing Weather</v:String><v:String x:Key="Microsoft3D_applications">Microsoft 3D Viewer</v:String>- <v:String x:Key="SkypeApp_applications">Microsoft SkypeApp</v:String>+ <v:String x:Key="SkypeApp_applications">Microsoft Skype</v:String><v:String x:Key="OneDrive_applications">OneDrive</v:String><v:String x:Key="Cortana_applications">Cortana</v:String><v:String x:Key="MicrosoftTeams_applications">Microsoft Teams</v:String>diff --git a/.Source/GTweak/Languages/ru/Lang.xaml b/.Source/GTweak/Languages/ru/Lang.xamlindex 7ad27f6c..e8f452f4 100644--- a/.Source/GTweak/Languages/ru/Lang.xaml+++ b/.Source/GTweak/Languages/ru/Lang.xaml@@ -234,7 +234,7 @@<v:String x:Key="MixedReality_applications">Mixed Reality</v:String><v:String x:Key="BingWeather_applications">Погода</v:String><v:String x:Key="Microsoft3D_applications">Средство 3D-просмотра</v:String>- <v:String x:Key="SkypeApp_applications">Microsoft SkypeApp</v:String>+ <v:String x:Key="SkypeApp_applications">Microsoft Skype</v:String><v:String x:Key="OneDrive_applications">OneDrive</v:String><v:String x:Key="Cortana_applications">Cortana</v:String><v:String x:Key="MicrosoftTeams_applications">Microsoft Teams</v:String>diff --git a/.Source/GTweak/Utilities/BlockRunTweaker.cs b/.Source/GTweak/Utilities/BlockRunTweaker.csindex 37aeea8a..cf37543a 100644--- a/.Source/GTweak/Utilities/BlockRunTweaker.cs+++ b/.Source/GTweak/Utilities/BlockRunTweaker.cs@@ -51,11 +51,9 @@ namespace GTweak.Utilitiesinternal static void CheckingSystemRequirements(){- EnumerationOptions optionsObj = new EnumerationOptions { ReturnImmediately = true };-Parallel.Invoke(() =>{- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Caption from Win32_OperatingSystem", optionsObj).Get())+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Caption from Win32_OperatingSystem", new EnumerationOptions { ReturnImmediately = true }).Get())SystemData.СomputerСonfiguration.WindowsClientVersion = Convert.ToString(managementObj["Caption"]); ;});diff --git a/.Source/GTweak/Utilities/Settings.cs b/.Source/GTweak/Utilities/Settings.csindex 33ebd432..1be02fd1 100644--- a/.Source/GTweak/Utilities/Settings.cs+++ b/.Source/GTweak/Utilities/Settings.cs@@ -13,7 +13,7 @@ using System.Windows;namespace GTweak.Utilities{[StructLayout(LayoutKind.Sequential)]- internal struct UsePath+ internal readonly struct UsePath{internal static string Config = string.Empty;internal static string FileLocation => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"GTweak");diff --git a/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs b/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.csindex f6327bfb..bc6baa64 100644--- a/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs+++ b/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs@@ -5,6 +5,7 @@ using Microsoft.Win32;using System;using System.Diagnostics;using System.IO;+using System.Linq;using System.Threading;using System.Threading.Tasks;@@ -41,12 +42,6 @@ namespace GTweak.Utilities.Tweaks@"Microsoft\Office\OfficeTelemetryAgentLogOn",@"Microsoft\Office\Office 15 Subscription Heartbeat" };- private static readonly string[] HostsRules = {- @"0.0.0.0 hk2sch130021829.wns.windows.com",- @"0.0.0.0 v10-win.vortex.data.microsoft.com.akadns.net",- @"0.0.0.0 watson.live.com",- @"0.0.0.0 api.cortana.ai" };-private static Thread _thread = default;internal void ViewСonfidentiality(ConfidentialityView confidentialityV)@@ -86,7 +81,7 @@ namespace GTweak.Utilities.TweaksconfidentialityV.TglButton3.StateNA = false;- if (ViewTaskState(SchedulerTasks) > 0)+ if (IsTaskEnabled(SchedulerTasks))confidentialityV.TglButton4.StateNA = true;elseconfidentialityV.TglButton4.StateNA = false;@@ -130,7 +125,7 @@ namespace GTweak.Utilities.TweaksconfidentialityV.TglButton8.StateNA = false;- if (ViewHosts(HostsRules) < 4)+ if (IsDefaultHosts())confidentialityV.TglButton9.StateNA = true;elseconfidentialityV.TglButton9.StateNA = false;@@ -197,7 +192,7 @@ namespace GTweak.Utilities.Tweaks{if (Registry.GetValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\NvTelemetryContainer", "Start", null) == null ||Registry.GetValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\NvTelemetryContainer", "Start", string.Empty).ToString() != "4" ||- ViewTaskState(NvidiaTasks) > 0)+ IsTaskEnabled(NvidiaTasks))confidentialityV.TglButton17.StateNA = true;elseconfidentialityV.TglButton17.StateNA = false;@@ -215,46 +210,46 @@ namespace GTweak.Utilities.Tweaks}- private byte ViewTaskState(string[] tasklist)+ private bool IsTaskEnabled(string[] tasklist){- byte countTaskRun = 0;+ byte numberRunningTask = 0;using (Microsoft.Win32.TaskScheduler.TaskService taskService = new Microsoft.Win32.TaskScheduler.TaskService()){- foreach (string taskname in tasklist)- {- Microsoft.Win32.TaskScheduler.Task task = taskService.GetTask(taskname);- if (task != null)- {- if (task.Enabled)- countTaskRun++;- }- }+ numberRunningTask += (byte)(from string taskname in tasklist+ let task = taskService.GetTask(taskname)+ where task != null+ where task.Enabled+ select taskname).Count();}- return countTaskRun;+ return numberRunningTask > 0;}- internal byte ViewHosts(string[] hostslist)+ internal bool IsDefaultHosts(){try{- byte count = 0;- StreamReader streamReader = new StreamReader(UsePath.Hosts);- string hosts = streamReader.ReadToEnd();+ byte numberHostsRules = 0;- foreach (string hostsrules in hostslist)+ using (StreamReader streamReader = new StreamReader(UsePath.Hosts)){- if (hosts.Contains(hostsrules))- count++;+ string hosts = streamReader.ReadToEnd();+ numberHostsRules += (byte)(new string[] {+ @"0.0.0.0 hk2sch130021829.wns.windows.com",+ @"0.0.0.0 v10-win.vortex.data.microsoft.com.akadns.net",+ @"0.0.0.0 watson.live.com",+ @"0.0.0.0 cds843.lon.llnw.net",+ @"0.0.0.0 db6sch102091602.wns.windows.com",+ @"0.0.0.0 telemetry.microsoft.com",+ @"0.0.0.0 bn3sch020010635.wns.windows.com",+ @"0.0.0.0 api.cortana.ai"+ }).Where(hostsrules => hosts.Contains(hostsrules)).Count();+ streamReader.Close();}-- streamReader.Close();- streamReader.Dispose();- return count;+ return numberHostsRules == 0;}- catch { return 0; }+ catch { return false; }}-internal static void UseСonfidentiality(string tweak, bool isChoose){INIManager.UserTweaksConfidentiality.Remove(tweak);@@ -486,10 +481,10 @@ namespace GTweak.Utilities.Tweaks{Parallel.Invoke(() =>{- Microsoft.Win32.TaskScheduler.TaskService taskService = new Microsoft.Win32.TaskScheduler.TaskService();+ using Microsoft.Win32.TaskScheduler.TaskService taskService = new Microsoft.Win32.TaskScheduler.TaskService();foreach (string taskname in tasklist){- Microsoft.Win32.TaskScheduler.Task task = taskService.GetTask(taskname);+ using Microsoft.Win32.TaskScheduler.Task task = taskService.GetTask(taskname);if (task != null){if (!task.Enabled)@@ -507,10 +502,10 @@ namespace GTweak.Utilities.Tweaks{Parallel.Invoke(() =>{- Microsoft.Win32.TaskScheduler.TaskService taskService = new Microsoft.Win32.TaskScheduler.TaskService();+ using Microsoft.Win32.TaskScheduler.TaskService taskService = new Microsoft.Win32.TaskScheduler.TaskService();foreach (string taskname in tasklist){- Microsoft.Win32.TaskScheduler.Task task = taskService.GetTask(taskname);+ using Microsoft.Win32.TaskScheduler.Task task = taskService.GetTask(taskname);if (task != null){if (task.Enabled)diff --git a/.Source/GTweak/Utilities/Tweaks/SystemData.cs b/.Source/GTweak/Utilities/Tweaks/SystemData.csindex d015d6e3..f5a98dd5 100644--- a/.Source/GTweak/Utilities/Tweaks/SystemData.cs+++ b/.Source/GTweak/Utilities/Tweaks/SystemData.cs@@ -111,15 +111,6 @@ namespace GTweak.Utilities.Tweaksinternal readonly int GetRamUsage() => (int)Math.Truncate(100 - ((decimal)GetPhysicalAvailableMemory() / GetTotalMemory() * 100) + (decimal)0.5);}- internal sealed class ClientInternetProtocol- {- [JsonProperty("query")]- internal string Ip { get; set; }-- [JsonProperty("countryCode")]- internal string Country { get; set; }- }-internal sealed class СomputerСonfiguration{internal static string WindowsClientVersion { get; set; } = string.Empty;@@ -132,10 +123,6 @@ namespace GTweak.Utilities.Tweaks/// </summary>internal static byte ConnectionStatus = 1;-- private static string _type = string.Empty;- private static readonly EnumerationOptions optionsObj = new EnumerationOptions { ReturnImmediately = true };-internal static readonly Dictionary<string, string> СonfigurationData = new Dictionary<string, string>(){{"Windows", Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion", "ProductName", string.Empty).ToString() },@@ -154,13 +141,13 @@ namespace GTweak.Utilities.Tweaks{Parallel.Invoke(delegate{- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Caption, OSArchitecture, Version from Win32_OperatingSystem", optionsObj).Get())+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Caption, OSArchitecture, Version from Win32_OperatingSystem", new EnumerationOptions { ReturnImmediately = true }).Get())СonfigurationData["Windows"] = $"{Convert.ToString(managementObj["Caption"]).Substring(Convert.ToString(managementObj["Caption"]).IndexOf('W'))}, {Regex.Replace((string)managementObj["OSArchitecture"], @"\-.+", "-bit")}, V{(string)managementObj["Version"]}\n";СonfigurationData["Windows"] = $"\n{СonfigurationData["Windows"].TrimEnd('\n')}";},delegate{- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name, Caption, Description, SerialNumber from Win32_BIOS", optionsObj).Get())+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name, Caption, Description, SerialNumber from Win32_BIOS", new EnumerationOptions { ReturnImmediately = true }).Get()){if (!string.IsNullOrEmpty((string)managementObj["Name"]))СonfigurationData["BIOS"] += !string.IsNullOrEmpty((string)managementObj["SerialNumber"]) ? (string)managementObj["Name"] + ", S/N-" + (string)managementObj["SerialNumber"] + "\n" : (string)managementObj["Name"] + "\n";@@ -173,55 +160,55 @@ namespace GTweak.Utilities.Tweaks},delegate{- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Manufacturer, Product, Version from Win32_BaseBoard", optionsObj).Get())+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Manufacturer, Product, Version from Win32_BaseBoard", new EnumerationOptions { ReturnImmediately = true }).Get())СonfigurationData["MotherBr"] = (string)managementObj["Manufacturer"] + (string)managementObj["Product"] + ", V" + (string)managementObj["Version"] + "\n";СonfigurationData["MotherBr"] = СonfigurationData["MotherBr"].TrimEnd('\n');},delegate{- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name from Win32_Processor", optionsObj).Get())+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name from Win32_Processor", new EnumerationOptions { ReturnImmediately = true }).Get())СonfigurationData["CPU"] = (string)managementObj["Name"] + "\n";СonfigurationData["CPU"] = СonfigurationData["CPU"].TrimEnd('\n');},delegate{- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name, AdapterRAM from Win32_VideoController", optionsObj).Get())+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name, AdapterRAM from Win32_VideoController", new EnumerationOptions { ReturnImmediately = true }).Get())СonfigurationData["GPU"] += ((string)managementObj["Name"] + ", " + Convert.ToString(((uint)managementObj["AdapterRAM"] / 1024000000)) + " GB\n");СonfigurationData["GPU"] = СonfigurationData["GPU"].TrimEnd('\n');},delegate{- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Manufacturer, Capacity, ConfiguredClockSpeed from Win32_PhysicalMemory", optionsObj).Get())+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Manufacturer, Capacity, ConfiguredClockSpeed from Win32_PhysicalMemory", new EnumerationOptions { ReturnImmediately = true }).Get())СonfigurationData["RAM"] += (string)managementObj["Manufacturer"] + ", " + Convert.ToString((ulong)managementObj["Capacity"] / 1024000000) + " GB, " + Convert.ToString((uint)managementObj["ConfiguredClockSpeed"]) + "MHz\n";СonfigurationData["RAM"] = СonfigurationData["RAM"].TrimEnd('\n');},UpdatingDeviceData,- GetUserIP);+ GettingUserIP);}internal static void UpdatingDeviceData(){Parallel.Invoke(delegate{- СonfigurationData["Storage"] = string.Empty;- foreach (var managementObj in new ManagementObjectSearcher(@"\\.\root\microsoft\windows\storage", "select FriendlyName,MediaType,Size,BusType from MSFT_PhysicalDisk", optionsObj).Get())+ string storageType = СonfigurationData["Storage"] = string.Empty;+ foreach (var managementObj in new ManagementObjectSearcher(@"\\.\root\microsoft\windows\storage", "select FriendlyName,MediaType,Size,BusType from MSFT_PhysicalDisk", new EnumerationOptions { ReturnImmediately = true }).Get()){- _type = (ushort)(managementObj["MediaType"]) switch+ storageType = (ushort)(managementObj["MediaType"]) switch{3 => "(HDD)",4 => "(SSD)",5 => "(SCM)",_ => "(Unspecified)",};- if (_type == "(Unspecified)" && ((ushort)(managementObj["BusType"])) == 7) _type = "(Media-Type)";- СonfigurationData["Storage"] += Convert.ToString((ulong)managementObj["Size"] / 1024000000) + " GB " + "[" + (string)managementObj["FriendlyName"] + "] " + _type + "\n";+ if (storageType == "(Unspecified)" && ((ushort)(managementObj["BusType"])) == 7) storageType = "(Media-Type)";+ СonfigurationData["Storage"] += Convert.ToString((ulong)managementObj["Size"] / 1024000000) + " GB " + "[" + (string)managementObj["FriendlyName"] + "] " + storageType + "\n";}СonfigurationData["Storage"] = СonfigurationData["Storage"].TrimEnd('\n');},delegate{СonfigurationData["Audio"] = string.Empty;- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name,Caption,Description from Win32_SoundDevice", optionsObj).Get())+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name,Caption,Description from Win32_SoundDevice", new EnumerationOptions { ReturnImmediately = true }).Get()){if (!string.IsNullOrEmpty((string)managementObj["Name"]))СonfigurationData["Audio"] += (string)managementObj["Name"] + "\n";@@ -235,13 +222,22 @@ namespace GTweak.Utilities.Tweaksdelegate{СonfigurationData["NetAdapter"] = string.Empty;- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name from Win32_NetworkAdapter where NetConnectionStatus=2 or NetConnectionStatus=7", optionsObj).Get())+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name from Win32_NetworkAdapter where NetConnectionStatus=2 or NetConnectionStatus=7", new EnumerationOptions { ReturnImmediately = true }).Get())СonfigurationData["NetAdapter"] += (string)managementObj["Name"] + "\n";СonfigurationData["NetAdapter"] = СonfigurationData["NetAdapter"].TrimEnd('\n');});}- internal static bool IsCheckInternetConnection()+ internal sealed class ClientInternetProtocol+ {+ [JsonProperty("query")]+ internal string Ip { get; set; }++ [JsonProperty("countryCode")]+ internal string Country { get; set; }+ }++ internal static bool IsNetworkAvailable(){try{@@ -254,22 +250,23 @@ namespace GTweak.Utilities.Tweaks};TimeSpan timeout = TimeSpan.FromSeconds(5.0);- Task<IPAddress> task = Task.Run(() =>+ using Task<IPAddress> task = Task.Run(() =>{return Dns.GetHostEntry(dns).AddressList[0];});if (!task.Wait(timeout))return false;+return true;}catch { return false; }}- internal static void GetUserIP()+ internal static void GettingUserIP(){Parallel.Invoke(delegate{- if (IsCheckInternetConnection())+ if (IsNetworkAvailable()){ClientInternetProtocol clientInternetProtocol = new ClientInternetProtocol();@@ -339,7 +336,6 @@ namespace GTweak.Utilities.TweaksDownloadVersion = gitVersionUtility.СurrentVersion;}}-}}}diff --git a/.Source/GTweak/View/InformationSystemView.xaml.cs b/.Source/GTweak/View/InformationSystemView.xaml.csindex 24783334..89602cee 100644--- a/.Source/GTweak/View/InformationSystemView.xaml.cs+++ b/.Source/GTweak/View/InformationSystemView.xaml.cs@@ -73,7 +73,7 @@ namespace GTweak.View{BackgroundWorker backgroundWorker = new BackgroundWorker();backgroundWorker.RunWorkerAsync();- backgroundWorker.DoWork += delegate { SystemData.СomputerСonfiguration.GetUserIP(); };+ backgroundWorker.DoWork += delegate { SystemData.СomputerСonfiguration.GettingUserIP(); };backgroundWorker.RunWorkerCompleted += delegate { DataContext = new InformationSystemVM(); };}