Skip to content

Portable Tool for an Ideal Windows Setup

-added summary & waiting to receive information about windows + re

Greedeks74cfa7e854d5
diff --git a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
index f1b54164..0e677331 100644
--- a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
+++ b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
@@ -87,7 +87,6 @@ namespace GTweak.Utilities.Configuration
internal void GetHardwareData()
{
Parallel.Invoke(
- GetOperatingSystemInfo,
GetBiosInfo,
GetMotherboardInfo,
GetProcessorInfo,
@@ -107,13 +106,26 @@ namespace GTweak.Utilities.Configuration
);
}
- private void GetOperatingSystemInfo()
+ internal void GetOperatingSystemInfo()
{
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Caption, OSArchitecture, Version from Win32_OperatingSystem", new EnumerationOptions { ReturnImmediately = true }).Get())
- HardwareData["Windows"] = $"{Convert.ToString(managementObj["Caption"]).Substring(Convert.ToString(managementObj["Caption"]).IndexOf('W'))}, {Regex.Replace((string)managementObj["OSArchitecture"], @"\-.+", "-bit")}, V{(string)managementObj["Version"]}\n";
+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Caption, OSArchitecture, BuildNumber, Version from Win32_OperatingSystem", new EnumerationOptions { ReturnImmediately = true }).Get())
+ {
+ WindowsClientVersion = Convert.ToString(managementObj["Caption"]);
+ WindowsBuildVersion = Convert.ToString(managementObj["BuildNumber"]);
+ HardwareData["Windows"] = $"{WindowsClientVersion.Substring(WindowsClientVersion.IndexOf('W'))}, {Regex.Replace((string)managementObj["OSArchitecture"], @"\-.+", "-bit")}, V{(string)managementObj["Version"]}\n";
+ IsWindowsVersion = new Dictionary<byte, bool>()
+ {
+ { 11, WindowsClientVersion.Contains("11") },
+ { 10, WindowsClientVersion.Contains("10") }
+ };
+ }
HardwareData["Windows"] = $"\n{HardwareData["Windows"].TrimEnd('\n')}";
}
+ /// <summary>
+ /// If the manufacturer did not provide a serial number and the obtained value is "Default string",
+ /// then the serial number will not be displayed, similar to the situation with the motherboard.
+ /// </summary>
private async void GetBiosInfo()
{
string output = await CommandExecutor.GetCommandOutput("bcdedit");
@@ -214,6 +226,10 @@ namespace GTweak.Utilities.Configuration
HardwareData["GPU"] = HardwareData["GPU"].TrimEnd('\n');
}
+ /// <summary>
+ /// The Win32_PhysicalMemory class has a limitation in retrieving the memory name and speed. In these cases, the values will be "Unknown" and "0".
+ /// Under these circumstances, the memory type will be displayed instead of the name, and the speed will not be shown.
+ /// </summary>
private void GetMemoryInfo()
{
foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Manufacturer, Capacity, ConfiguredClockSpeed, Speed, SMBIOSMemoryType from Win32_PhysicalMemory", new EnumerationOptions { ReturnImmediately = true }).Get())
diff --git a/.Source/GTweak/Utilities/Control/BlockRunTweaker.cs b/.Source/GTweak/Utilities/Control/BlockRunTweaker.cs
index 4aa6e7ba..c81787d4 100644
--- a/.Source/GTweak/Utilities/Control/BlockRunTweaker.cs
+++ b/.Source/GTweak/Utilities/Control/BlockRunTweaker.cs
@@ -1,10 +1,8 @@
using GTweak.Utilities.Configuration;
using GTweak.Windows;
using System;
-using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
-using System.Management;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;
@@ -46,21 +44,9 @@ namespace GTweak.Utilities.Control
internal static void CheckingSystemRequirements()
{
- Parallel.Invoke(() =>
- {
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Caption, Version, BuildNumber from Win32_OperatingSystem", new EnumerationOptions { ReturnImmediately = true }).Get())
- {
- SystemDiagnostics.WindowsClientVersion = Convert.ToString(managementObj["Caption"]);
- SystemDiagnostics.WindowsBuildVersion = Convert.ToString(managementObj["BuildNumber"]);
- SystemDiagnostics.IsWindowsVersion = new Dictionary<byte, bool>()
- {
- { 11, SystemDiagnostics.WindowsClientVersion.Contains("11") },
- { 10, SystemDiagnostics.WindowsClientVersion.Contains("10") }
- }; ;
- }
- });
+ Task.Run(delegate { new SystemDiagnostics().GetOperatingSystemInfo(); }).Wait();
- if ((SystemDiagnostics.IsWindowsVersion[11] || SystemDiagnostics.IsWindowsVersion[10]) && SystemDiagnostics.WindowsBuildVersion.CompareTo("18362.116") > 0) return;
+ if ((SystemDiagnostics.IsWindowsVersion[11] || SystemDiagnostics.IsWindowsVersion[10]) && SystemDiagnostics.WindowsBuildVersion.CompareTo("18362.116") >= 0) return;
new MessageWindow(true).ShowDialog();
}
}