fixup! Add DIMM Temperature to LHM

Author: sergiye

OpenHardwareMonitor/UI/MainForm.cs

@@ -197,7 +197,7 @@ public MainForm()
             }
         };
 
-        if (_startupManager.IsAdministrator())
+        if (OperatingSystemHelper.IsAdministrator())
         {
             _readMainboardSensors = new UserOption("mainboardMenuItem", true, mainboardMenuItem, _settings);
             _readMainboardSensors.Changed += delegate { _computer.IsMotherboardEnabled = _readMainboardSensors.Value; };

OpenHardwareMonitor/UI/StartupManager.cs

@@ -15,20 +15,6 @@ public class StartupManager
         private bool _startup;
         private const string REGISTRY_RUN = @"Software\Microsoft\Windows\CurrentVersion\Run";
 
-        public bool IsAdministrator()
-        {
-            try
-            {
-                WindowsIdentity identity = WindowsIdentity.GetCurrent();
-                WindowsPrincipal principal = new(identity);
-                return principal.IsInRole(WindowsBuiltInRole.Administrator);
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
         public StartupManager()
         {
             if (OperatingSystemHelper.IsUnix)
@@ -38,7 +24,7 @@ public StartupManager()
                 return;
             }
 
-            if (IsAdministrator())
+            if (OperatingSystemHelper.IsAdministrator())
             {
                 try
                 {

OpenHardwareMonitorLib/Hardware/InpOut.cs

@@ -194,13 +194,9 @@ private static bool Extract(string filePath)
             if (stream != null)
             {
                 using FileStream target = new(filePath, FileMode.Create);
-
-                stream.Position = 1; // Skip first byte.
-
+                //stream.Position = 1; // Skip first byte.
                 using var gzipStream = new GZipStream(stream, CompressionMode.Decompress);
-
                 gzipStream.CopyTo(target);
-
                 requiredLength = target.Length;
             }
         }

OpenHardwareMonitorLib/Hardware/Memory/MemoryGroup.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using System.Timers;
+using System.Threading.Tasks;
 using RAMSPDToolkit.I2CSMBus;
 using RAMSPDToolkit.SPD;
 using RAMSPDToolkit.SPD.Enums;
@@ -13,19 +13,15 @@ internal class MemoryGroup : IGroup
 {
     //Retry 12x
     private const int RetryCount = 12;
-
     //Retry every 2.5 seconds
-    private const double RetryTime = 2500;
+    private const int RetryTime = 2500;
     private static readonly object _lock = new();
 
     private readonly List<Hardware> _hardware = [];
-    private int _elapsedCounter;
-
-    private Timer _timer;
 
     static MemoryGroup()
     {
-        if (Ring0.IsOpen)
+        if (OperatingSystemHelper.IsAdministrator() && Ring0.IsOpen)
         {
             //Assign implementation of IDriver
             DriverManager.Driver = new RAMSPDToolkitDriver(Ring0.KernelDriver);
@@ -38,30 +34,23 @@ public MemoryGroup(ISettings settings)
         _hardware.Add(new TotalMemory(settings));
         _hardware.Add(new VirtualMemory(settings));
 
-        //No RAM detected
-        if (!DetectThermalSensors(out List<SPDAccessor> accessors))
+        if (OperatingSystemHelper.IsAdministrator())
         {
-            //Retry a couple of times
-            //SMBus might not be detected right after boot
-            _timer = new Timer(RetryTime);
-
-            _timer.Elapsed += (_, _) =>
+            Task.Run(async () =>
             {
-                if (_elapsedCounter++ >= RetryCount || DetectThermalSensors(out accessors))
+                var _elapsedCounter = 0;
+                while (true)
                 {
-                    _timer.Stop();
-                    _timer = null;
-
-                    if (accessors != null)
-                        AddDimms(accessors, settings);
+                    //SMBus might not be detected right after boot
+                    if (DetectThermalSensors(out var accessors) || _elapsedCounter++ >= RetryCount)
+                    {
+                        if (accessors != null)
+                            AddDimms(accessors, settings);
+                        break;
+                    }
+                    await Task.Delay(RetryTime);
                 }
-            };
-
-            _timer.Start();
-        }
-        else
-        {
-            AddDimms(accessors, settings);
+            });
         }
     }
 

OpenHardwareMonitorLib/Hardware/Ring0.cs

@@ -104,13 +104,9 @@ private static bool Extract(string filePath)
             if (stream != null)
             {
                 using FileStream target = new(filePath, FileMode.Create);
-
-                stream.Position = 1; // Skip first byte.
-
+                //stream.Position = 1; // Skip first byte.
                 using var gzipStream = new GZipStream(stream, CompressionMode.Decompress);
-
                 gzipStream.CopyTo(target);
-
                 requiredLength = target.Length;
             }
         }