Bug fixes

Author: JamesCJ60

Universal x86 Tuning Utility V2/Universal x86 Tuning Utility V2.vdproj

@@ -213,15 +213,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Universal x86 Tuning Utility"
-        "ProductCode" = "8:{40162B89-0DFB-4610-AC13-3DE70401ECFF}"
-        "PackageCode" = "8:{5EB1B03F-AB72-4D15-B39E-9B4E98803E44}"
+        "ProductCode" = "8:{DEFBF397-8C9E-4623-83FC-0C19218A5BE0}"
+        "PackageCode" = "8:{5C3789E5-0188-4F5D-A599-A411A1B05472}"
         "UpgradeCode" = "8:{300E743A-4C69-440D-9425-14C446AB2658}"
         "AspNetVersion" = "8:"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:FALSE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:2.5.2"
+        "ProductVersion" = "8:2.5.3"
         "Manufacturer" = "8:JamesCJ60"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -763,7 +763,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_0FAC7670CF204A74B0B84BA8720E5EFC"
             {
-            "SourcePath" = "8:..\\Universal x86 Tuning Utility\\obj\\x64\\Release\\net8.0-windows10.0.22621.0\\apphost.exe"
+            "SourcePath" = "8:..\\Universal x86 Tuning Utility\\obj\\Debug\\net8.0-windows10.0.22621.0\\apphost.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_B208FDAB7341429AB15D831E1F00D044"

Universal x86 Tuning Utility/App.xaml.cs

@@ -60,7 +60,7 @@ public static T GetService<T>()
             return _host.Services.GetService(typeof(T)) as T;
         }
 
-        public static string version = "2.5.2";
+        public static string version = "2.5.3";
         private Mutex mutex;
         private const string MutexName = "UniversalX86TuningUtility";
 

Universal x86 Tuning Utility/Scripts/RyzenAdj_To_UXTU.cs

@@ -1,4 +1,5 @@
-using GameLib.Plugin.RiotGames.Model;
+using CpuAffinityUtility;
+using GameLib.Plugin.RiotGames.Model;
 using NvAPIWrapper.Display;
 using RyzenSmu;
 using System;

Universal x86 Tuning Utility/Services/CpuAffinityUtility.cs

@@ -1,14 +1,16 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Management;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
+using System.Runtime.InteropServices;
 
-namespace Universal_x86_Tuning_Utility.Services
+namespace CpuAffinityUtility
 {
+    /// <summary>
+    /// CCD Affinity Manager
+    /// Mode 0 = all CCDs, 1 = primary CCD, 2 = secondary CCD.
+    /// Will be updated for big.LITTLE APUs/CPUs in the future.
+    /// </summary>
     public static class CpuAffinityManager
     {
         private static readonly object _syncRoot = new();
@@ -19,35 +21,27 @@ public static class CpuAffinityManager
 
         public static void SetGlobalAffinity(int mode)
         {
-            try
+            if (mode == _currentMode) return;
+
+            var newMask = BuildMask(mode);
+
+            lock (_syncRoot)
             {
-                if (mode == _currentMode)           // nothing to do
-                    return;
+                if (mode == _currentMode) return;
+
+                _currentMode = mode;
+                _mask = newMask;
 
-                var newMask = BuildMask(mode);
+                foreach (var p in Process.GetProcesses())
+                    TrySetAffinity(p, _mask);
 
-                lock (_syncRoot)
+                if (_watcher == null)
                 {
-                    if (mode == _currentMode)       // double-check inside lock
-                        return;
-
-                    _currentMode = mode;
-                    _mask = newMask;
-
-                    foreach (var p in Process.GetProcesses())
-                        TrySetAffinity(p, _mask);
-
-                    if (_watcher == null)
-                    {
-                        _watcher = new ManagementEventWatcher(
-                            new WqlEventQuery("SELECT ProcessID FROM Win32_ProcessStartTrace"));
-                        _watcher.EventArrived += OnProcessStarted;
-                        _watcher.Start();
-                    }
+                    _watcher = new ManagementEventWatcher(
+                        new WqlEventQuery("SELECT ProcessID FROM Win32_ProcessStartTrace"));
+                    _watcher.EventArrived += OnProcessStarted;
+                    _watcher.Start();
                 }
-            } catch
-            {
-                /* permission or race; ignore */
             }
         }
 
@@ -69,23 +63,24 @@ private static void OnProcessStarted(object? _, EventArrivedEventArgs e)
                 try
                 {
                     using var np = Process.GetProcessById(pid);
-                    TrySetAffinity(np, _mask);   // always latest mask
+                    TrySetAffinity(np, _mask);
                 }
-                catch { /* access denied or process gone */ }
+                catch { /* permission or race; ignore */ }
             }
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static void TrySetAffinity(Process proc, ulong mask)
         {
             try { proc.ProcessorAffinity = (IntPtr)mask; }
-            catch { /* permission or race; ignore */       }
+            catch { /* safe to ignore */ }
         }
 
         private static ulong BuildMask(int mode)
         {
-            int logical = Environment.ProcessorCount;
-            if (logical < 2) throw new NotSupportedException("Needs multiple logical processors.");
+            int logical = (int)GetActiveProcessorCount(ALL_GROUPS);
+
+            if (logical < 2) throw new NotSupportedException("Needs more than one logical processor.");
             if (logical > 64) throw new NotSupportedException("Only one processor group supported.");
 
             int half = logical / 2;
@@ -94,9 +89,12 @@ private static ulong BuildMask(int mode)
             {
                 0 => (1UL << logical) - 1,                               // all cores
                 1 => (1UL << half) - 1,                                  // lower half
-                2 => (1UL << logical) - 1 ^ (1UL << half) - 1,       // upper half
+                2 => ((1UL << logical) - 1) ^ ((1UL << half) - 1),       // upper half
                 _ => throw new ArgumentOutOfRangeException(nameof(mode), "Mode must be 0, 1, or 2.")
             };
         }
+
+        private const uint ALL_GROUPS = 0xFFFF;
+        [DllImport("kernel32.dll")] public static extern uint GetActiveProcessorCount(uint groupNumber);
     }
-}
+}

Universal x86 Tuning Utility/Universal x86 Tuning Utility.csproj

@@ -15,11 +15,11 @@
     <UseWindowsForms>True</UseWindowsForms>
     <SignAssembly>False</SignAssembly>
     <Copyright>© UXTU Team 2020 - 2025</Copyright>
-    <AssemblyVersion>2.5.2</AssemblyVersion>
-    <FileVersion>2.5.2</FileVersion>
+    <AssemblyVersion>2.5.3</AssemblyVersion>
+    <FileVersion>2.5.3</FileVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <SupportedOSPlatformVersion>10.0.22621.0</SupportedOSPlatformVersion>
-    <Version>2.5.2</Version>
+    <Version>2.5.3</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Universal x86 Tuning Utility/Views/Pages/CustomPresets.xaml.cs

@@ -1,4 +1,5 @@
-using RyzenSmu;
+using CpuAffinityUtility;
+using RyzenSmu;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -144,7 +145,7 @@ public CustomPresets()
 
                 if (Family.FAM == Family.RyzenFamily.DragonRange || Family.FAM == Family.RyzenFamily.FireRange || Family.FAM == Family.RyzenFamily.StrixHalo)
                 {
-                   if(Environment.ProcessorCount > 16) sdCcdAffinity.Visibility = Visibility.Visible;
+                   if((int)CpuAffinityManager.GetActiveProcessorCount(0xFFFF) > 16) sdCcdAffinity.Visibility = Visibility.Visible;
                 }
             }
 

Universal x86 Tuning Utility/Views/Pages/DashboardPage.xaml

@@ -60,7 +60,7 @@
                             <TextBlock
                             FontSize="18"
                             Foreground="#B7FFFFFF"
-                            Text="V2.5.2 Stable" />
+                            Text="V2.5.3 Stable" />
                             <ui:Button
                                 Name="btnPremade"
                             Height="36"