Use new DLL and bump version

irusanov · Mar 1, 2024 · b082d15 · b082d15
1 parent dee2f2b
commit b082d15
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 210 deletions.
diff --git a/Prebuilt/ZenStates-Core.dll b/Prebuilt/ZenStates-Core.dll
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("irusanov")]
 [assembly: AssemblyProduct("Ryzen SDT")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
+[assembly: AssemblyCopyright("Copyright © 2022-2024")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguage("en")]
@@ -33,5 +33,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.35.0")]
-[assembly: AssemblyFileVersion("1.35.0")]
+[assembly: AssemblyVersion("1.36.0")]
+[assembly: AssemblyFileVersion("1.36.0")]
diff --git a/SettingsForm.cs b/SettingsForm.cs
@@ -14,7 +14,6 @@
 using System.Windows.Forms;
 using ZenStates.Core;
 using ZenStatesDebugTool.Properties;
-using ZenStatesDebugTool.Utils;
 using Application = System.Windows.Forms.Application;
 using static ZenStates.Core.Cpu;
 using Microsoft.Win32.TaskScheduler;
@@ -106,14 +105,14 @@ private void DisplaySystemInfo()
             {
                 cpuInfoLabel.Text = cpu.systemInfo.CpuName;
                 modelInfoLabel.Text = $"{cpu.systemInfo.Model:X2}";
-                packageTypeInfoLabel.Text = cpu.systemInfo.PackageType;
+                packageTypeInfoLabel.Text = cpu.info.packageType.ToString();
                 mbVendorInfoLabel.Text = cpu.systemInfo.MbVendor;
                 mbModelInfoLabel.Text = cpu.systemInfo.MbName;
                 biosInfoLabel.Text = cpu.systemInfo.BiosVersion;
                 smuInfoLabel.Text = cpu.systemInfo.GetSmuVersionString();
                 firmwareInfoLabel.Text = $"{cpu.systemInfo.PatchLevel:X8}";
                 cpuIdLabel.Text = $"{cpu.systemInfo.GetCpuIdString()} ({cpu.info.codeName})";
-                configInfoLabel.Text = $"{cpu.systemInfo.CCDCount} CCD / {cpu.systemInfo.CCXCount} CCX / {cpu.systemInfo.PhysicalCoreCount} physical cores";
+                configInfoLabel.Text = $"{cpu.info.topology.ccds} CCD / {cpu.info.topology.ccxs} CCX / {cpu.systemInfo.PhysicalCoreCount} physical cores";
             }
             catch { }
         }
@@ -1412,7 +1411,7 @@ private void PopulateWmiFunctions()
                 {
                     try
                     {
-                        pack = WMI.InvokeMethod(classInstance, functionObject, "pack", null, 0);
+                        pack = WMI.InvokeMethodAndGetValue(classInstance, functionObject, "pack", null, 0);
 
                         if (pack != null)
                         {
@@ -1461,7 +1460,7 @@ private void ComboBoxAvailableCommands_SelectedIndexChanged(object sender, Event
 
             if (command.isSet) {
                 // Get possible values (index) of a memory option in BIOS
-                var dvaluesPack = WMI.InvokeMethod(classInstance, "Getdvalues", "pack", "ID", command.value);
+                var dvaluesPack = WMI.InvokeMethodAndGetValue(classInstance, "Getdvalues", "pack", "ID", command.value);
                 if (dvaluesPack != null)
                 {
                     uint[] DValuesBuffer = (uint[])dvaluesPack.GetPropertyValue("DValuesBuffer");

diff --git a/Utils/WMI.cs b/Utils/WMI.cs
diff --git a/ZenStatesDebugTool.csproj b/ZenStatesDebugTool.csproj
@@ -105,7 +105,6 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Utils\WMI.cs" />
     <EmbeddedResource Include="SMUMonitor.resx">
       <DependentUpon>SMUMonitor.cs</DependentUpon>
     </EmbeddedResource>