Free, open-source Windows optimization tool for performance, privacy, and simplicity.
C# csharpdebloatdotnetgamingopen-sourceoptimizationoptimizeroptimizerduckperformanceprivacytweakertweakswindowswinui
fix(SystemInfoService): improve overall service performance, accuracy
fatDuck96ce44493849
diff --git a/optimizerDuck/Services/SystemInfoService.cs b/optimizerDuck/Services/SystemInfoService.csindex fd200b8..fc07154 100644--- a/optimizerDuck/Services/SystemInfoService.cs+++ b/optimizerDuck/Services/SystemInfoService.cs@@ -1,7 +1,10 @@-using System.IO;+using System.Globalization;+using System.IO;using System.Management;+using System.Runtime.CompilerServices;using System.Runtime.InteropServices;using Microsoft.Extensions.Logging;+using Microsoft.Win32;using Microsoft.Win32.SafeHandles;using optimizerDuck.Resources.Languages;@@ -150,16 +153,37 @@ public sealed record SystemSnapshot(}// ============================================================================-// WMI HELPER+// WMI HELPER (with connection caching)// ============================================================================internal static class WmiHelper{- public static IEnumerable<ManagementObject> Query(string query)+ private static readonly Dictionary<string, ManagementScope> ScopeCache = new(StringComparer.OrdinalIgnoreCase);+ private static readonly Lock ScopeLock = new();++ /// <summary>+ /// Gets or creates a cached ManagementScope for the given namespace.+ /// </summary>+ private static ManagementScope GetScope(string namespacePath = @"root\cimv2")+ {+ lock (ScopeLock)+ {+ if (ScopeCache.TryGetValue(namespacePath, out var cached) && cached.IsConnected)+ return cached;++ var scope = new ManagementScope(namespacePath);+ scope.Connect();+ ScopeCache[namespacePath] = scope;+ return scope;+ }+ }++ public static IEnumerable<ManagementObject> Query(string query, string namespacePath = @"root\cimv2"){try{- using var searcher = new ManagementObjectSearcher(query);+ var scope = GetScope(namespacePath);+ using var searcher = new ManagementObjectSearcher(scope, new ObjectQuery(query));return searcher.Get().Cast<ManagementObject>().ToArray();}catch@@ -213,9 +237,43 @@ internal static class WmiHelper}}- public static ManagementObject? GetFirst(string query)+ public static ManagementObject? GetFirst(string query, string namespacePath = @"root\cimv2")+ {+ return Query(query, namespacePath).FirstOrDefault();+ }+}++// ============================================================================+// NATIVE MEMORY API (Task Manager accuracy)+// ============================================================================++internal static class NativeMemory+{+ [DllImport("kernel32.dll", SetLastError = true)]+ [return: MarshalAs(UnmanagedType.Bool)]+ private static extern bool GlobalMemoryStatusEx(ref MEMORYSTATUSEX lpBuffer);++ [StructLayout(LayoutKind.Sequential)]+ public struct MEMORYSTATUSEX+ {+ public uint dwLength;+ public uint dwMemoryLoad;+ public ulong ullTotalPhys;+ public ulong ullAvailPhys;+ public ulong ullTotalPageFile;+ public ulong ullAvailPageFile;+ public ulong ullTotalVirtual;+ public ulong ullAvailVirtual;+ public ulong ullAvailExtendedVirtual;+ }++ /// <summary>+ /// Returns current memory status using the same API Task Manager uses.+ /// </summary>+ public static MEMORYSTATUSEX? GetMemoryStatus(){- return Query(query).FirstOrDefault();+ var status = new MEMORYSTATUSEX { dwLength = (uint)Marshal.SizeOf<MEMORYSTATUSEX>() };+ return GlobalMemoryStatusEx(ref status) ? status : null;}}@@ -225,27 +283,56 @@ internal static class WmiHelperinternal static class CpuProvider{+ /// <summary>+ /// Gets CPU info using Registry (fast) + targeted WMI (only for cache sizes).+ /// Registry path: HKLM\HARDWARE\DESCRIPTION\System\CentralProcessor\0+ /// </summary>public static CpuInfo Get(){try{- var cpu = WmiHelper.GetFirst("SELECT * FROM Win32_Processor");- if (cpu == null) return CpuInfo.Unknown;+ // ── Fast path: Registry ──────────────────────────────────────+ var name = Translations.Common_Unknown;+ var manufacturer = Translations.Common_Unknown;+ var currentMHz = 0;++ using (var cpuKey = Registry.LocalMachine.OpenSubKey(+ @"HARDWARE\DESCRIPTION\System\CentralProcessor\0"))+ {+ if (cpuKey != null)+ {+ name = cpuKey.GetValue("ProcessorNameString")?.ToString()?.Trim() ?? name;+ manufacturer = cpuKey.GetValue("VendorIdentifier")?.ToString()?.Trim() ?? manufacturer;+ currentMHz = cpuKey.GetValue("~MHz") is int mhz ? mhz : 0;+ }+ }++ // Thread count via Environment (instant, no WMI)+ var threads = Environment.ProcessorCount;++ // ── Targeted WMI: only fields not available in Registry ──────+ var cores = 0;+ var maxMHz = currentMHz; // fallback to registry MHz+ var l2kb = 0;+ var l3kb = 0;++ var cpu = WmiHelper.GetFirst(+ "SELECT NumberOfCores, MaxClockSpeed, L2CacheSize, L3CacheSize FROM Win32_Processor");+ if (cpu != null)+ {+ cores = WmiHelper.GetInt(cpu, "NumberOfCores");+ maxMHz = WmiHelper.GetInt(cpu, "MaxClockSpeed", maxMHz);+ l2kb = WmiHelper.GetInt(cpu, "L2CacheSize");+ l3kb = WmiHelper.GetInt(cpu, "L3CacheSize");+ }- var name = WmiHelper.GetString(cpu, "Name");- var manufacturer = WmiHelper.GetString(cpu, "Manufacturer");- var cores = WmiHelper.GetInt(cpu, "NumberOfCores");- var threads = WmiHelper.GetInt(cpu, "NumberOfLogicalProcessors");- var maxMHz = WmiHelper.GetInt(cpu, "MaxClockSpeed");- var curMHz = WmiHelper.GetInt(cpu, "CurrentClockSpeed");- var l2kb = WmiHelper.GetInt(cpu, "L2CacheSize");- var l3kb = WmiHelper.GetInt(cpu, "L3CacheSize");- var addressWidth = WmiHelper.GetInt(cpu, "AddressWidth");+ if (cores == 0) cores = threads; // fallbackvar vendor = DetectCpuVendor(manufacturer);- var architecture = addressWidth == 64 ? "64-bit" : addressWidth == 32 ? "32-bit" : "Unknown";+ var architecture = Environment.Is64BitOperatingSystem ? "64-bit" : "32-bit";- return new CpuInfo(name, manufacturer, vendor, architecture, cores, threads, maxMHz, curMHz, l2kb, l3kb);+ return new CpuInfo(name, manufacturer, vendor, architecture, cores, threads, maxMHz, currentMHz, l2kb,+ l3kb);}catch{@@ -264,6 +351,10 @@ internal static class CpuProviderinternal static class RamProvider{+ /// <summary>+ /// Gets RAM info using GlobalMemoryStatusEx (same API as Task Manager)+ /// for usage stats, and WMI only for physical module details.+ /// </summary>public static RamInfo Get(){try@@ -282,12 +373,13 @@ internal static class RamProviderprivate static List<RamModule> GetPhysicalModules(){var modules = new List<RamModule>();- var physicalMemory = WmiHelper.Query("SELECT * FROM Win32_PhysicalMemory");+ var physicalMemory =+ WmiHelper.Query("SELECT Capacity, Speed, Manufacturer, PartNumber, DeviceLocator FROM Win32_PhysicalMemory");foreach (var mem in physicalMemory){var capacityBytes = WmiHelper.GetLong(mem, "Capacity");- var capacityGB = capacityBytes > 0 ? capacityBytes / Math.Pow(1024, 3) : 0;+ var capacityGB = capacityBytes > 0 ? capacityBytes / (1024.0 * 1024.0 * 1024.0) : 0;var speed = WmiHelper.GetString(mem, "Speed");var manufacturer = WmiHelper.GetString(mem, "Manufacturer");var partNumber = WmiHelper.GetString(mem, "PartNumber");@@ -300,46 +392,36 @@ internal static class RamProvider}private static (double totalGB, long totalMB, long totalKB, double availableGB, double usedPercent, double usedGB)- GetMemoryStats(- List<RamModule> modules)+ GetMemoryStats(List<RamModule> modules){- var totalGB = modules.Sum(m => m.CapacityGB);-- // Fallback to OS-reported total if modules don't provide accurate info- if (totalGB <= 0)+ // ── Primary: GlobalMemoryStatusEx (Task Manager accuracy) ────────+ var memStatus = NativeMemory.GetMemoryStatus();+ if (memStatus.HasValue){- var os = WmiHelper.GetFirst("SELECT TotalVisibleMemorySize FROM Win32_OperatingSystem");- if (os != null)- {- var totalKBFromOs = WmiHelper.GetLong(os, "TotalVisibleMemorySize");- totalGB = totalKBFromOs / 1024.0 / 1024.0;- }- }+ var status = memStatus.Value;- var totalMB = (long)(totalGB * 1024);- var totalKB = totalMB * 1024;+ var totalBytes = (double)status.ullTotalPhys;+ var availBytes = (double)status.ullAvailPhys;+ var usedBytes = totalBytes - availBytes;- // Get available memory and usage- var (availableGB, usedGB, usedPercent) = GetMemoryUsage();+ var totalGB = Math.Round(totalBytes / (1024.0 * 1024.0 * 1024.0), 2);+ var totalMB = (long)(totalBytes / (1024.0 * 1024.0));+ var totalKB = (long)(totalBytes / 1024.0);+ var availableGB = Math.Round(availBytes / (1024.0 * 1024.0 * 1024.0), 2);+ var usedGB = Math.Round(usedBytes / (1024.0 * 1024.0 * 1024.0), 2);+ var usedPercent = (double)status.dwMemoryLoad; // Already calculated by Windows- return (Math.Round(totalGB, 2), totalMB, totalKB, availableGB, usedPercent, usedGB);- }-- private static (double availableGB, double usedGB, double usedPercent) GetMemoryUsage()- {- var os = WmiHelper.GetFirst("SELECT FreePhysicalMemory, TotalVisibleMemorySize FROM Win32_OperatingSystem");- if (os == null) return (0, 0, 0);-- var freeKB = WmiHelper.GetLong(os, "FreePhysicalMemory");- var totalKB = WmiHelper.GetLong(os, "TotalVisibleMemorySize");+ return (totalGB, totalMB, totalKB, availableGB, usedPercent, usedGB);+ }- if (totalKB == 0) return (0, 0, 0);+ // ── Fallback: module-based calculation ───────────────────────────+ var fallbackTotalGB = modules.Sum(m => m.CapacityGB);+ if (fallbackTotalGB <= 0) fallbackTotalGB = 0;- var availableGB = freeKB / 1024.0 / 1024.0;- var usedKB = totalKB - freeKB;- var usedPercent = Math.Round(usedKB * 100.0 / totalKB, 1);+ var fallbackTotalMB = (long)(fallbackTotalGB * 1024);+ var fallbackTotalKB = fallbackTotalMB * 1024;- return (Math.Round(availableGB, 2), Math.Round(usedKB / 1024.0 / 1024.0, 2), usedPercent);+ return (Math.Round(fallbackTotalGB, 2), fallbackTotalMB, fallbackTotalKB, 0, 0, 0);}}@@ -529,17 +611,23 @@ public static class DiskHelperinternal static class DiskProvider{+ /// <summary>+ /// Gets disk info using MSFT_PhysicalDisk (modern Storage namespace) for+ /// accurate media type detection, with Win32_DiskDrive as fallback.+ /// </summary>public static DiskInfo Get(){try{static double ToGb(long bytes){- return Math.Round(bytes / Math.Pow(1024, 3), 2);+ return Math.Round(bytes / (1024.0 * 1024.0 * 1024.0), 2);}- // Get physical disk information+ // Build physical disk info using modern MSFT_PhysicalDisk (preferred)+ // then fallback to Win32_DiskDrive if neededvar physicalDisks = GetPhysicalDiskInfo();+ var diskNumberToInfo = BuildDiskNumberMap(physicalDisks);var volumes = DriveInfo.GetDrives().Where(d => d.IsReady)@@ -550,11 +638,13 @@ internal static class DiskProvidervar usedBytes = totalBytes - freeBytes;var isSystemDrive = DiskHelper.IsSystemDrive(drive.Name);- var mediaType = DiskHelper.DetectMediaType(drive.Name);- var isRemovable = drive.DriveType == DriveType.Removable;+ var isRemovable = drive.DriveType == System.IO.DriveType.Removable;- // Try to get disk info for this drive- var diskInfo = GetDiskInfoForDrive(drive.Name, physicalDisks);+ // Try to get disk info for this drive (model, serial, media type)+ var diskInfo = GetDiskInfoForDrive(drive.Name, diskNumberToInfo);++ // Media type priority: PhysicalDisk info > seek penalty P/Invoke > WMI fallback+ var mediaType = diskInfo?.MediaType ?? DiskHelper.DetectMediaType(drive.Name);return new DiskVolume(drive.Name.TrimEnd('\\'),@@ -582,19 +672,78 @@ internal static class DiskProvider}}+ /// <summary>+ /// Gets physical disk info, preferring MSFT_PhysicalDisk (accurate SSD/HDD)+ /// with Win32_DiskDrive as fallback.+ /// </summary>private static List<PhysicalDiskInfo> GetPhysicalDiskInfo()+ {+ var disks = GetViaMsftPhysicalDisk();+ if (disks.Count > 0) return disks;++ // Fallback to Win32_DiskDrive+ return GetViaWin32DiskDrive();+ }++ /// <summary>+ /// Uses MSFT_PhysicalDisk from the modern Storage namespace.+ /// MediaType: 3 = HDD, 4 = SSD (matches Task Manager's disk type display).+ /// </summary>+ private static List<PhysicalDiskInfo> GetViaMsftPhysicalDisk()+ {+ var disks = new List<PhysicalDiskInfo>();+ try+ {+ var physicalDisks = WmiHelper.Query(+ "SELECT DeviceId, FriendlyName, SerialNumber, MediaType, BusType FROM MSFT_PhysicalDisk",+ @"root\Microsoft\Windows\Storage");++ foreach (var disk in physicalDisks)+ {+ var mediaTypeValue = WmiHelper.GetInt(disk, "MediaType");+ var mediaType = mediaTypeValue switch+ {+ 3 => "HDD",+ 4 => "SSD",+ 5 => "SCM", // Storage Class Memory+ _ => "Unknown"+ };++ disks.Add(new PhysicalDiskInfo+ {+ DiskNumber = WmiHelper.GetString(disk, "DeviceId", "-1"),+ Model = WmiHelper.GetString(disk, "FriendlyName"),+ SerialNumber = WmiHelper.GetString(disk, "SerialNumber").Trim(),+ MediaType = mediaType,+ DeviceID = "" // Not available from MSFT_PhysicalDisk+ });+ }+ }+ catch+ {+ // Storage namespace not available (older OS)+ }++ return disks;+ }++ /// <summary>+ /// Fallback: classic Win32_DiskDrive WMI provider.+ /// </summary>+ private static List<PhysicalDiskInfo> GetViaWin32DiskDrive(){var disks = new List<PhysicalDiskInfo>();try{- var diskDrives = WmiHelper.Query("SELECT * FROM Win32_DiskDrive");+ var diskDrives = WmiHelper.Query("SELECT DeviceID, Model, SerialNumber, MediaType, Index FROM Win32_DiskDrive");foreach (var disk in diskDrives)disks.Add(new PhysicalDiskInfo{DeviceID = WmiHelper.GetString(disk, "DeviceID"),+ DiskNumber = WmiHelper.GetInt(disk, "Index").ToString(),Model = WmiHelper.GetString(disk, "Model"),SerialNumber = WmiHelper.GetString(disk, "SerialNumber").Trim(),- MediaType = WmiHelper.GetString(disk, "MediaType")+ MediaType = "" // Win32_DiskDrive MediaType is unreliable});}catch@@ -605,23 +754,67 @@ internal static class DiskProviderreturn disks;}- private static PhysicalDiskInfo? GetDiskInfoForDrive(string driveLetter, List<PhysicalDiskInfo> physicalDisks)+ /// <summary>+ /// Builds a lookup from disk number to PhysicalDiskInfo.+ /// </summary>+ private static Dictionary<int, PhysicalDiskInfo> BuildDiskNumberMap(List<PhysicalDiskInfo> disks){+ var map = new Dictionary<int, PhysicalDiskInfo>();+ foreach (var disk in disks)+ {+ if (int.TryParse(disk.DiskNumber, out var num))+ map.TryAdd(num, disk);+ }++ return map;+ }++ /// <summary>+ /// Maps a logical drive letter to a physical disk using Win32 associations.+ /// </summary>+ private static PhysicalDiskInfo? GetDiskInfoForDrive(string driveLetter,+ Dictionary<int, PhysicalDiskInfo> diskNumberMap)+ {+ if (diskNumberMap.Count == 0) return null;+try{var letter = driveLetter.TrimEnd('\\');++ // Try MSFT_Partition to get DiskNumber for this drive lettervar partitions = WmiHelper.Query(- $"ASSOCIATORS OF {{Win32_LogicalDisk.DeviceID='{letter}'}} WHERE AssocClass=Win32_LogicalDiskToPartition");+ $"SELECT DiskNumber FROM MSFT_Partition WHERE DriveLetter = '{letter.TrimEnd(':')}'",+ @"root\Microsoft\Windows\Storage");foreach (var partition in partitions)+ {+ var diskNum = WmiHelper.GetInt(partition, "DiskNumber", -1);+ if (diskNum >= 0 && diskNumberMap.TryGetValue(diskNum, out var info))+ return info;+ }++ // Fallback: classic WMI ASSOCIATORS path+ var classicPartitions = WmiHelper.Query(+ $"ASSOCIATORS OF {{Win32_LogicalDisk.DeviceID='{letter}'}} WHERE AssocClass=Win32_LogicalDiskToPartition");++ foreach (var partition in classicPartitions){var diskDrives = WmiHelper.Query($"ASSOCIATORS OF {{Win32_DiskPartition.DeviceID='{partition["DeviceID"]}'}} WHERE AssocClass=Win32_DiskDriveToDiskPartition");foreach (var disk in diskDrives){+ var index = WmiHelper.GetInt(disk, "Index", -1);+ if (index >= 0 && diskNumberMap.TryGetValue(index, out var info))+ return info;++ // Direct match by DeviceIDvar deviceId = WmiHelper.GetString(disk, "DeviceID");- return physicalDisks.FirstOrDefault(p => p.DeviceID == deviceId);+ foreach (var entry in diskNumberMap.Values)+ {+ if (entry.DeviceID == deviceId)+ return entry;+ }}}}@@ -630,50 +823,362 @@ internal static class DiskProvider// Ignore errors}+ // If only one physical disk, assume it's the one+ if (diskNumberMap.Count == 1)+ return diskNumberMap.Values.First();+return null;}private class PhysicalDiskInfo{public string DeviceID { get; set; } = string.Empty;+ public string DiskNumber { get; set; } = string.Empty;public string Model { get; set; } = string.Empty;public string SerialNumber { get; set; } = string.Empty;public string MediaType { get; set; } = string.Empty;}}+// ============================================================================+// DXGI INTEROP (COM P/Invoke)+// ============================================================================++internal static class DxgiHelper+{+ private static readonly Guid IID_IDXGIFactory1 = new("770aae78-f26f-4dba-a829-253c83d1b387");++ [DllImport("dxgi.dll", PreserveSig = false)]+ private static extern void CreateDXGIFactory1(+ [In] ref Guid riid,+ [Out, MarshalAs(UnmanagedType.Interface)] out IDXGIFactory1 factory);++ public static IDXGIFactory1 CreateFactory()+ {+ var iid = IID_IDXGIFactory1;+ CreateDXGIFactory1(ref iid, out var factory);+ return factory;+ }++ [ComImport]+ [Guid("770aae78-f26f-4dba-a829-253c83d1b387")]+ [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]+ public interface IDXGIFactory1+ {+ // IDXGIObject (4 methods)+ void SetPrivateData([In] ref Guid Name, uint DataSize, IntPtr pData);+ void SetPrivateDataInterface([In] ref Guid Name, [MarshalAs(UnmanagedType.IUnknown)] object pUnknown);+ void GetPrivateData([In] ref Guid Name, ref uint pDataSize, IntPtr pData);+ void GetParent([In] ref Guid riid, [MarshalAs(UnmanagedType.IUnknown)] out object ppParent);++ // IDXGIFactory (4 methods)+ void EnumAdapters(uint Adapter, [MarshalAs(UnmanagedType.IUnknown)] out object ppAdapter);+ void MakeWindowAssociation(IntPtr WindowHandle, uint Flags);+ void GetWindowAssociation(out IntPtr pWindowHandle);+ void CreateSwapChain(+ [MarshalAs(UnmanagedType.IUnknown)] object pDevice,+ IntPtr pDesc,+ [MarshalAs(UnmanagedType.IUnknown)] out object ppSwapChain);+ void CreateSoftwareAdapter(IntPtr Module, [MarshalAs(UnmanagedType.IUnknown)] out object ppAdapter);++ // IDXGIFactory1 (2 methods)+ [PreserveSig]+ int EnumAdapters1(uint Adapter, out IDXGIAdapter1? ppAdapter);+ bool IsCurrent();+ }++ [ComImport]+ [Guid("29038f61-3839-4626-91fd-086879011a05")]+ [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]+ public interface IDXGIAdapter1+ {+ // IDXGIObject (4 methods)+ void SetPrivateData([In] ref Guid Name, uint DataSize, IntPtr pData);+ void SetPrivateDataInterface([In] ref Guid Name, [MarshalAs(UnmanagedType.IUnknown)] object pUnknown);+ void GetPrivateData([In] ref Guid Name, ref uint pDataSize, IntPtr pData);+ void GetParent([In] ref Guid riid, [MarshalAs(UnmanagedType.IUnknown)] out object ppParent);++ // IDXGIAdapter (3 methods)+ void EnumOutputs(uint Output, [MarshalAs(UnmanagedType.IUnknown)] out object ppOutput);+ void GetDesc(out DXGI_ADAPTER_DESC pDesc);+ int CheckInterfaceSupport([In] ref Guid InterfaceName, out long pUMDVersion);++ // IDXGIAdapter1 (1 method)+ void GetDesc1(out DXGI_ADAPTER_DESC1 pDesc);+ }++ [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]+ public struct DXGI_ADAPTER_DESC+ {+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]+ public string Description;+ public uint VendorId;+ public uint DeviceId;+ public uint SubSysId;+ public uint Revision;+ public nuint DedicatedVideoMemory;+ public nuint DedicatedSystemMemory;+ public nuint SharedSystemMemory;+ public long AdapterLuid;+ }++ [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]+ public struct DXGI_ADAPTER_DESC1+ {+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]+ public string Description;+ public uint VendorId;+ public uint DeviceId;+ public uint SubSysId;+ public uint Revision;+ public nuint DedicatedVideoMemory;+ public nuint DedicatedSystemMemory;+ public nuint SharedSystemMemory;+ public long AdapterLuid;+ public uint Flags; // DXGI_ADAPTER_FLAG+ }++ // DXGI_ADAPTER_FLAG values+ public const uint DXGI_ADAPTER_FLAG_SOFTWARE = 2;++ // Microsoft Basic Render Driver identifiers+ private const uint MICROSOFT_VENDOR_ID = 0x1414;+ private const uint BASIC_RENDER_DEVICE_ID = 0x8C;++ public static bool IsSoftwareAdapter(DXGI_ADAPTER_DESC1 desc)+ {+ if ((desc.Flags & DXGI_ADAPTER_FLAG_SOFTWARE) != 0)+ return true;++ // Microsoft Basic Render Driver+ return desc.VendorId == MICROSOFT_VENDOR_ID && desc.DeviceId == BASIC_RENDER_DEVICE_ID;+ }+}++// ============================================================================+// GPU PROVIDER (DXGI + minimal WMI)+// ============================================================================+internal static class GpuProvider{+ /// <summary>+ /// Enumerates all physical GPUs using DXGI, with WMI fallback for driver info.+ /// The returned list is ordered by DXGI adapter index (index 0 = primary display adapter).+ /// </summary>public static IReadOnlyList<GpuInfo> GetAll()+ {+ try+ {+ return GetAllViaDxgi();+ }+ catch+ {+ // DXGI unavailable (e.g., ancient OS or headless server) — fall back to WMI+ return GetAllViaWmi();+ }+ }++ /// <summary>+ /// Selects the primary performance GPU from the list.+ /// On hybrid laptops DXGI index 0 is often the iGPU (Intel), so we+ /// pick by highest VRAM first, then vendor priority (NVIDIA > AMD > Intel).+ /// Intel is only considered primary when it is the sole GPU.+ /// </summary>+ public static GpuInfo? GetPrimary(IReadOnlyList<GpuInfo> gpus)+ {+ if (gpus.Count == 0) return null;+ if (gpus.Count == 1) return gpus[0];++ return gpus+ .OrderByDescending(g => g.MemoryMB ?? 0)+ .ThenByDescending(g => g.Vendor == GpuVendor.NVIDIA)+ .ThenByDescending(g => g.Vendor == GpuVendor.AMD)+ .First();+ }++ // ── DXGI path ──────────────────────────────────────────────────────────++ private static IReadOnlyList<GpuInfo> GetAllViaDxgi()+ {+ var factory = DxgiHelper.CreateFactory();+ var wmiLookup = BuildWmiLookup(); // lightweight WMI for DriverVersion + DeviceID+ var gpus = new List<GpuInfo>();++ try+ {+ for (uint i = 0; ; i++)+ {+ var hr = factory.EnumAdapters1(i, out var adapter);+ if (hr != 0 || adapter == null) break; // DXGI_ERROR_NOT_FOUND++ try+ {+ adapter.GetDesc1(out var desc);++ // Skip software / virtual adapters+ if (DxgiHelper.IsSoftwareAdapter(desc))+ continue;++ var name = desc.Description?.Trim() ?? "";+ if (string.IsNullOrWhiteSpace(name) || IsVirtualAdapter(name))+ continue;++ var vendor = DetectGpuVendorById(desc.VendorId);+ var memoryMB = (int)((long)desc.DedicatedVideoMemory / (1024 * 1024));++ // Match to WMI entry for DriverVersion and DeviceID+ var wmiMatch = FindWmiMatch(name, desc.VendorId, desc.DeviceId, wmiLookup);++ gpus.Add(new GpuInfo(+ name,+ wmiMatch?.DriverVersion ?? Translations.Common_Unknown,+ vendor,+ memoryMB > 0 ? memoryMB : null,+ wmiMatch?.DeviceId,+ wmiMatch?.PnpDeviceId+ ));+ }+ finally+ {+ Marshal.ReleaseComObject(adapter);+ }+ }+ }+ finally+ {+ if (factory != null) Marshal.ReleaseComObject(factory);+ }++ return gpus.Count > 0 ? gpus : [GpuInfo.Unknown];+ }++ // ── WMI fallback path ──────────────────────────────────────────────────++ private static IReadOnlyList<GpuInfo> GetAllViaWmi(){var gpus = new List<GpuInfo>();- var controllers = WmiHelper.Query("SELECT * FROM Win32_VideoController");+ var controllers = WmiHelper.Query("SELECT Name, DriverVersion, DeviceID, PNPDeviceID, AdapterRAM FROM Win32_VideoController");foreach (var controller in controllers){- var gpu = ParseGpu(controller);- if (gpu != null && !IsVirtualAdapter(gpu.Name)) gpus.Add(gpu);+ var name = WmiHelper.GetString(controller, "Name", "");+ if (string.IsNullOrWhiteSpace(name) || IsVirtualAdapter(name))+ continue;++ var driver = WmiHelper.GetString(controller, "DriverVersion");+ var deviceId = WmiHelper.GetString(controller, "DeviceID");+ var pnpId = WmiHelper.GetString(controller, "PNPDeviceID");+ var adapterRam = WmiHelper.GetLong(controller, "AdapterRAM");++ int? memoryMB = adapterRam > 0 ? (int)(adapterRam / (1024 * 1024)) : null;+ var vendor = DetectGpuVendor(name, pnpId);++ gpus.Add(new GpuInfo(name, driver, vendor, memoryMB, deviceId, pnpId));}return gpus.Count > 0 ? gpus : [GpuInfo.Unknown];}- private static GpuInfo? ParseGpu(ManagementObject controller)+ // ── WMI lookup for DXGI matching ───────────────────────────────────────++ private sealed record WmiGpuEntry(+ string Name,+ string DriverVersion,+ string? DeviceId,+ string? PnpDeviceId,+ uint VendorId,+ uint HardwareDeviceId+ );++ /// <summary>+ /// Builds a lightweight WMI lookup table (Name, DriverVersion, DeviceID, PNPDeviceID)+ /// for cross-referencing with DXGI adapters.+ /// </summary>+ private static List<WmiGpuEntry> BuildWmiLookup()+ {+ var entries = new List<WmiGpuEntry>();+ try+ {+ var controllers = WmiHelper.Query(+ "SELECT Name, DriverVersion, DeviceID, PNPDeviceID FROM Win32_VideoController");++ foreach (var controller in controllers)+ {+ var name = WmiHelper.GetString(controller, "Name", "");+ var driver = WmiHelper.GetString(controller, "DriverVersion");+ var deviceId = WmiHelper.GetString(controller, "DeviceID");+ var pnpId = WmiHelper.GetString(controller, "PNPDeviceID");++ // Extract VendorId and DeviceId from PNP DeviceID (e.g., PCI\VEN_10DE&DEV_2684&...)+ ParsePnpIds(pnpId, out var vendorId, out var hardwareDeviceId);++ entries.Add(new WmiGpuEntry(name, driver, deviceId, pnpId, vendorId, hardwareDeviceId));+ }+ }+ catch+ {+ // WMI unavailable — driver info won't be available+ }++ return entries;+ }++ /// <summary>+ /// Parses PNP DeviceID string like "PCI\VEN_10DE&DEV_2684&SUBSYS_..." to extract VendorId and DeviceId.+ /// </summary>+ private static void ParsePnpIds(string? pnpId, out uint vendorId, out uint hardwareDeviceId){- var name = WmiHelper.GetString(controller, "Name", "");- if (string.IsNullOrWhiteSpace(name)) return null;+ vendorId = 0;+ hardwareDeviceId = 0;+ if (string.IsNullOrWhiteSpace(pnpId)) return;- var driver = WmiHelper.GetString(controller, "DriverVersion");- var deviceId = WmiHelper.GetString(controller, "DeviceID");- var pnpId = WmiHelper.GetString(controller, "PNPDeviceID");- var adapterRam = WmiHelper.GetLong(controller, "AdapterRAM");+ var upper = pnpId.ToUpperInvariant();- int? memoryMB = adapterRam > 0 ? (int)(adapterRam / (1024 * 1024)) : null;- var vendor = DetectGpuVendor(name, pnpId);+ var venIdx = upper.IndexOf("VEN_", StringComparison.Ordinal);+ if (venIdx >= 0 && venIdx + 8 <= upper.Length)+ {+ if (uint.TryParse(upper.Substring(venIdx + 4, 4),+ NumberStyles.HexNumber, null, out var v))+ vendorId = v;+ }- return new GpuInfo(name, driver, vendor, memoryMB, deviceId, pnpId);+ var devIdx = upper.IndexOf("DEV_", StringComparison.Ordinal);+ if (devIdx >= 0 && devIdx + 8 <= upper.Length)+ {+ if (uint.TryParse(upper.Substring(devIdx + 4, 4),+ NumberStyles.HexNumber, null, out var d))+ hardwareDeviceId = d;+ }}+ /// <summary>+ /// Matches a DXGI adapter to its WMI entry.+ /// Priority: VendorId+DeviceId match > name substring match.+ /// </summary>+ private static WmiGpuEntry? FindWmiMatch(+ string dxgiName, uint dxgiVendorId, uint dxgiDeviceId, List<WmiGpuEntry> wmiEntries)+ {+ // First pass: match by hardware IDs (most reliable)+ foreach (var entry in wmiEntries)+ {+ if (entry.VendorId == dxgiVendorId && entry.HardwareDeviceId == dxgiDeviceId)+ return entry;+ }++ // Second pass: match by name substring+ var dxgiNameLower = dxgiName.ToLowerInvariant();+ foreach (var entry in wmiEntries)+ {+ if (!string.IsNullOrEmpty(entry.Name) &&+ dxgiNameLower.Contains(entry.Name.ToLowerInvariant()))+ return entry;+ }++ return null;+ }++ // ── Shared helpers ─────────────────────────────────────────────────────+private static bool IsVirtualAdapter(string name){var lower = name.ToLowerInvariant();@@ -682,6 +1187,23 @@ internal static class GpuProviderlower.Contains("virtual");}+ /// <summary>+ /// Detects GPU vendor from DXGI VendorId (PCI Vendor ID).+ /// </summary>+ private static GpuVendor DetectGpuVendorById(uint vendorId)+ {+ return vendorId switch+ {+ 0x10DE => GpuVendor.NVIDIA,+ 0x1002 => GpuVendor.AMD,+ 0x8086 => GpuVendor.Intel,+ _ => GpuVendor.Unknown+ };+ }++ /// <summary>+ /// Detects GPU vendor from name and PNP DeviceID strings (WMI fallback path).+ /// </summary>private static GpuVendor DetectGpuVendor(string name, string? pnpId){var nameLower = name.ToLowerInvariant();@@ -701,51 +1223,55 @@ internal static class GpuProviderreturn GpuVendor.Unknown;}-- public static GpuInfo? GetPrimary(IReadOnlyList<GpuInfo> gpus)- {- if (gpus.Count == 0) return null;-- return gpus- .OrderByDescending(CalculateGpuScore)- .FirstOrDefault();- }-- private static int CalculateGpuScore(GpuInfo gpu)- {- var vendorScore = gpu.Vendor switch- {- GpuVendor.NVIDIA => 3,- GpuVendor.AMD => 2,- GpuVendor.Intel => 1,- _ => 0- };-- var memoryBonus = gpu.MemoryMB is > 1024 ? 10 : 0;-- return vendorScore + memoryBonus;- }}internal static class OsProvider{+ /// <summary>+ /// Gets OS info using Registry (fast) + targeted WMI (only for LastBootUpTime).+ /// </summary>public static OsInfo Get(){try{- var os = WmiHelper.GetFirst("SELECT * FROM Win32_OperatingSystem");- if (os == null) return OsInfo.Unknown;+ // ── Fast path: Registry ──────────────────────────────────────+ var buildNumber = Translations.Common_Unknown;+ var edition = Translations.Common_Unknown;+ var installDate = Translations.Common_Unknown;+ var displayVersion = "";++ using (var ntKey = Registry.LocalMachine.OpenSubKey(+ @"SOFTWARE\Microsoft\Windows NT\CurrentVersion"))+ {+ if (ntKey != null)+ {+ buildNumber = ntKey.GetValue("CurrentBuildNumber")?.ToString()+ ?? ntKey.GetValue("CurrentBuild")?.ToString()+ ?? buildNumber;+ edition = ntKey.GetValue("EditionID")?.ToString() ?? edition;+ displayVersion = ntKey.GetValue("DisplayVersion")?.ToString() ?? "";++ // Install date from Registry (Unix timestamp)+ if (ntKey.GetValue("InstallDate") is int installTimestamp && installTimestamp > 0)+ {+ var installDateTime = DateTimeOffset.FromUnixTimeSeconds(installTimestamp);+ installDate = installDateTime.LocalDateTime.ToString("yyyy-MM-dd");+ }+ }+ }- var caption = WmiHelper.GetString(os, "Caption", "Windows");- var buildNumber = WmiHelper.GetString(os, "BuildNumber");- var version = MapWindowsVersion(WmiHelper.GetString(os, "Version"), buildNumber);- var edition = ExtractEdition(caption);+ // Determine Windows version from build number+ var version = MapWindowsVersion(buildNumber);var architecture = Environment.Is64BitOperatingSystem ? "64-bit" : "32-bit";var deviceType = GetDeviceType();- var installDate = FormatWmiDate(WmiHelper.GetString(os, "InstallDate", ""));- var lastBoot = FormatWmiDateTime(WmiHelper.GetString(os, "LastBootUpTime", ""));var name = $"Windows {version}";+ // ── Targeted WMI: only for LastBootUpTime ────────────────────+ var lastBoot = Translations.Common_Unknown;+ var os = WmiHelper.GetFirst("SELECT LastBootUpTime FROM Win32_OperatingSystem");+ if (os != null)+ lastBoot = FormatWmiDateTime(WmiHelper.GetString(os, "LastBootUpTime", ""));+return new OsInfo(name, version, buildNumber, edition, architecture, deviceType, installDate, lastBoot);}catch@@ -754,22 +1280,21 @@ internal static class OsProvider}}- private static string MapWindowsVersion(string version, string build)+ private static string MapWindowsVersion(string build){- if (version.StartsWith("6.1")) return "7";- if (version.StartsWith("6.2")) return "8";- if (version.StartsWith("6.3")) return "8.1";- if (!version.StartsWith("10.0")) return "Unknown";-- return int.TryParse(build, out var buildNum) && buildNum >= 22000 ? "11" : "10";- }-- private static string ExtractEdition(string caption)- {- if (string.IsNullOrWhiteSpace(caption)) return "Unknown";+ if (!int.TryParse(build, out var buildNum))+ return "Unknown";- var parts = caption.Split(' ', StringSplitOptions.RemoveEmptyEntries);- return parts.Length > 2 ? parts.Last() : caption;+ // Rough mapping based on build number ranges+ return buildNum switch+ {+ >= 22000 => "11",+ >= 10240 => "10",+ >= 9600 => "8.1",+ >= 9200 => "8",+ >= 7600 => "7",+ _ => "Unknown"+ };}private static string GetDeviceType()@@ -802,12 +1327,6 @@ internal static class OsProviderreturn Translations.Common_Unknown;}- private static string FormatWmiDate(string wmiDate)- {- if (wmiDate.Length < 8) return "Unknown";- return $"{wmiDate[..4]}-{wmiDate.Substring(4, 2)}-{wmiDate.Substring(6, 2)}";- }-private static string FormatWmiDateTime(string wmiDate){if (wmiDate.Length < 12) return "Unknown";@@ -822,7 +1341,7 @@ internal static class BiosProvider{try{- var bios = WmiHelper.GetFirst("SELECT * FROM Win32_BIOS");+ var bios = WmiHelper.GetFirst("SELECT Manufacturer, BIOSVersion, SMBIOSBIOSVersion, SerialNumber, ReleaseDate FROM Win32_BIOS");if (bios == null) return BiosInfo.Unknown;var manufacturer = WmiHelper.GetString(bios, "Manufacturer");@@ -858,6 +1377,7 @@ public sealed class SystemInfoService// Cache CPU, OS, BIOS info (doesn't change at runtime)private CpuInfo? _cachedCpu;+ private IReadOnlyList<GpuInfo>? _cachedGpus;private OsInfo? _cachedOs;public SystemInfoService(ILogger<SystemInfoService> logger)@@ -872,27 +1392,47 @@ public sealed class SystemInfoServiceawait _semaphore.WaitAsync(ct).ConfigureAwait(false);try{- var (ram, gpus, disk) = await Task.Run(async () =>+ var isFirstRun = _cachedCpu == null;++ if (isFirstRun){+ // First run: fetch everything in parallel+ var cpuTask = Task.Run(CpuProvider.Get, ct);var ramTask = Task.Run(RamProvider.Get, ct);var gpusTask = Task.Run(GpuProvider.GetAll, ct);var diskTask = Task.Run(DiskProvider.Get, ct);+ var osTask = Task.Run(OsProvider.Get, ct);+ var biosTask = Task.Run(BiosProvider.Get, ct);- await Task.WhenAll(ramTask, gpusTask, diskTask);+ await Task.WhenAll(cpuTask, ramTask, gpusTask, diskTask, osTask, biosTask);- return (await ramTask, await gpusTask, await diskTask);- }, ct);+ _cachedCpu = await cpuTask;+ _cachedOs = await osTask;+ _cachedBios = await biosTask;+ _cachedGpus = await gpusTask;- _cachedCpu ??= await Task.Run(CpuProvider.Get, ct);- _cachedOs ??= await Task.Run(OsProvider.Get, ct);- _cachedBios ??= await Task.Run(BiosProvider.Get, ct);+ var primaryGpu = GpuProvider.GetPrimary(_cachedGpus);- var primaryGpu = GpuProvider.GetPrimary(gpus);+ Snapshot = new SystemSnapshot(_cachedCpu, await ramTask, _cachedOs, _cachedBios, _cachedGpus,+ primaryGpu, await diskTask);+ }+ else+ {+ // Subsequent runs: only refresh dynamic data (RAM, Disk)+ // GPU list changes very rarely, so cache it too+ var ramTask = Task.Run(RamProvider.Get, ct);+ var diskTask = Task.Run(DiskProvider.Get, ct);- var snapshot = new SystemSnapshot(_cachedCpu, ram, _cachedOs, _cachedBios, gpus, primaryGpu, disk);- Snapshot = snapshot;+ await Task.WhenAll(ramTask, diskTask);++ var gpus = _cachedGpus!;+ var primaryGpu = GpuProvider.GetPrimary(gpus);++ Snapshot = new SystemSnapshot(_cachedCpu!, await ramTask, _cachedOs!, _cachedBios!, gpus, primaryGpu,+ await diskTask);+ }- return snapshot;+ return Snapshot;}catch (Exception ex){diff --git a/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.csindex 193512c..b4452e2 100644--- a/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs@@ -31,6 +31,7 @@ public partial class DashboardViewModel : ViewModelprivate bool _isUpdateInfoOpen;[ObservableProperty] private RamInfo _runtimeRam = RamInfo.Unknown;+ [ObservableProperty] private DiskInfo _runtimeDisk = DiskInfo.Unknown;[ObservableProperty] private SystemSnapshot _systemInfo = SystemSnapshot.Unknown;private bool _updateNotified;@@ -219,6 +220,7 @@ public partial class DashboardViewModel : ViewModelvar snapshot = await _systemInfoService.RefreshAsync();SystemInfo = snapshot;RuntimeRam = snapshot.Ram;+ RuntimeDisk = snapshot.Disk;}catch (Exception ex){@@ -235,7 +237,9 @@ public partial class DashboardViewModel : ViewModeltry{var ramInfo = await Task.Run(RamProvider.Get);+ var diskInfo = await Task.Run(DiskProvider.Get);RuntimeRam = ramInfo;+ RuntimeDisk = diskInfo;}catch (Exception ex){diff --git a/optimizerDuck/UI/Views/Pages/DashboardPage.xaml b/optimizerDuck/UI/Views/Pages/DashboardPage.xamlindex 741355e..20e21b3 100644--- a/optimizerDuck/UI/Views/Pages/DashboardPage.xaml+++ b/optimizerDuck/UI/Views/Pages/DashboardPage.xaml@@ -1,29 +1,29 @@<Page- Foreground="{DynamicResource TextFillColorPrimaryBrush}"- Margin="0,32,0,0"- ScrollViewer.CanContentScroll="False"- Title="Dashboard"- d:DataContext="{d:DesignInstance pages:DashboardPage}"- d:DesignHeight="650"- d:DesignWidth="800"- mc:Ignorable="d"- ui:Design.Background="Black"- ui:Design.Foreground="White"x:Class="optimizerDuck.UI.Views.Pages.DashboardPage"xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:converters="clr-namespace:optimizerDuck.Common.Helpers.Converters"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"xmlns:pages="clr-namespace:optimizerDuck.UI.Views.Pages"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">+ Title="Dashboard"+ Margin="0,32,0,0"+ d:DataContext="{d:DesignInstance pages:DashboardPage}"+ d:DesignHeight="650"+ d:DesignWidth="800"+ ui:Design.Background="Black"+ ui:Design.Foreground="White"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ ScrollViewer.CanContentScroll="False"+ mc:Ignorable="d"><Page.Resources><converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" /><converters:MBToGBConverter x:Key="MBToGBConverter" />- <converters:GreaterThanNumberToVisibilityConverter Threshold="1" x:Key="GreaterThanOneToVisibilityConverter" />- <converters:MinusNumberConverter NumberToMinus="1" x:Key="MinusOneConverter" />+ <converters:GreaterThanNumberToVisibilityConverter x:Key="GreaterThanOneToVisibilityConverter" Threshold="1" />+ <converters:MinusNumberConverter x:Key="MinusOneConverter" NumberToMinus="1" /><converters:ThemeToGitHubIconConverter x:Key="ThemeToGitHubIconConverter" /></Page.Resources>@@ -36,13 +36,13 @@<Border Background="{DynamicResource ApplicationBackgroundBrush}" Opacity="0.8" /><StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"><ui:ProgressRing+ Width="60"Height="60"- IsIndeterminate="True"- Width="60" />+ IsIndeterminate="True" /><ui:TextBlock- FontTypography="Subtitle"- HorizontalAlignment="Center"Margin="0,16,0,0"+ HorizontalAlignment="Center"+ FontTypography="Subtitle"Text="{ext:Loc Dashboard.SystemInfo.Loading}"TextWrapping="Wrap" /></StackPanel>@@ -51,16 +51,16 @@<!-- Header --><StackPanel Margin="0,0,0,20"><ui:InfoBar- IsOpen="{Binding ViewModel.IsUpdateInfoOpen, Mode=TwoWay}"Margin="0,0,0,10"+ IsOpen="{Binding ViewModel.IsUpdateInfoOpen, Mode=TwoWay}"Message="{ext:Loc Dashboard.UpdateInfoBar.Message,{Binding ViewModel.LatestVersion}}"Severity="Warning" /><Grid ColumnDefinitions="*,Auto">- <ui:TextBlock- FontTypography="Title"- Text="{ext:Loc Dashboard.Header.Title}"- TextWrapping="Wrap" />+ <ui:TextBlock+ FontTypography="Title"+ Text="{ext:Loc Dashboard.Header.Title}"+ TextWrapping="Wrap" /><Menu Grid.Column="1"><ui:MenuItem Header="{ext:Loc Dashboard.Header.Menu.Header.Options}">@@ -90,14 +90,14 @@<!-- Action Cards --><UniformGrid- Columns="3"Grid.Row="1"- Margin="0,0,0,20">+ Margin="0,0,0,20"+ Columns="3"><ui:CardAction- Command="{Binding ViewModel.OpenActionCommand}"- CommandParameter="Discord"Margin="0,0,5,0"- VerticalAlignment="Stretch">+ VerticalAlignment="Stretch"+ Command="{Binding ViewModel.OpenActionCommand}"+ CommandParameter="Discord"><ui:CardAction.Icon><ui:ImageIcon Height="25" Source="pack://application:,,,/Resources/Images/DiscordLogo.png" /></ui:CardAction.Icon>@@ -112,10 +112,10 @@</ui:CardAction><ui:CardAction- Command="{Binding ViewModel.OpenActionCommand}"- CommandParameter="GitHub"Margin="5,0,5,0"- VerticalAlignment="Stretch">+ VerticalAlignment="Stretch"+ Command="{Binding ViewModel.OpenActionCommand}"+ CommandParameter="GitHub"><ui:CardAction.Icon><ui:ImageIcon Height="40" Source="{Binding ViewModel.CurrentApplicationTheme, Converter={StaticResource ThemeToGitHubIconConverter}}" /></ui:CardAction.Icon>@@ -130,11 +130,11 @@</ui:CardAction><ui:CardAction+ Margin="5,0,0,0"+ VerticalAlignment="Stretch"BorderThickness="1"Command="{Binding ViewModel.OpenActionCommand}"- CommandParameter="Support"- Margin="5,0,0,0"- VerticalAlignment="Stretch">+ CommandParameter="Support"><ui:CardAction.Icon><ui:SymbolIcon@@ -156,17 +156,17 @@<ScrollViewerGrid.Row="2"- HorizontalScrollBarVisibility="Disabled"Padding="20,0"+ HorizontalScrollBarVisibility="Disabled"VerticalScrollBarVisibility="Auto"><StackPanel><!-- System Info Cards --><UniformGrid Columns="2" Rows="2"><!-- Operating System --><ui:CardControl- Icon="{ui:SymbolIcon Tv24}"Margin="0,0,5,5"- VerticalAlignment="Stretch">+ VerticalAlignment="Stretch"+ Icon="{ui:SymbolIcon Tv24}"><ui:CardControl.Header><Grid><Grid.RowDefinitions>@@ -188,24 +188,24 @@Margin="0,8,0,0"Orientation="Horizontal"><Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"Margin="0,0,4,4"- Padding="6,3">+ Padding="6,3"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"><ui:TextBlock FontTypography="Caption" Text="{ext:Loc Dashboard.SystemInfo.Os.Build, {Binding ViewModel.SystemInfo.Os.BuildNumber}}" /></Border><Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"Margin="0,0,4,4"- Padding="6,3">+ Padding="6,3"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"><ui:TextBlock FontTypography="Caption" Text="{Binding ViewModel.SystemInfo.Os.DeviceType}" /></Border><Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"Margin="0,0,4,4"- Padding="6,3">+ Padding="6,3"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"><ui:TextBlock FontTypography="Caption" Text="{Binding ViewModel.SystemInfo.Os.InstallDate}" /></Border></WrapPanel>@@ -215,9 +215,9 @@<!-- CPU --><ui:CardControl- Icon="{ui:SymbolIcon DeveloperBoard24}"Margin="5,0,0,5"- VerticalAlignment="Stretch">+ VerticalAlignment="Stretch"+ Icon="{ui:SymbolIcon DeveloperBoard24}"><ui:CardControl.Header><Grid><Grid.RowDefinitions>@@ -244,20 +244,20 @@Margin="0,8,0,0"Orientation="Horizontal"><Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"Margin="0,0,4,4"- Padding="6,3">+ Padding="6,3"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"><ui:TextBlock FontTypography="Caption"><Run Text="{Binding ViewModel.SystemInfo.Cpu.CurrentClockMHz}" /><Run Text="MHz" /></ui:TextBlock></Border><Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"Margin="0,0,4,4"- Padding="6,3">+ Padding="6,3"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"><ui:TextBlock FontTypography="Caption"><Run Text="L2:" /><Run Text="{Binding ViewModel.SystemInfo.Cpu.L2CacheKB}" />@@ -265,10 +265,10 @@</ui:TextBlock></Border><Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"Margin="0,0,4,4"- Padding="6,3">+ Padding="6,3"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"><ui:TextBlock FontTypography="Caption"><Run Text="L3:" /><Run Text="{Binding ViewModel.SystemInfo.Cpu.L3CacheKB}" />@@ -282,9 +282,9 @@<!-- RAM --><ui:CardControl- Icon="{ui:SymbolIcon Memory16}"Margin="0,5,5,0"- VerticalAlignment="Stretch">+ VerticalAlignment="Stretch"+ Icon="{ui:SymbolIcon Memory16}"><ui:CardControl.Header><Grid><Grid.RowDefinitions>@@ -317,9 +317,9 @@Margin="0,8,0,0"Orientation="Horizontal"><Border+ Padding="6,3"Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Padding="6,3">+ CornerRadius="4"><ui:TextBlock FontTypography="Caption"><Run Text="{ext:Loc Dashboard.SystemInfo.Ram.Modules, {Binding ViewModel.RuntimeRam.Modules.Count, Mode=OneWay}}" /></ui:TextBlock>@@ -331,9 +331,9 @@<!-- GPU --><ui:CardControl- Icon="{ui:SymbolIcon NetworkAdapter16}"Margin="5,5,0,0"- VerticalAlignment="Stretch">+ VerticalAlignment="Stretch"+ Icon="{ui:SymbolIcon NetworkAdapter16}"><ui:CardControl.Header><Grid><Grid.RowDefinitions>@@ -357,30 +357,30 @@Margin="0,8,0,0"Orientation="Horizontal"><Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"Margin="0,0,4,4"- Padding="6,3">+ Padding="6,3"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"><ui:TextBlock FontTypography="Caption"><Run Text="{Binding ViewModel.SystemInfo.PrimaryGpu.MemoryMB, Converter={StaticResource MBToGBConverter}}" /><Run Text="GB" /></ui:TextBlock></Border><Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"Margin="0,0,4,4"- Padding="6,3">+ Padding="6,3"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"><ui:TextBlockFontTypography="Caption"Text="{Binding ViewModel.SystemInfo.PrimaryGpu.DriverVersion}"TextTrimming="CharacterEllipsis" /></Border><Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"Margin="0,0,4,4"Padding="6,3"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"Visibility="{Binding ViewModel.SystemInfo.Gpus.Count, Converter={StaticResource GreaterThanOneToVisibilityConverter}}"><ui:TextBlock FontTypography="Caption"><Run Text="{ext:Loc Dashboard.SystemInfo.Gpu.More, {Binding ViewModel.SystemInfo.Gpus.Count, Mode=OneWay, Converter={StaticResource MinusOneConverter}}}" />@@ -393,12 +393,12 @@</UniformGrid><!-- Storage Section -->- <ui:TextBlock- FontTypography="BodyStrong"+ <ui:TextBlockMargin="0,20,0,8"+ FontTypography="BodyStrong"Text="{ext:Loc Dashboard.SystemInfo.Storage.Header}" />- <ItemsControl ItemsSource="{Binding ViewModel.SystemInfo.Disk.Volumes}">+ <ItemsControl ItemsSource="{Binding ViewModel.RuntimeDisk.Volumes}"><ItemsControl.ItemTemplate><DataTemplate><ui:CardControl Margin="0,0,0,8">@@ -427,22 +427,22 @@<!-- Drive Letter and Label --><StackPanel Grid.Row="0" Orientation="Horizontal"><ui:TextBlock- FontTypography="BodyStrong"Margin="0,0,5,0"+ FontTypography="BodyStrong"Text="{Binding Letter, StringFormat='({0})'}" /><ui:TextBlock- FontTypography="Caption"Margin="0,0,5,0"- Text="{Binding Label}"- VerticalAlignment="Center" />+ VerticalAlignment="Center"+ FontTypography="Caption"+ Text="{Binding Label}" /><Border- Background="{DynamicResource SystemFillColorAttentionBrush}"- CornerRadius="4"Margin="0,0,4,0"Padding="5,2"VerticalAlignment="Center"+ Background="{DynamicResource SystemFillColorAttentionBrush}"+ CornerRadius="4"Visibility="{Binding SystemDrive, Converter={StaticResource BoolToVisibilityConverter}}"><ui:TextBlockFontTypography="Caption"@@ -451,11 +451,11 @@</Border><Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"Margin="0,0,4,0"Padding="5,2"- VerticalAlignment="Center">+ VerticalAlignment="Center"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"><ui:TextBlock FontTypography="Caption" Text="{Binding MediaType}"><ui:TextBlock.Style><Style TargetType="ui:TextBlock">@@ -473,20 +473,20 @@</Border><Border- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"Padding="5,2"- VerticalAlignment="Center">+ VerticalAlignment="Center"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="4"><ui:TextBlock FontTypography="Caption" Text="{Binding FileSystem}" /></Border></StackPanel><!-- Model Information --><ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"Grid.Row="1"Margin="0,4,0,0"+ Appearance="Secondary"+ FontTypography="Caption"Text="{Binding Model}"TextTrimming="CharacterEllipsis"Visibility="{Binding Model, Converter={StaticResource NullToVisibilityConverter}}" />