Skip to content

Portable Tool for an Ideal Windows Setup

ref WMI loops to safe foreach pattern with using & fix vbs file assoc

Greedeks16664430cd9f
diff --git a/.Source/GTweak/Core/ViewModel/InterfaceViewModel.cs b/.Source/GTweak/Core/ViewModel/InterfaceViewModel.cs
index 165a05f5..104bc83e 100644
--- a/.Source/GTweak/Core/ViewModel/InterfaceViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/InterfaceViewModel.cs
@@ -12,7 +12,7 @@ namespace GTweak.Core.ViewModel
{
public Visibility Win11FeatureOnly => HardwareData.OS.IsWin11 ? Visibility.Visible : Visibility.Collapsed;
public Visibility Win11FeatureAvailable => HardwareData.OS.IsWin11 && HardwareData.OS.Build.CompareTo(22621.2361m) >= 0 ? Visibility.Visible : Visibility.Collapsed;
- public bool IsBlockWithoutLicense => WindowsLicense.IsWindowsActivated;
+ public bool IsBlockWithoutLicense => WinLicenseHandler.IsWindowsActivated;
protected override Dictionary<string, object> GetControlStates() => InterfaceTweaks.ControlStates;
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index a234d015..a79315e8 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -167,7 +167,7 @@
<Compile Include="Utilities\Maintenance\SystemRestoreService.cs" />
<Compile Include="Utilities\Tweaks\SystemTweaks.cs" />
<Compile Include="Utilities\Tweaks\UninstallingPakages.cs" />
- <Compile Include="Utilities\Maintenance\WindowsLicense.cs" />
+ <Compile Include="Utilities\Maintenance\WinLicenseHandler.cs" />
<Compile Include="View\AddonsView.xaml.cs">
<DependentUpon>AddonsView.xaml</DependentUpon>
</Compile>
diff --git a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
index ee837d61..9f788634 100644
--- a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
+++ b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
@@ -95,9 +95,15 @@ namespace GTweak.Utilities.Configuration
{
string nameProfile = string.Empty;
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", $"select FullName from Win32_UserAccount where domain='{Environment.UserDomainName}' and name='{Environment.UserName.ToLowerInvariant()}'", new EnumerationOptions { ReturnImmediately = true }).Get())
+ using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", $"select FullName from Win32_UserAccount where domain='{Environment.UserDomainName}' and name='{Environment.UserName.ToLowerInvariant()}'", new EnumerationOptions { ReturnImmediately = true }))
{
- nameProfile = managementObj["FullName"] as string;
+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
+ {
+ using (managementObj)
+ {
+ nameProfile = managementObj["FullName"] as string;
+ }
+ }
}
return !string.IsNullOrWhiteSpace(nameProfile) ? nameProfile : Environment.UserName.ToLowerInvariant();
@@ -109,9 +115,10 @@ namespace GTweak.Utilities.Configuration
{
try
{
- using var managementObj = new ManagementObjectSearcher(@"root\microsoft\windows\storage", "select FriendlyName from MSFT_PhysicalDisk", new EnumerationOptions { ReturnImmediately = true });
- var results = managementObj?.Get();
+ using ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\microsoft\windows\storage", "select FriendlyName from MSFT_PhysicalDisk", new EnumerationOptions { ReturnImmediately = true });
+ using ManagementObjectCollection results = searcher.Get();
isMsftAvailable = results?.Count > 0;
+
}
catch { isMsftAvailable = false; }
@@ -188,14 +195,21 @@ namespace GTweak.Utilities.Configuration
int revisionNumber = RegistryHelp.GetValue(regPath, "UBR", 0);
string release = RegistryHelp.GetValue(regPath, "DisplayVersion", string.Empty);
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Caption, Description, OSArchitecture, BuildNumber, Version from Win32_OperatingSystem", new EnumerationOptions { ReturnImmediately = true }).Get())
+ using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select Caption, Description, OSArchitecture, BuildNumber, Version from Win32_OperatingSystem", new EnumerationOptions { ReturnImmediately = true }))
{
- string data = new[] { "Caption", "Description" }.Select(p => managementObj[p] as string).FirstOrDefault(s => !string.IsNullOrWhiteSpace(s)) ?? string.Empty;
- OS.Name = $"{(data.Contains('W') ? data.Substring(data.IndexOf('W')) : data)} {Regex.Replace(managementObj["OSArchitecture"]?.ToString() ?? string.Empty, @"\-.+", "-bit")} {(!string.IsNullOrWhiteSpace(release) ? $"({release})" : string.Empty)}\n";
- OS.Version = $"{managementObj["Version"]?.ToString() ?? "0"}.{revisionNumber}\n";
- OS.Build = decimal.TryParse($"{Convert.ToString(managementObj["BuildNumber"])}.{revisionNumber}", NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out decimal result) ? result : decimal.TryParse(Registry.GetValue(regPath, "CurrentBuild", "0")?.ToString(), out result) ? result : 0;
-
+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
+ {
+ using (managementObj)
+ {
+ string data = new string[] { "Caption", "Description" }.Select(p => managementObj[p] as string).FirstOrDefault(s => !string.IsNullOrWhiteSpace(s)) ?? string.Empty;
+ OS.Name = $"{(data.Contains('W') ? data.Substring(data.IndexOf('W')) : data)} {Regex.Replace(managementObj["OSArchitecture"]?.ToString() ?? string.Empty, @"\-.+", "-bit")} {(!string.IsNullOrWhiteSpace(release) ? $"({release})" : string.Empty)}\n";
+ OS.Version = $"{managementObj["Version"]?.ToString() ?? "0"}.{revisionNumber}\n";
+ OS.Build = decimal.TryParse($"{Convert.ToString(managementObj["BuildNumber"])}.{revisionNumber}", NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out decimal result) ? result : decimal.TryParse(Registry.GetValue(regPath, "CurrentBuild", "0")?.ToString(), out result) ? result : 0;
+ }
+ }
}
+
+
OS.Name = !string.IsNullOrWhiteSpace(OS.Name) ? OS.Name.TrimEnd('\n', '\r') : Registry.GetValue(regPath, "ProductName", "Windows")?.ToString();
OS.Version = !string.IsNullOrWhiteSpace(OS.Version) ? OS.Version.TrimEnd('\n', '\r') : Registry.GetValue(regPath, "LCUVer", 0)?.ToString();
}
@@ -213,33 +227,51 @@ namespace GTweak.Utilities.Configuration
}
catch { Bios.Mode = string.Empty; }
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name, Caption, Description, SMBIOSBIOSVersion, SerialNumber from Win32_BIOS", new EnumerationOptions { ReturnImmediately = true }).Get())
+ using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select Name, Caption, Description, SMBIOSBIOSVersion, SerialNumber from Win32_BIOS", new EnumerationOptions { ReturnImmediately = true }))
{
- string data = new[] { "Name", "Caption", "Description", "SMBIOSBIOSVersion" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty;
- string dataSN = managementObj["SerialNumber"]?.ToString() ?? string.Empty;
- Bios.Data += !string.IsNullOrWhiteSpace(dataSN) && !dataSN.Any(char.IsWhiteSpace) ? $"{data}, S/N-{dataSN}\n" : $"{data}\n";
+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
+ {
+ using (managementObj)
+ {
+ string data = new string[] { "Name", "Caption", "Description", "SMBIOSBIOSVersion" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty;
+ string dataSN = managementObj["SerialNumber"]?.ToString() ?? string.Empty;
+ Bios.Data += !string.IsNullOrWhiteSpace(dataSN) && !dataSN.Any(char.IsWhiteSpace) ? $"{data}, S/N-{dataSN}\n" : $"{data}\n";
+ }
+ }
}
+
Bios.Data = Bios.Data.TrimEnd('\n', '\r');
}
private void GetMotherboardInfo()
{
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Manufacturer, Product, Version from Win32_BaseBoard", new EnumerationOptions { ReturnImmediately = true }).Get())
+ using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select Manufacturer, Product, Version from Win32_BaseBoard", new EnumerationOptions { ReturnImmediately = true }))
{
- string data = $"{managementObj["Manufacturer"]?.ToString() ?? string.Empty}{managementObj["Product"]?.ToString() ?? string.Empty}";
- string dataVersion = managementObj["Version"]?.ToString() ?? string.Empty;
- Motherboard += !string.IsNullOrWhiteSpace(dataVersion) && !dataVersion.Any(char.IsWhiteSpace) ? $"{data}, V{dataVersion}\n" : $"{data}\n";
+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
+ {
+ using (managementObj)
+ {
+ string data = $"{managementObj["Manufacturer"]?.ToString() ?? string.Empty}{managementObj["Product"]?.ToString() ?? string.Empty}";
+ string dataVersion = managementObj["Version"]?.ToString() ?? string.Empty;
+ Motherboard += !string.IsNullOrWhiteSpace(dataVersion) && !dataVersion.Any(char.IsWhiteSpace) ? $"{data}, V{dataVersion}\n" : $"{data}\n";
+ }
+ }
}
Motherboard = Motherboard.TrimEnd('\n', '\r');
}
-
private void GetProcessorInfo()
{
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name, NumberOfCores, NumberOfLogicalProcessors from Win32_Processor", new EnumerationOptions { ReturnImmediately = true }).Get())
+ using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select Name, NumberOfCores, NumberOfLogicalProcessors from Win32_Processor", new EnumerationOptions { ReturnImmediately = true }))
{
- Processor.Data = $"{managementObj["Name"]?.ToString() ?? string.Empty}\n";
- Processor.Cores = managementObj["NumberOfCores"]?.ToString() ?? string.Empty;
- Processor.Threads = managementObj["NumberOfLogicalProcessors"]?.ToString() ?? string.Empty;
+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
+ {
+ using (managementObj)
+ {
+ Processor.Data = $"{managementObj["Name"]?.ToString() ?? string.Empty}\n";
+ Processor.Cores = managementObj["NumberOfCores"]?.ToString() ?? string.Empty;
+ Processor.Threads = managementObj["NumberOfLogicalProcessors"]?.ToString() ?? string.Empty;
+ }
+ }
}
Processor.Data = Processor.Data.TrimEnd('\n', '\r');
}
@@ -312,14 +344,20 @@ namespace GTweak.Utilities.Configuration
return (false, string.Empty, string.Empty);
}
-
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name, AdapterRAM, PNPDeviceID from Win32_VideoController", new EnumerationOptions { ReturnImmediately = true }).Get())
+ using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select Name, AdapterRAM, PNPDeviceID from Win32_VideoController", new EnumerationOptions { ReturnImmediately = true }))
{
- string data = managementObj["Name"] as string ?? string.Empty;
- (bool isFound, string dataMemoryReg, string driverDesc) = GetMemorySize(data);
- Graphics += $"{(data == null && !string.IsNullOrEmpty(driverDesc) ? driverDesc : data)}, {(isFound && !string.IsNullOrEmpty(dataMemoryReg) ? dataMemoryReg : managementObj["AdapterRAM"] is uint valueRAM && managementObj["AdapterRAM"] != null ? SizeCalculationHelper(valueRAM) : "N/A")}\n";
- VendorDetection.Nvidia |= managementObj["PNPDeviceID"]?.ToString().IndexOf("VEN_10DE", StringComparison.OrdinalIgnoreCase) >= 0;
+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
+ {
+ using (managementObj)
+ {
+ string data = managementObj["Name"] as string ?? string.Empty;
+ (bool isFound, string dataMemoryReg, string driverDesc) = GetMemorySize(data);
+ Graphics += $"{(string.IsNullOrEmpty(data) && !string.IsNullOrEmpty(driverDesc) ? driverDesc : data)}, {(isFound && !string.IsNullOrEmpty(dataMemoryReg) ? dataMemoryReg : managementObj["AdapterRAM"] is uint valueRAM && managementObj["AdapterRAM"] != null ? SizeCalculationHelper(valueRAM) : "N/A")}\n";
+ VendorDetection.Nvidia |= managementObj["PNPDeviceID"]?.ToString().IndexOf("VEN_10DE", StringComparison.OrdinalIgnoreCase) >= 0;
+ }
+ }
}
+
Graphics = Graphics.TrimEnd('\n', '\r');
}
@@ -329,51 +367,59 @@ namespace GTweak.Utilities.Configuration
/// </summary>
private void GetMemoryInfo()
{
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Manufacturer, Name, Caption, Description, Tag, Capacity, ConfiguredClockSpeed, Speed, SMBIOSMemoryType from Win32_PhysicalMemory", new EnumerationOptions { ReturnImmediately = true }).Get())
+ using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select Manufacturer, Name, Caption, Description, Tag, Capacity, ConfiguredClockSpeed, Speed, SMBIOSMemoryType from Win32_PhysicalMemory", new EnumerationOptions { ReturnImmediately = true }))
{
- string speedData = new[] { "ConfiguredClockSpeed", "Speed" }.Select(prop => managementObj[prop]?.ToString()).FirstOrDefault(s => !string.IsNullOrEmpty(s) && s != "0");
- string data = new[] { "Manufacturer", "Name", "Caption", "Description", "Tag" }.Select(prop => managementObj[prop] as string).FirstOrDefault(value => !string.IsNullOrWhiteSpace(value) && !string.Equals(value, "Unspecified", StringComparison.OrdinalIgnoreCase)) ?? string.Empty;
- string memoryType = (uint)managementObj["SMBIOSMemoryType"] switch
+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
{
- 2 => "DRAM",
- 3 => "EDRAM",
- 4 => "VRAM",
- 5 => "SRAM",
- 6 => "RAM",
- 7 => "ROM",
- 8 => "Flash",
- 9 => "EEPROM",
- 10 => "FEPROM",
- 11 => "EPROM",
- 12 => "CDRAM",
- 13 => "3DRAM",
- 14 => "SDRAM",
- 15 => "SGRAM",
- 16 => "RDRAM",
- 17 => "DDR",
- 18 => "DDR2",
- 19 => "DDR2 FB-DIMM",
- 20 => "Reserved",
- 21 => "Reserved",
- 22 => "FBD2",
- 23 => "DDR3",
- 24 => "DDR3",
- uint type when type == 25 || type == 26 => "DDR4",
- 27 => "LPDDR",
- 28 => "LPDDR2",
- 29 => "LPDDR3",
- 30 => "LPDDR4",
- 31 => "LPDDR4X",
- 32 => "Logical Non-Volatile",
- 33 => "HBM",
- 34 => "DDR5",
- 35 => "LPDDR5",
- 36 => "LPDDR5X",
- _ => string.Empty,
- };
- Memory.Type = memoryType;
- Memory.Data += $"{string.Concat(data, ", ")}{SizeCalculationHelper((ulong)managementObj["Capacity"])}{(string.IsNullOrEmpty(speedData) ? "" : $", {speedData}MHz")}\n";
+ using (managementObj)
+ {
+ string speedData = new string[] { "ConfiguredClockSpeed", "Speed" }.Select(prop => managementObj[prop]?.ToString()).FirstOrDefault(s => !string.IsNullOrEmpty(s) && s != "0");
+ string data = new string[] { "Manufacturer", "Name", "Caption", "Description", "Tag" }.Select(prop => managementObj[prop] as string).FirstOrDefault(value => !string.IsNullOrWhiteSpace(value) && !string.Equals(value, "Unspecified", StringComparison.OrdinalIgnoreCase)) ?? string.Empty;
+ string memoryType = (uint)managementObj["SMBIOSMemoryType"] switch
+ {
+ 2 => "DRAM",
+ 3 => "EDRAM",
+ 4 => "VRAM",
+ 5 => "SRAM",
+ 6 => "RAM",
+ 7 => "ROM",
+ 8 => "Flash",
+ 9 => "EEPROM",
+ 10 => "FEPROM",
+ 11 => "EPROM",
+ 12 => "CDRAM",
+ 13 => "3DRAM",
+ 14 => "SDRAM",
+ 15 => "SGRAM",
+ 16 => "RDRAM",
+ 17 => "DDR",
+ 18 => "DDR2",
+ 19 => "DDR2 FB-DIMM",
+ 20 => "Reserved",
+ 21 => "Reserved",
+ 22 => "FBD2",
+ 23 => "DDR3",
+ 24 => "DDR3",
+ uint type when type == 25 || type == 26 => "DDR4",
+ 27 => "LPDDR",
+ 28 => "LPDDR2",
+ 29 => "LPDDR3",
+ 30 => "LPDDR4",
+ 31 => "LPDDR4X",
+ 32 => "Logical Non-Volatile",
+ 33 => "HBM",
+ 34 => "DDR5",
+ 35 => "LPDDR5",
+ 36 => "LPDDR5X",
+ _ => string.Empty,
+ };
+
+ Memory.Type = memoryType;
+ Memory.Data += $"{string.Concat(data, ", ")}{SizeCalculationHelper((ulong)managementObj["Capacity"])}{(string.IsNullOrEmpty(speedData) ? "" : $", {speedData}MHz")}\n";
+ }
+ }
}
+
Memory.Data = Memory.Data.TrimEnd('\n', '\r');
}
@@ -423,26 +469,35 @@ namespace GTweak.Utilities.Configuration
if (isMsftAvailable)
{
- foreach (var managementObj in new ManagementObjectSearcher(@"root\microsoft\windows\storage", "select DeviceId, FriendlyName, Model, Description, MediaType, Size, BusType from MSFT_PhysicalDisk", new EnumerationOptions { ReturnImmediately = true }).Get())
+ using ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\microsoft\windows\storage", "select DeviceId, FriendlyName, Model, Description, MediaType, Size, BusType from MSFT_PhysicalDisk", new EnumerationOptions { ReturnImmediately = true });
+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
{
- string data = new[] { "FriendlyName", "Model", "Description" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty;
- ushort mediaType = managementObj["MediaType"] is IConvertible m ? Convert.ToUInt16(m) : (ushort)0;
- ushort busType = managementObj["BusType"] is IConvertible b ? Convert.ToUInt16(b) : (ushort)0;
- string storageType = GetStorageType(mediaType, $@"\\.\PhysicalDrive{managementObj["DeviceId"]?.ToString() ?? "0"}", busType, default);
+ using (managementObj)
+ {
+ string data = new string[] { "FriendlyName", "Model", "Description" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty;
+ ushort mediaType = managementObj["MediaType"] is IConvertible m ? Convert.ToUInt16(m) : (ushort)0;
+ ushort busType = managementObj["BusType"] is IConvertible b ? Convert.ToUInt16(b) : (ushort)0;
+ string storageType = GetStorageType(mediaType, $@"\\.\PhysicalDrive{managementObj["DeviceId"]?.ToString() ?? "0"}", busType, default);
- result.AppendLine($"{SizeCalculationHelper((ulong)managementObj["Size"])} [{data}] {storageType}");
+ result.AppendLine($"{SizeCalculationHelper((ulong)managementObj["Size"])} [{data}] {storageType}");
+ }
}
+
}
else
{
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select DeviceID, Model, Caption, Size, MediaType, InterfaceType from Win32_DiskDrive", new EnumerationOptions { ReturnImmediately = true }).Get())
+ using ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select DeviceID, Model, Caption, Size, MediaType, InterfaceType from Win32_DiskDrive", new EnumerationOptions { ReturnImmediately = true });
+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
{
- string data = new[] { "Model", "Caption" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty;
- string mediaType = managementObj["MediaType"]?.ToString() ?? string.Empty;
- string interfaceType = managementObj["InterfaceType"].ToString() ?? string.Empty;
- string storageType = GetStorageType(mediaType, managementObj["DeviceID"] as string ?? string.Empty, default, interfaceType);
+ using (managementObj)
+ {
+ string data = new string[] { "Model", "Caption" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty;
+ string mediaType = managementObj["MediaType"]?.ToString() ?? string.Empty;
+ string interfaceType = managementObj["InterfaceType"]?.ToString() ?? string.Empty;
+ string storageType = GetStorageType(mediaType, managementObj["DeviceID"] as string ?? string.Empty, default, interfaceType);
- result.AppendLine($"{SizeCalculationHelper((ulong)managementObj["Size"])} [{data}] {storageType}");
+ result.AppendLine($"{SizeCalculationHelper((ulong)managementObj["Size"])} [{data}] {storageType}");
+ }
}
}
@@ -508,18 +563,21 @@ namespace GTweak.Utilities.Configuration
{
foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
{
- (bool isUsbDevice, string data) = IsUsbAudioDevice(managementObj["DeviceID"].ToString());
-
- if (isUsbDevice && !string.IsNullOrEmpty(data))
+ using (managementObj)
{
- result.AppendLine(data);
- }
- else
- {
- result.AppendLine(new[] { "Name", "Caption", "Description" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty);
- }
+ (bool isUsbDevice, string data) = IsUsbAudioDevice(managementObj["DeviceID"].ToString());
- VendorDetection.Realtek |= managementObj["PNPDeviceID"]?.ToString().IndexOf("VEN_10EC", StringComparison.OrdinalIgnoreCase) >= 0;
+ if (isUsbDevice && !string.IsNullOrEmpty(data))
+ {
+ result.AppendLine(data);
+ }
+ else
+ {
+ result.AppendLine(new string[] { "Name", "Caption", "Description" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty);
+ }
+
+ VendorDetection.Realtek |= managementObj["PNPDeviceID"]?.ToString().IndexOf("VEN_10EC", StringComparison.OrdinalIgnoreCase) >= 0;
+ }
}
}
@@ -546,9 +604,15 @@ namespace GTweak.Utilities.Configuration
{
StringBuilder result = new StringBuilder();
- 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())
+ using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select Name, Description, ProductName, Manufacturer from Win32_NetworkAdapter where NetConnectionStatus=2 or NetConnectionStatus=7", new EnumerationOptions { ReturnImmediately = true }))
{
- result.AppendLine(new[] { "Name", "Description", "ProductName", "Manufacturer" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty);
+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
+ {
+ using (managementObj)
+ {
+ result.AppendLine(new string[] { "Name", "Description", "ProductName", "Manufacturer" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty);
+ }
+ }
}
return result.ToString().TrimEnd('\n', '\r');
diff --git a/.Source/GTweak/Utilities/Controls/SettingsEngine.cs b/.Source/GTweak/Utilities/Controls/SettingsEngine.cs
index 10659dbe..f4bb9416 100644
--- a/.Source/GTweak/Utilities/Controls/SettingsEngine.cs
+++ b/.Source/GTweak/Utilities/Controls/SettingsEngine.cs
@@ -68,7 +68,7 @@ namespace GTweak.Utilities.Controls
{
foreach (var kv in _defaultSettings)
{
- if (RegistryHelp.ValueExists(PathLocator.Registry.BaseKey, kv.Key))
+ if (RegistryHelp.ValueExists(PathLocator.Registry.BaseKey, kv.Key) == false)
{
ChangingParameters(kv.Key, kv.Value);
}
diff --git a/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs b/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs
index 29b7c235..366c81c9 100644
--- a/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs
+++ b/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs
@@ -79,7 +79,7 @@ namespace GTweak.Utilities.Helpers
GrantAdministratorsAccess($"{GeneralRegistry(registrykey)}{subkey}", SE_OBJECT_TYPE.SE_REGISTRY_KEY);
}
- RegistryKey registryFolder = registrykey.OpenSubKey(subkey, true);
+ using RegistryKey registryFolder = registrykey.OpenSubKey(subkey, true);
if (registryFolder != null)
{
@@ -95,26 +95,27 @@ namespace GTweak.Utilities.Helpers
}).GetAwaiter().GetResult();
}
- internal static bool KeyExists(in RegistryKey registrykey, in string subkey, in bool isNegation = true)
+ internal static bool KeyExists(RegistryKey registryKey, string subKey, bool invert = false)
{
- bool result = registrykey.OpenSubKey(subkey) != null;
- return isNegation ? result : !result;
+ using RegistryKey opened = registryKey.OpenSubKey(subKey);
+ bool result = opened != null;
+ return invert ? !result : result;
}
- internal static bool ValueExists(string subKey, string valueName, in bool isNegation = true)
+ internal static bool ValueExists(string subKey, string valueName, bool invert = false)
{
- bool result = (Registry.GetValue(subKey, valueName, null) ?? null) == null;
- return isNegation ? result : !result;
+ bool result = Registry.GetValue(subKey, valueName, null) != null;
+ return invert ? !result : result;
}
- internal static bool CheckValue(in string subkey, in string valueName, in string expectedValue, in bool isNegation = true)
+ internal static bool CheckValue(string subKey, string valueName, string expectedValue, bool invert = false)
{
- string value = Registry.GetValue(subkey, valueName, null)?.ToString();
- bool result = value != null && value == expectedValue;
- return isNegation ? !result : result;
+ string value = Registry.GetValue(subKey, valueName, null)?.ToString();
+ bool result = !string.Equals(value, expectedValue, StringComparison.OrdinalIgnoreCase);
+ return invert ? !result : result;
}
- internal static bool CheckValueBytes(in string subkey, in string valueName, in string expectedValue)
+ internal static bool CheckValueBytes(string subkey, string valueName, string expectedValue)
{
if (!(Registry.GetValue(subkey, valueName, null) is byte[]))
{
@@ -124,7 +125,7 @@ namespace GTweak.Utilities.Helpers
return string.Concat(Registry.GetValue(subkey, valueName, null) as byte[] ?? Array.Empty<byte>()) != expectedValue;
}
- internal static T GetValue<T>(in string subKey, in string valueName, in T defaultValue)
+ internal static T GetValue<T>(string subKey, string valueName, T defaultValue)
{
try { return (T)Convert.ChangeType(Registry.GetValue(subKey, valueName, defaultValue), typeof(T)); }
catch { return defaultValue; }
diff --git a/.Source/GTweak/Utilities/Maintenance/SystemRestoreService.cs b/.Source/GTweak/Utilities/Maintenance/SystemRestoreService.cs
index e14204e6..5a4e8277 100644
--- a/.Source/GTweak/Utilities/Maintenance/SystemRestoreService.cs
+++ b/.Source/GTweak/Utilities/Maintenance/SystemRestoreService.cs
@@ -1,5 +1,6 @@
using System;
using System.IO;
+using System.Linq;
using System.Management;
using System.Runtime.InteropServices;
using System.Windows;
@@ -32,11 +33,17 @@ namespace GTweak.Utilities.Maintenance
EnableRestorePoint();
}
- foreach (var managementObj in new ManagementObjectSearcher(@"\\localhost\root\default", "SELECT Description, SequenceNumber FROM SystemRestore", new EnumerationOptions { ReturnImmediately = true }).Get())
+ using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"\\localhost\root\default", "SELECT Description, SequenceNumber FROM SystemRestore", new EnumerationOptions { ReturnImmediately = true }))
{
- if (managementObj["Description"].ToString().IndexOf("GTweak", StringComparison.OrdinalIgnoreCase) >= 0)
+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
{
- SRRemoveRestorePoint(Convert.ToInt32(managementObj["SequenceNumber"]));
+ using (managementObj)
+ {
+ if (managementObj["Description"]?.ToString().IndexOf("GTweak", StringComparison.OrdinalIgnoreCase) >= 0)
+ {
+ SRRemoveRestorePoint(Convert.ToInt32(managementObj["SequenceNumber"]));
+ }
+ }
}
}
@@ -82,9 +89,15 @@ namespace GTweak.Utilities.Maintenance
RegistryHelp.DeleteValue(Registry.LocalMachine, @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SPP\Clients", "{09F7EDC5-294E-4180-AF6A-FB0E6A0E9513}");
- foreach (var managementObj in new ManagementObjectSearcher(@"\\localhost\root\default", "SELECT SequenceNumber FROM SystemRestore", new EnumerationOptions { ReturnImmediately = true }).Get())
+ using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"\\localhost\root\default", "SELECT SequenceNumber FROM SystemRestore", new EnumerationOptions { ReturnImmediately = true }))
{
- SRRemoveRestorePoint(Convert.ToInt32(managementObj["SequenceNumber"].ToString()));
+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
+ {
+ using (managementObj)
+ {
+ SRRemoveRestorePoint(Convert.ToInt32(managementObj["SequenceNumber"]?.ToString()));
+ }
+ }
}
DisableSR(PathLocator.Folders.SystemDrive + @"\\");
diff --git a/.Source/GTweak/Utilities/Maintenance/WindowsLicense.cs b/.Source/GTweak/Utilities/Maintenance/WinLicenseHandler.cs
similarity index 80%
rename from .Source/GTweak/Utilities/Maintenance/WindowsLicense.cs
rename to .Source/GTweak/Utilities/Maintenance/WinLicenseHandler.cs
index ade9b796..b8eaee00 100644
--- a/.Source/GTweak/Utilities/Maintenance/WindowsLicense.cs
+++ b/.Source/GTweak/Utilities/Maintenance/WinLicenseHandler.cs
@@ -17,20 +17,25 @@ using Microsoft.Win32;
namespace GTweak.Utilities.Maintenance
{
- internal sealed class WindowsLicense : WinKeyStorage
+ internal sealed class WinLicenseHandler : WinKeyStorage
{
internal static bool IsWindowsActivated = false;
- private static bool IsVersionWindows(string pattern, byte words) => new Regex(pattern, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled).Matches(HardwareData.OS.Name).Count == words;
+ private static bool IsKeyExists(string pattern, byte words) => new Regex(pattern, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled).Matches(HardwareData.OS.Name).Count == words;
internal static async void LicenseStatus()
{
try
{
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "SELECT LicenseStatus FROM SoftwareLicensingProduct WHERE ApplicationID = '55c92734-d682-4d71-983e-d6ec3f16059f' and LicenseStatus = 1").Get())
+ using ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "SELECT LicenseStatus FROM SoftwareLicensingProduct WHERE ApplicationID = '55c92734-d682-4d71-983e-d6ec3f16059f' and LicenseStatus = 1");
+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
{
- IsWindowsActivated = (uint)managementObj["LicenseStatus"] == 1;
+ using (managementObj)
+ {
+ IsWindowsActivated = (uint)managementObj["LicenseStatus"] == 1;
+ }
}
+
}
catch (COMException)
{
@@ -46,8 +51,8 @@ namespace GTweak.Utilities.Maintenance
internal static async Task StartActivation()
{
- string keyWinHWID = keysHWID.FirstOrDefault(k => IsVersionWindows(k.Key.pattern, k.Key.words)).Value ?? string.Empty;
- string keyWinKMS = keysKMS.FirstOrDefault(k => IsVersionWindows(k.Key.pattern, k.Key.words)).Value ?? string.Empty;
+ string keyWinHWID = keysHWID.FirstOrDefault(k => IsKeyExists(k.Key.pattern, k.Key.words)).Value ?? string.Empty;
+ string keyWinKMS = keysKMS.FirstOrDefault(k => IsKeyExists(k.Key.pattern, k.Key.words)).Value ?? string.Empty;
if (string.IsNullOrEmpty(keyWinHWID) && string.IsNullOrEmpty(keyWinKMS))
{
@@ -64,7 +69,7 @@ namespace GTweak.Utilities.Maintenance
{
if (HardwareData.OS.IsWin10)
{
- await CommandExecutor.InvokeRunCommand(@"/c assoc .vbs=VBSFile & ftype VBSFile=""%SystemRoot%\System32\WScript.exe"" ""%1"" %*""");
+ await CommandExecutor.InvokeRunCommand("/c " + CommandExecutor.CleanCommand(string.Join(" & ", new[] { "assoc .vbs=VBSFile", "ftype VBSFile=\"%SystemRoot%\\System32\\WScript.exe\" \"%1\" %*" })));
}
await CommandExecutor.InvokeRunCommand($"/c slmgr.vbs //b /ipk {keyWinHWID}");
diff --git a/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs b/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs
index 3cbdcec9..3b82f089 100644
--- a/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs
+++ b/.Source/GTweak/Utilities/Tweaks/InterfaceTweaks.cs
@@ -32,7 +32,7 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Desktop\WindowMetrics", "CaptionWidth", "-270");
_сontrolWriter.Button[4] =
- RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Desktop", "CursorBlinkRate", "530", false);
+ RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Desktop", "CursorBlinkRate", "530", true);
_сontrolWriter.Button[5] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Control Panel\Desktop\WindowMetrics", "ScrollHeight", "-210") ||
@@ -60,7 +60,7 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.CheckValueBytes(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer", "link", "0000");
_сontrolWriter.Button[13] =
- RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\NewStartPanel", "{20D04FE0-3AEA-1069-A2D8-08002B30309D}", "0", false);
+ RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\NewStartPanel", "{20D04FE0-3AEA-1069-A2D8-08002B30309D}", "0", true);
_сontrolWriter.Button[14] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\NewStartPanel", "{645FF040-5081-101B-9F08-00AA002F954E}", "1");
@@ -77,7 +77,7 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Explorer", "HideRecommendedSection", "1")));
_сontrolWriter.Button[17] =
- HardwareData.OS.IsWin11 && RegistryHelp.KeyExists(Registry.CurrentUser, @"Software\Classes\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32", false);
+ HardwareData.OS.IsWin11 && RegistryHelp.KeyExists(Registry.CurrentUser, @"Software\Classes\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32", true);
_сontrolWriter.Button[18] =
HardwareData.OS.IsWin11 &&
@@ -85,7 +85,7 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\UserProfileEngagement", "ScoobeSystemSettingEnabled", "0"));
_сontrolWriter.Button[19] =
- HardwareData.OS.IsWin11 && RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "UseCompactMode", "1", false);
+ HardwareData.OS.IsWin11 && RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "UseCompactMode", "1", true);
_сontrolWriter.Button[20] =
HardwareData.OS.IsWin11 &&
@@ -98,7 +98,7 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsAI", "DisableAIDataAnalysis", "1"));
_сontrolWriter.Button[21] =
- HardwareData.OS.IsWin11 && RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\TaskbarDeveloperSettings", "TaskbarEndTask", "1", false);
+ HardwareData.OS.IsWin11 && RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\TaskbarDeveloperSettings", "TaskbarEndTask", "1", true);
_сontrolWriter.Button[22] =
HardwareData.OS.IsWin11 && RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "EnableSnapAssistFlyout", "0");
@@ -139,7 +139,7 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager", "SubscribedContent-310093Enabled", "0"));
_сontrolWriter.Button[25] =
- RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "PersistBrowsers", "0", false);
+ RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced", "PersistBrowsers", "0", true);
_сontrolWriter.Button[26] =
RegistryHelp.CheckValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\PushNotifications", "ToastEnabled", "0") ||
diff --git a/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs b/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
index 7450102f..609723c4 100644
--- a/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
+++ b/.Source/GTweak/Utilities/Tweaks/SystemTweaks.cs
@@ -171,8 +171,8 @@ namespace GTweak.Utilities.Tweaks
_сontrolWriter.Button[25] = _isTickState;
_сontrolWriter.Button[26] =
- RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PCHC", "PreviousUninstall", "1", false) ||
- RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PCHealthCheck", "installed", "1", false);
+ RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PCHC", "PreviousUninstall", "1", true) ||
+ RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\PCHealthCheck", "installed", "1", true);
_сontrolWriter.Button[27] = IsTaskEnabled(winInsiderTasks);
@@ -186,8 +186,9 @@ namespace GTweak.Utilities.Tweaks
{
try
{
- using var managementObj = new ManagementObjectSearcher("SELECT DeviceID FROM Win32_PnPEntity WHERE Service='BthLEEnum'").Get();
- _isBluetoothStatus = managementObj.Cast<ManagementObject>().Any();
+ using ManagementObjectCollection managementObjCollection = new ManagementObjectSearcher("SELECT DeviceID FROM Win32_PnPEntity WHERE Service='BthLEEnum'").Get();
+ _isBluetoothStatus = managementObjCollection.Cast<ManagementObject>().Any();
+
}
catch { _isBluetoothStatus = false; }
}
@@ -539,31 +540,39 @@ namespace GTweak.Utilities.Tweaks
{
if (isDisabled)
{
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2\power", "SELECT InstanceID FROM Win32_PowerPlan WHERE IsActive=false").Get())
+ using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2\power", "SELECT InstanceID FROM Win32_PowerPlan WHERE IsActive=false"))
{
- searchScheme = Regex.Match(Convert.ToString(managementObj["InstanceID"]), @"\{([^)]*)\}").Groups[1].Value;
-
- if (RegistryHelp.GetValue($@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\{searchScheme}", "Description", string.Empty).Contains("-18") &&
- RegistryHelp.GetValue($@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\{searchScheme}", "FriendlyName", string.Empty).Contains("-19"))
+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
{
- _currentPowerGuid = searchScheme;
-
- using (_powercfg)
+ using (managementObj)
{
- _powercfg.StartInfo.Arguments = $"/setactive {searchScheme}";
- _powercfg.Start();
+ searchScheme = Regex.Match(Convert.ToString(managementObj["InstanceID"]), @"\{([^)]*)\}").Groups[1].Value;
+
+ if (RegistryHelp.GetValue($@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\{searchScheme}", "Description", string.Empty).Contains("-18") &&
+ RegistryHelp.GetValue($@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\{searchScheme}", "FriendlyName", string.Empty).Contains("-19"))
+ {
+ _currentPowerGuid = searchScheme;
+
+ using (_powercfg)
+ {
+ _powercfg.StartInfo.Arguments = $"/setactive {searchScheme}";
+ _powercfg.Start();
- _powercfg.StartInfo.Arguments = unlockFrequency;
- _powercfg.Start();
+ _powercfg.StartInfo.Arguments = unlockFrequency;
+ _powercfg.Start();
+ }
+
+ break;
+ }
+ else
+ {
+ searchScheme = string.Empty;
+ }
}
- break;
- }
- else
- {
- searchScheme = string.Empty;
}
}
+
if (string.IsNullOrEmpty(searchScheme))
{
ArchiveManager.Unarchive(PathLocator.Files.PowPlan, Properties.Resources.UltPower);
@@ -593,20 +602,27 @@ namespace GTweak.Utilities.Tweaks
string activeScheme = @"Microsoft:PowerPlan\\{" + RegistryHelp.GetValue($@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\{searchScheme}", "ActivePowerScheme", string.Empty) + "}";
string selectedScheme = string.Empty, backupScheme = string.Empty;
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2\power", "SELECT InstanceID FROM Win32_PowerPlan WHERE InstanceID !='" + activeScheme + "'").Get())
+ using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2\power", "SELECT InstanceID FROM Win32_PowerPlan WHERE InstanceID !='" + activeScheme + "'"))
{
- searchScheme = Regex.Match(Convert.ToString(managementObj["InstanceID"]), @"\{([^)]*)\}").Groups[1].Value;
-
- if (!RegistryHelp.GetValue($@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\{searchScheme}", "Description", string.Empty).Contains("-10") &&
- !RegistryHelp.GetValue($@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\{searchScheme}", "FriendlyName", string.Empty).Contains("-11"))
+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
{
- selectedScheme = searchScheme;
- break;
- }
+ using (managementObj)
+ {
+ searchScheme = Regex.Match(Convert.ToString(managementObj["InstanceID"]), @"\{([^)]*)\}").Groups[1].Value;
- backupScheme ??= searchScheme;
+ if (!RegistryHelp.GetValue($@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\{searchScheme}", "Description", string.Empty).Contains("-10") &&
+ !RegistryHelp.GetValue($@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Power\User\PowerSchemes\{searchScheme}", "FriendlyName", string.Empty).Contains("-11"))
+ {
+ selectedScheme = searchScheme;
+ break;
+ }
+
+ backupScheme ??= searchScheme;
+ }
+ }
}
+
selectedScheme ??= backupScheme;
if (!string.IsNullOrEmpty(selectedScheme))
diff --git a/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs b/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
index 6953e832..51915769 100644
--- a/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
+++ b/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
@@ -208,7 +208,7 @@ namespace GTweak.Utilities.Tweaks
RegistryHelp.Write(Registry.CurrentUser, @"Software\Microsoft\Windows\CurrentVersion\Windows Search", "CortanaConsent", 0, RegistryValueKind.DWord);
break;
case "Phone":
- if (RegistryHelp.KeyExists(Registry.ClassesRoot, @"*\shellex\ContextMenuHandlers\ModernSharing", false))
+ if (RegistryHelp.KeyExists(Registry.ClassesRoot, @"*\shellex\ContextMenuHandlers\ModernSharing", true))
{
RegistryHelp.DeleteFolderTree(Registry.ClassesRoot, @"*\shellex\ContextMenuHandlers\SendTo");
RegistryHelp.DeleteFolderTree(Registry.ClassesRoot, @"*\shellex\ContextMenuHandlers\ModernShare");
diff --git a/.Source/GTweak/View/InterfaceView.xaml.cs b/.Source/GTweak/View/InterfaceView.xaml.cs
index 7c3de0eb..1e31300f 100644
--- a/.Source/GTweak/View/InterfaceView.xaml.cs
+++ b/.Source/GTweak/View/InterfaceView.xaml.cs
@@ -17,7 +17,7 @@ namespace GTweak.View
{
InitializeComponent();
- if (!WindowsLicense.IsWindowsActivated)
+ if (!WinLicenseHandler.IsWindowsActivated)
{
NotificationManager.Show("info", "warn_activate_noty").Perform();
}
diff --git a/.Source/GTweak/View/UtilsView.xaml.cs b/.Source/GTweak/View/UtilsView.xaml.cs
index 895ecc74..34bbb020 100644
--- a/.Source/GTweak/View/UtilsView.xaml.cs
+++ b/.Source/GTweak/View/UtilsView.xaml.cs
@@ -26,7 +26,7 @@ namespace GTweak.View
private async void BtnLicenseWindows_ClickButton(object sender, EventArgs e)
{
- if (WindowsLicense.IsWindowsActivated)
+ if (WinLicenseHandler.IsWindowsActivated)
{
NotificationManager.Show("info", "ready_activate_noty").Perform();
}
@@ -34,7 +34,7 @@ namespace GTweak.View
{
if (new SystemDiagnostics().IsNetworkAvailable())
{
- await WindowsLicense.StartActivation();
+ await WinLicenseHandler.StartActivation();
}
else
{
diff --git a/.Source/GTweak/Windows/LoadingWindow.xaml.cs b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
index a7bbe923..0d1476ee 100644
--- a/.Source/GTweak/Windows/LoadingWindow.xaml.cs
+++ b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
@@ -53,7 +53,7 @@ namespace GTweak.Windows
}
ExecuteWithLogging(TrustedInstaller.StartTrustedInstallerService, nameof(TrustedInstaller.StartTrustedInstallerService));
- ExecuteWithLogging(WindowsLicense.LicenseStatus, nameof(WindowsLicense.LicenseStatus));
+ ExecuteWithLogging(WinLicenseHandler.LicenseStatus, nameof(WinLicenseHandler.LicenseStatus));
ExecuteWithLogging(() => _systemDiagnostics.GetHardwareData(), nameof(_systemDiagnostics.GetHardwareData));
ExecuteWithLogging(_systemDiagnostics.ValidateVersionUpdates, nameof(_systemDiagnostics.ValidateVersionUpdates));
ExecuteWithLogging(_uninstallingPakages.GetInstalledPackages, nameof(_uninstallingPakages.GetInstalledPackages));