Skip to content

Portable Tool for an Ideal Windows Setup

upd. firewall tweak & OS release output + improvement comparison by revision number

Greedeksa378456e222f
diff --git a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
index 88d08660..893e3def 100644
--- a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
+++ b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
@@ -47,7 +47,7 @@ namespace GTweak.Utilities.Configuration
{
internal static string OperatingSystem { get; set; } = $"\n{Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion", "ProductName", string.Empty)?.ToString()}" ?? string.Empty;
internal static string OSVersion { get; set; } = string.Empty;
- internal static string OSBuild { get; set; } = string.Empty;
+ internal static decimal OSBuild { get; set; } = default;
internal static string Bios { get; set; } = string.Empty;
internal static string BiosMode { get; set; } = string.Empty;
internal static string Motherboard { get; set; } = string.Empty;
@@ -162,11 +162,12 @@ namespace GTweak.Utilities.Configuration
internal void GetOperatingSystemInfo()
{
+ string release = RegistryHelp.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion", "DisplayVersion", string.Empty);
foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Caption, OSArchitecture, BuildNumber, Version from Win32_OperatingSystem", new EnumerationOptions { ReturnImmediately = true }).Get())
{
HardwareData.OSVersion = Convert.ToString(managementObj["Caption"]);
- HardwareData.OSBuild = Convert.ToString(managementObj["BuildNumber"]);
- HardwareData.OperatingSystem = $"{HardwareData.OSVersion.Substring(HardwareData.OSVersion.IndexOf('W'))}, {Regex.Replace((string)managementObj["OSArchitecture"], @"\-.+", "-bit")}, V{(string)managementObj["Version"]}\n";
+ HardwareData.OSBuild = decimal.TryParse($"{Convert.ToString(managementObj["BuildNumber"])}.{RegistryHelp.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion", "UBR", 0)}", NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out decimal result) ? result : Convert.ToDecimal(managementObj["BuildNumber"]);
+ HardwareData.OperatingSystem = $"{HardwareData.OSVersion.Substring(HardwareData.OSVersion.IndexOf('W'))} {Regex.Replace((string)managementObj["OSArchitecture"], @"\-.+", "-bit")}, V{(string)managementObj["Version"]} {(!string.IsNullOrWhiteSpace(release) ? $"({release})" : string.Empty)}\n";
IsWindowsVersion = new Dictionary<byte, bool>()
{
{ 11, HardwareData.OSVersion.Contains("11") },
diff --git a/.Source/GTweak/Utilities/Controls/RunGuard.cs b/.Source/GTweak/Utilities/Controls/RunGuard.cs
index 2bc3add2..25d6d75b 100644
--- a/.Source/GTweak/Utilities/Controls/RunGuard.cs
+++ b/.Source/GTweak/Utilities/Controls/RunGuard.cs
@@ -46,7 +46,7 @@ namespace GTweak.Utilities.Controls
{
await Task.Run(() => new SystemDiagnostics().GetOperatingSystemInfo());
- if ((SystemDiagnostics.IsWindowsVersion[11] || SystemDiagnostics.IsWindowsVersion[10]) && SystemDiagnostics.HardwareData.OSBuild.CompareTo("18362.116") >= 0)
+ if ((SystemDiagnostics.IsWindowsVersion[11] || SystemDiagnostics.IsWindowsVersion[10]) && SystemDiagnostics.HardwareData.OSBuild.CompareTo(18362.116m) >= 0)
return;
new MessageWindow(true).ShowDialog();
diff --git a/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs b/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs
index 42079a3d..0dad4d49 100644
--- a/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs
+++ b/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs
@@ -344,7 +344,7 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.Write(Registry.CurrentUser, @"Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "TaskbarMn", isDisabled ? 0 : 1, RegistryValueKind.DWord);
RegistryHelp.Write(Registry.CurrentUser, @"Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "EnableSnapAssistFlyout", isDisabled ? 0 : 1, RegistryValueKind.DWord);
- if (isDisabled && SystemDiagnostics.HardwareData.OSBuild.CompareTo("22635.3785") >= 0)
+ if (isDisabled && SystemDiagnostics.HardwareData.OSBuild.CompareTo(22635.3785m) >= 0)
{
RegistryHelp.DeleteFolderTree(Registry.CurrentUser, @"Software\Microsoft\Windows\CurrentVersion\Explorer\Desktop\NameSpace\{2cc5ca98-6485-489a-920e-b3e88a6ccce3}");
RegistryHelp.Write(Registry.CurrentUser, @"Software\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\NewStartPanel", "{2cc5ca98-6485-489a-920e-b3e88a6ccce3}", 1, RegistryValueKind.DWord);
diff --git a/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs b/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
index 1602fbcc..faad9340 100644
--- a/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
+++ b/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
@@ -1,4 +1,5 @@
-using GTweak.Utilities.Controls;
+using GTweak.Utilities.Configuration;
+using GTweak.Utilities.Controls;
using GTweak.Utilities.Helpers;
using GTweak.Utilities.Managers;
using GTweak.Utilities.Tweaks.DefenderManager;
@@ -384,6 +385,8 @@ namespace GTweak.Utilities.Tweaks
case "TglButton20":
RegistryHelp.Write(Registry.LocalMachine, @"SYSTEM\CurrentControlSet\Services\mpssvc", "Start", isDisabled ? 4 : 2, RegistryValueKind.DWord);
CommandExecutor.RunCommand($"/c netsh advfirewall set allprofiles state {(isDisabled ? "off" : "on")}");
+ if (SystemDiagnostics.HardwareData.OSBuild.CompareTo(22621.521m) >= 0)
+ RegistryHelp.Write(Registry.LocalMachine, @"SYSTEM\CurrentControlSet\Services\wtd", "Start", isDisabled ? 4 : 2, RegistryValueKind.DWord);
break;
case "TglButton21":
RegistryHelp.Write(Registry.CurrentUser, @"Software\Microsoft\GameBar", "AutoGameModeEnabled", isDisabled ? 0 : 1, RegistryValueKind.DWord);
diff --git a/.Source/GTweak/View/InterfaceView.xaml.cs b/.Source/GTweak/View/InterfaceView.xaml.cs
index ec61fbde..5bb1a23c 100644
--- a/.Source/GTweak/View/InterfaceView.xaml.cs
+++ b/.Source/GTweak/View/InterfaceView.xaml.cs
@@ -24,7 +24,7 @@ namespace GTweak.View
if (!WindowsLicense.IsWindowsActivated)
new NotificationManager().Show("info", "warn_activate_notification").Perform();
- if (SystemDiagnostics.HardwareData.OSBuild.CompareTo("22621.2361") < 0)
+ if (SystemDiagnostics.HardwareData.OSBuild.CompareTo(22621.2361m) < 0)
TglButton21.IsEnabled = false;
}