Skip to content

Portable Tool for an Ideal Windows Setup

add chipset detection via registry

Greedeks5e31e109c241
diff --git a/.Source/GTweak/Core/ViewModel/DataSystemViewModel.cs b/.Source/GTweak/Core/ViewModel/DataSystemViewModel.cs
index e0258092..05d83535 100644
--- a/.Source/GTweak/Core/ViewModel/DataSystemViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/DataSystemViewModel.cs
@@ -85,7 +85,8 @@ namespace GTweak.Core.ViewModel
CreateModelCollection("Services", () => HardwareData.RunningServicesCount, isUpdatable: true),
CreateModelCollection("Bios", () => HardwareData.Bios.Data, FallbackKeys.NoDevice),
CreateModelCollection("Mode", () => HardwareData.Bios.Mode, FallbackKeys.Unknown),
- CreateModelCollection("Motherboard", () => HardwareData.Motherboard, FallbackKeys.NoDevice),
+ CreateModelCollection("Motherboard", () => HardwareData.Motherboard.Data, FallbackKeys.NoDevice),
+ CreateModelCollection("Chipset", () => HardwareData.Motherboard.Chipset, FallbackKeys.Unknown),
CreateModelCollection("Processor", () => HardwareData.Processor.Data, FallbackKeys.NoDevice),
CreateModelCollection("Cores", () => HardwareData.Processor.Cores, FallbackKeys.Unknown),
CreateModelCollection("Threads", () => HardwareData.Processor.Threads, FallbackKeys.Unknown),
diff --git a/.Source/GTweak/Languages/en/Localize.xaml b/.Source/GTweak/Languages/en/Localize.xaml
index 1a8e014a..a934ee25 100644
--- a/.Source/GTweak/Languages/en/Localize.xaml
+++ b/.Source/GTweak/Languages/en/Localize.xaml
@@ -513,6 +513,7 @@
<v:String x:Key="title_bios_sysinfo">BIOS:</v:String>
<v:String x:Key="title_mode_sysinfo">Mode:</v:String>
<v:String x:Key="title_motherbr_sysinfo">Motherboard:</v:String>
+ <v:String x:Key="title_chipset_sysinfo">Chipset:</v:String>
<v:String x:Key="title_cpu_sysinfo">Processor:</v:String>
<v:String x:Key="title_cores_sysinfo">Cores:</v:String>
<v:String x:Key="title_threads_sysinfo">Threads:</v:String>
diff --git a/.Source/GTweak/Languages/fr/Localize.xaml b/.Source/GTweak/Languages/fr/Localize.xaml
index 66491c1f..db3f54f7 100644
--- a/.Source/GTweak/Languages/fr/Localize.xaml
+++ b/.Source/GTweak/Languages/fr/Localize.xaml
@@ -514,6 +514,7 @@
<v:String x:Key="title_bios_sysinfo">BIOS :</v:String>
<v:String x:Key="title_mode_sysinfo">Mode :</v:String>
<v:String x:Key="title_motherbr_sysinfo">Carte mère :</v:String>
+ <v:String x:Key="title_chipset_sysinfo">Chipset:</v:String>
<v:String x:Key="title_cpu_sysinfo">Processeur :</v:String>
<v:String x:Key="title_cores_sysinfo">Cœurs :</v:String>
<v:String x:Key="title_threads_sysinfo">Threads :</v:String>
@@ -549,3 +550,4 @@
+
diff --git a/.Source/GTweak/Languages/hu/Localize.xaml b/.Source/GTweak/Languages/hu/Localize.xaml
index bf2ab574..ad860d4a 100644
--- a/.Source/GTweak/Languages/hu/Localize.xaml
+++ b/.Source/GTweak/Languages/hu/Localize.xaml
@@ -513,6 +513,7 @@
<v:String x:Key="title_bios_sysinfo">BIOS:</v:String>
<v:String x:Key="title_mode_sysinfo">Üzemmód:</v:String>
<v:String x:Key="title_motherbr_sysinfo">Alaplap:</v:String>
+ <v:String x:Key="title_chipset_sysinfo">Chipset:</v:String>
<v:String x:Key="title_cpu_sysinfo">Processzor:</v:String>
<v:String x:Key="title_cores_sysinfo">Magok:</v:String>
<v:String x:Key="title_threads_sysinfo">Szálak:</v:String>
@@ -551,3 +552,4 @@
+
diff --git a/.Source/GTweak/Languages/it/Localize.xaml b/.Source/GTweak/Languages/it/Localize.xaml
index 370ecdd8..a82cbfca 100644
--- a/.Source/GTweak/Languages/it/Localize.xaml
+++ b/.Source/GTweak/Languages/it/Localize.xaml
@@ -513,6 +513,7 @@
<v:String x:Key="title_bios_sysinfo">BIOS:</v:String>
<v:String x:Key="title_mode_sysinfo">Modalità:</v:String>
<v:String x:Key="title_motherbr_sysinfo">Scheda madre:</v:String>
+ <v:String x:Key="title_chipset_sysinfo">Chipset:</v:String>
<v:String x:Key="title_cpu_sysinfo">Processore:</v:String>
<v:String x:Key="title_cores_sysinfo">Core:</v:String>
<v:String x:Key="title_threads_sysinfo">Thread:</v:String>
@@ -546,3 +547,4 @@
+
diff --git a/.Source/GTweak/Languages/ko/Localize.xaml b/.Source/GTweak/Languages/ko/Localize.xaml
index fa8ff520..5bc5972d 100644
--- a/.Source/GTweak/Languages/ko/Localize.xaml
+++ b/.Source/GTweak/Languages/ko/Localize.xaml
@@ -513,6 +513,7 @@
<v:String x:Key="title_bios_sysinfo">BIOS:</v:String>
<v:String x:Key="title_mode_sysinfo">모드:</v:String>
<v:String x:Key="title_motherbr_sysinfo">머더보드:</v:String>
+ <v:String x:Key="title_chipset_sysinfo">Chipset:</v:String>
<v:String x:Key="title_cpu_sysinfo">프로세스:</v:String>
<v:String x:Key="title_cores_sysinfo">코어:</v:String>
<v:String x:Key="title_threads_sysinfo">스레드:</v:String>
@@ -546,3 +547,4 @@
+
diff --git a/.Source/GTweak/Languages/pl/Localize.xaml b/.Source/GTweak/Languages/pl/Localize.xaml
index 38d481ef..7de6897a 100644
--- a/.Source/GTweak/Languages/pl/Localize.xaml
+++ b/.Source/GTweak/Languages/pl/Localize.xaml
@@ -513,6 +513,7 @@
<v:String x:Key="title_bios_sysinfo">BIOS:</v:String>
<v:String x:Key="title_mode_sysinfo">Tryb:</v:String>
<v:String x:Key="title_motherbr_sysinfo">Płyta główna:</v:String>
+ <v:String x:Key="title_chipset_sysinfo">Chipset:</v:String>
<v:String x:Key="title_cpu_sysinfo">Procesor:</v:String>
<v:String x:Key="title_cores_sysinfo">Rdzenie:</v:String>
<v:String x:Key="title_threads_sysinfo">Wątki:</v:String>
@@ -555,3 +556,4 @@
+
diff --git a/.Source/GTweak/Languages/pt-BR/Localize.xaml b/.Source/GTweak/Languages/pt-BR/Localize.xaml
index 65b98212..c78adc41 100644
--- a/.Source/GTweak/Languages/pt-BR/Localize.xaml
+++ b/.Source/GTweak/Languages/pt-BR/Localize.xaml
@@ -513,6 +513,7 @@
<v:String x:Key="title_bios_sysinfo">BIOS:</v:String>
<v:String x:Key="title_mode_sysinfo">Modo:</v:String>
<v:String x:Key="title_motherbr_sysinfo">Placa-mãe:</v:String>
+ <v:String x:Key="title_chipset_sysinfo">Chipset:</v:String>
<v:String x:Key="title_cpu_sysinfo">Processador:</v:String>
<v:String x:Key="title_cores_sysinfo">Núcleos:</v:String>
<v:String x:Key="title_threads_sysinfo">Threads:</v:String>
@@ -558,3 +559,4 @@
+
diff --git a/.Source/GTweak/Languages/ru/Localize.xaml b/.Source/GTweak/Languages/ru/Localize.xaml
index f905b22f..75c73536 100644
--- a/.Source/GTweak/Languages/ru/Localize.xaml
+++ b/.Source/GTweak/Languages/ru/Localize.xaml
@@ -513,6 +513,7 @@
<v:String x:Key="title_bios_sysinfo">BIOS:</v:String>
<v:String x:Key="title_mode_sysinfo">Режим:</v:String>
<v:String x:Key="title_motherbr_sysinfo">Материнская плата:</v:String>
+ <v:String x:Key="title_chipset_sysinfo">Чипсет:</v:String>
<v:String x:Key="title_cpu_sysinfo">Процессор:</v:String>
<v:String x:Key="title_cores_sysinfo">Ядра:</v:String>
<v:String x:Key="title_threads_sysinfo">Потоки:</v:String>
@@ -555,3 +556,4 @@
+
diff --git a/.Source/GTweak/Languages/uk/Localize.xaml b/.Source/GTweak/Languages/uk/Localize.xaml
index 0322d309..82b0ba79 100644
--- a/.Source/GTweak/Languages/uk/Localize.xaml
+++ b/.Source/GTweak/Languages/uk/Localize.xaml
@@ -513,6 +513,7 @@
<v:String x:Key="title_bios_sysinfo">BIOS:</v:String>
<v:String x:Key="title_mode_sysinfo">Режим:</v:String>
<v:String x:Key="title_motherbr_sysinfo">Материнська плата:</v:String>
+ <v:String x:Key="title_chipset_sysinfo">Чіпсет:</v:String>
<v:String x:Key="title_cpu_sysinfo">Процесор:</v:String>
<v:String x:Key="title_cores_sysinfo">Ядра:</v:String>
<v:String x:Key="title_threads_sysinfo">Потоки:</v:String>
@@ -555,3 +556,4 @@
+
diff --git a/.Source/GTweak/Languages/zh-CN/Localize.xaml b/.Source/GTweak/Languages/zh-CN/Localize.xaml
index c5fbbd1c..87e3b4fa 100644
--- a/.Source/GTweak/Languages/zh-CN/Localize.xaml
+++ b/.Source/GTweak/Languages/zh-CN/Localize.xaml
@@ -513,11 +513,12 @@
<v:String x:Key="title_bios_sysinfo">BIOS:</v:String>
<v:String x:Key="title_mode_sysinfo">模式:</v:String>
<v:String x:Key="title_motherbr_sysinfo">主板:</v:String>
+ <v:String x:Key="title_chipset_sysinfo">芯片组:</v:String>
<v:String x:Key="title_cpu_sysinfo">处理器:</v:String>
<v:String x:Key="title_cores_sysinfo">核心数:</v:String>
<v:String x:Key="title_threads_sysinfo">运行绪数:</v:String>
<v:String x:Key="title_gpu_sysinfo">显卡:</v:String>
- <v:String x:Key="title_refreshrate_sysinfo">刷新率:</v:String>
+ <v:String x:Key="title_refreshrate_sysinfo">刷新率:</v:String>
<v:String x:Key="title_ram_sysinfo">内存:</v:String>
<v:String x:Key="title_mtype_sysinfo">内存类型:</v:String>
<v:String x:Key="title_storage_sysinfo">存储设备:</v:String>
@@ -555,3 +556,4 @@
+
diff --git a/.Source/GTweak/Languages/zh-TW/Localize.xaml b/.Source/GTweak/Languages/zh-TW/Localize.xaml
index 63d60b63..b313590c 100644
--- a/.Source/GTweak/Languages/zh-TW/Localize.xaml
+++ b/.Source/GTweak/Languages/zh-TW/Localize.xaml
@@ -513,11 +513,12 @@
<v:String x:Key="title_bios_sysinfo">BIOS:</v:String>
<v:String x:Key="title_mode_sysinfo">模式:</v:String>
<v:String x:Key="title_motherbr_sysinfo">主機板:</v:String>
+ <v:String x:Key="title_chipset_sysinfo">晶片組:</v:String>
<v:String x:Key="title_cpu_sysinfo">處理器:</v:String>
<v:String x:Key="title_cores_sysinfo">核心數:</v:String>
<v:String x:Key="title_threads_sysinfo">執行緒數:</v:String>
<v:String x:Key="title_gpu_sysinfo">顯示卡:</v:String>
- <v:String x:Key="title_refreshrate_sysinfo">螢幕刷新率:</v:String>
+ <v:String x:Key="title_refreshrate_sysinfo">螢幕刷新率:</v:String>
<v:String x:Key="title_ram_sysinfo">記憶體:</v:String>
<v:String x:Key="title_mtype_sysinfo">記憶體類型:</v:String>
<v:String x:Key="title_storage_sysinfo">儲存裝置:</v:String>
@@ -557,3 +558,4 @@
+
diff --git a/.Source/GTweak/Utilities/Configuration/HardwareData.cs b/.Source/GTweak/Utilities/Configuration/HardwareData.cs
index 0fe096ae..3f726b87 100644
--- a/.Source/GTweak/Utilities/Configuration/HardwareData.cs
+++ b/.Source/GTweak/Utilities/Configuration/HardwareData.cs
@@ -19,6 +19,12 @@ namespace GTweak.Utilities.Configuration
internal string Mode { get; set; } = string.Empty;
}
+ internal sealed class MotherboardInfo
+ {
+ internal string Data { get; set; } = string.Empty;
+ internal string Chipset { get; set; } = string.Empty;
+ }
+
internal sealed class ProcessorInfo
{
internal string Data { get; set; } = string.Empty;
@@ -49,7 +55,7 @@ namespace GTweak.Utilities.Configuration
internal static string RunningServicesCount { get; set; } = string.Empty;
internal static BiosInfo Bios { get; set; } = new BiosInfo();
internal static ProcessorInfo Processor { get; set; } = new ProcessorInfo();
- internal static string Motherboard { get; set; } = string.Empty;
+ internal static MotherboardInfo Motherboard { get; set; } = new MotherboardInfo();
internal static string Graphics { get; set; } = string.Empty;
internal static string MonitorRefreshRate { get; set; } = string.Empty;
internal static MemoryInfo Memory { get; set; } = new MemoryInfo();
diff --git a/.Source/GTweak/Utilities/Configuration/HardwareProvider.cs b/.Source/GTweak/Utilities/Configuration/HardwareProvider.cs
index 4f9b108e..5d2a8dce 100644
--- a/.Source/GTweak/Utilities/Configuration/HardwareProvider.cs
+++ b/.Source/GTweak/Utilities/Configuration/HardwareProvider.cs
@@ -1,4 +1,5 @@
using System;
+using System.Data;
using System.Globalization;
using System.IO;
using System.Linq;
@@ -206,7 +207,7 @@ namespace GTweak.Utilities.Configuration
private void GetMotherboardInfo()
{
- using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select Manufacturer, Product, Version from Win32_BaseBoard", new EnumerationOptions { ReturnImmediately = true }))
+ using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select Manufacturer, Product, Version, SerialNumber from Win32_BaseBoard", new EnumerationOptions { ReturnImmediately = true }))
{
foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
{
@@ -214,12 +215,60 @@ namespace GTweak.Utilities.Configuration
{
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";
+ string dataSN = managementObj["SerialNumber"]?.ToString() ?? string.Empty;
+ Motherboard.Data = $"{data}".Trim();
+
+ if (!string.IsNullOrWhiteSpace(dataVersion) && !dataVersion.Any(char.IsWhiteSpace))
+ {
+ Motherboard.Data += $", V{dataVersion}";
+ }
+ else if (!string.IsNullOrWhiteSpace(dataSN) && !dataSN.Any(char.IsWhiteSpace))
+ {
+ Motherboard.Data += $", S/N-{dataSN}";
+ }
+
+
+ }
+ }
+ }
+ Motherboard.Data = Motherboard.Data.TrimEnd('\n', '\r');
+
+ bool chipsetFound = false;
+ using RegistryKey baseKey = Registry.LocalMachine.OpenSubKey(@"SYSTEM\CurrentControlSet\Enum\PCI");
+ if (baseKey != null)
+ {
+ foreach (string deviceId in baseKey.GetSubKeyNames())
+ {
+ if (!chipsetFound)
+ {
+ using RegistryKey deviceKey = baseKey.OpenSubKey(deviceId);
+ if (deviceKey != null)
+ {
+ foreach (string subId in deviceKey.GetSubKeyNames())
+ {
+ using RegistryKey subKey = deviceKey.OpenSubKey(subId);
+ string deviceDesc = subKey?.GetValue("DeviceDesc")?.ToString() ?? string.Empty;
+ string friendlyName = subKey?.GetValue("FriendlyName")?.ToString() ?? string.Empty;
+ string targetString = deviceDesc.Contains("LPC") ? deviceDesc : (friendlyName.Contains("LPC") ? friendlyName : string.Empty);
+
+ if (!string.IsNullOrWhiteSpace(targetString))
+ {
+ string chipset = ParseChipset(targetString) ?? string.Empty;
+
+ if (!string.IsNullOrEmpty(chipset))
+ {
+ Motherboard.Chipset = chipset;
+ chipsetFound = true;
+ break;
+ }
+ }
+ }
+ }
}
}
}
- Motherboard = Motherboard.TrimEnd('\n', '\r');
}
+
private void GetProcessorInfo()
{
using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select Name, NumberOfCores, NumberOfLogicalProcessors from Win32_Processor", new EnumerationOptions { ReturnImmediately = true }))
@@ -348,7 +397,6 @@ namespace GTweak.Utilities.Configuration
/// <summary>
/// The MSFT_PhysicalDisk class may be missing or malfunctioning; in such cases, it will be replaced by the universal Win32_DiskDrive class.
/// </summary>
- ///
private (string Data, string FreePercentage, string UsedPercentage) GetStorageDevices()
{
StringBuilder result = new StringBuilder();
@@ -521,6 +569,24 @@ namespace GTweak.Utilities.Configuration
return result.ToString().TrimEnd('\n', '\r');
}
+ private string GetNetworkAdapters()
+ {
+ StringBuilder result = new StringBuilder();
+
+ 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 }))
+ {
+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
+ {
+ using (managementObj)
+ {
+ result.AppendLine(new string[] { "Name", "Description", "ProductName", "Manufacturer" }.Select(prop => managementObj[prop]?.ToString()).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty); ;
+ }
+ }
+ }
+
+ return result.ToString().TrimEnd('\n', '\r');
+ }
+
private static string SizeCalculationHelper<T>(T sizeInBytes) where T : struct, IConvertible
{
decimal bytes = ((IConvertible)sizeInBytes).ToDecimal(null);
@@ -537,22 +603,23 @@ namespace GTweak.Utilities.Configuration
return $"{Math.Round(bytes, 2):G} TB";
}
- private string GetNetworkAdapters()
+ private string ParseChipset(string rawCaption)
{
- StringBuilder result = new StringBuilder();
-
- 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 }))
+ if (!string.IsNullOrWhiteSpace(rawCaption))
{
- foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())
+ Match match = Regex.Match(rawCaption, @"\((?<res>(?=[^)]*\d)[^)]{3,})\)|\b(?<res>[A-Z]{1,2}\d{2,4}[A-Z]?)\b");
+ if (match.Success)
{
- using (managementObj)
- {
- result.AppendLine(new string[] { "Name", "Description", "ProductName", "Manufacturer" }.Select(prop => managementObj[prop]?.ToString()).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty); ;
- }
+ return match.Groups["res"].Value;
}
+
+ string clean = Regex.Replace(rawCaption, @"\([RTMtm]+\)|(?i:\b(Intel|AMD|NVIDIA|VIA|Series|Chipset|Family|LPC|Controller|Interface|Bridge|Host|Standard)\b)", "");
+ clean = Regex.Replace(clean, @"[()\[\]\-\s]+", " ").Trim();
+
+ return clean.Length > 2 ? clean : rawCaption;
}
- return result.ToString().TrimEnd('\n', '\r');
+ return string.Empty;
}
}
}
diff --git a/.Source/GTweak/View/DataSystemView.xaml b/.Source/GTweak/View/DataSystemView.xaml
index dcc37786..a67e13e6 100644
--- a/.Source/GTweak/View/DataSystemView.xaml
+++ b/.Source/GTweak/View/DataSystemView.xaml
@@ -191,7 +191,11 @@
</StackPanel>
</Grid>
</Border>
- <TextBlock Text="{Binding [Motherboard].Data}" Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Margin="5,1,0,0" Foreground="{StaticResource Brush_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/>
+ <TextBlock Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Margin="5,1,0,0" Foreground="{StaticResource Brush_Highlighted}" Height="Auto" Width="Auto">
+ <Run Text="{Binding [Motherboard].Data}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/><LineBreak/>
+ <Run Text="{DynamicResource title_chipset_sysinfo}" Foreground="{StaticResource Brush_Accent}"/>
+ <Run Text="{Binding [Chipset].Data}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/>
+ </TextBlock>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="0,20,0,0">
diff --git a/.Source/GTweak/View/DataSystemView.xaml.cs b/.Source/GTweak/View/DataSystemView.xaml.cs
index 8c9ed2e4..c1935624 100644
--- a/.Source/GTweak/View/DataSystemView.xaml.cs
+++ b/.Source/GTweak/View/DataSystemView.xaml.cs
@@ -71,7 +71,6 @@ namespace GTweak.View
_hardwareProvider.GetProcessCount(), _hardwareProvider.GetServicesCount());
});
-
_ = Dispatcher.BeginInvoke(new Action(() =>
{
AnimateArcProgress(CPULoad, HardwareData.Processor.Usage);