JMR-dev/ReLibreHardwareMonitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Ring0 and InpOut cleanup (#898)

Browse Source 
Also GZip resources for crappy AV and update editorconfig for static fields.
This commit is contained in:
PhyxionNL
2022-11-18 18:56:10 +01:00
committed by GitHub
parent 1cc688388d
commit fd723f38ed
8 changed files with 94 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.editorconfig
+1 -1
View File
@@ -66,7 +66,7 @@ dotnet_naming_rule.static_fields_should_have_prefix.style = static_prefix_sty
dotnet_naming_symbols.static_fields.applicable_kinds = field
dotnet_naming_symbols.static_fields.required_modifiers = static
dotnet_naming_symbols.static_fields.applicable_accessibilities = private, internal, private_protected
dotnet_naming_style.static_prefix_style.required_prefix = s_
dotnet_naming_style.static_prefix_style.required_prefix = _
dotnet_naming_style.static_prefix_style.capitalization = camel_case
# internal and private fields should be _camelCase
LibreHardwareMonitorLib/Hardware/InpOut.cs
+40 -42
View File
@@ -1,6 +1,7 @@
using System;
using System.Diagnostics;
using System.IO;
using System.IO.Compression;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading;
@@ -45,7 +46,7 @@ internal static class InpOut
}
if (!IsOpen)
DeleteDll();
Delete();
return IsOpen;
}
@@ -55,7 +56,7 @@ internal static class InpOut
if (_libraryHandle != IntPtr.Zero)
{
Kernel32.FreeLibrary(_libraryHandle);
DeleteDll();
Delete();
_libraryHandle = IntPtr.Zero;
}
@@ -81,15 +82,13 @@ internal static class InpOut
return null;
}
private static void DeleteDll()
private static void Delete()
{
try
{
// try to delete the DLL
if (_filePath != null && File.Exists(_filePath))
{
File.Delete(_filePath);
}
_filePath = null;
}
@@ -127,7 +126,7 @@ internal static class InpOut
if (!string.IsNullOrEmpty(filePath))
return Path.Combine(Path.GetDirectoryName(filePath) ?? string.Empty, fileName);
filePath = GetPathFromAssembly(typeof(Ring0).Assembly);
filePath = GetPathFromAssembly(typeof(InpOut).Assembly);
if (!string.IsNullOrEmpty(filePath))
return Path.Combine(Path.GetDirectoryName(filePath) ?? string.Empty, fileName);
@@ -149,61 +148,60 @@ internal static class InpOut
private static bool Extract(string filePath)
{
string resourceName = $"{nameof(LibreHardwareMonitor)}.Resources.{(Software.OperatingSystem.Is64Bit ? "inpoutx64.dll" : "inpout32.dll")}";
string resourceName = $"{nameof(LibreHardwareMonitor)}.Resources.{(Software.OperatingSystem.Is64Bit ? "inpoutx64.gz" : "inpout32.gz")}";
Assembly assembly = typeof(Ring0).Assembly;
string[] names = assembly.GetManifestResourceNames();
byte[] buffer = null;
for (int i = 0; i < names.Length; i++)
{
if (names[i].Replace('\\', '.') == resourceName)
{
using Stream stream = assembly.GetManifestResourceStream(names[i]);
if (stream != null)
{
buffer = new byte[stream.Length];
stream.Read(buffer, 0, buffer.Length);
}
}
}
if (buffer == null)
return false;
Assembly assembly = typeof(InpOut).Assembly;
long requiredLength = 0;
try
{
using FileStream target = new(filePath, FileMode.Create);
using Stream stream = assembly.GetManifestResourceStream(resourceName);
target.Write(buffer, 0, buffer.Length);
target.Flush();
if (stream != null)
{
using FileStream target = new(filePath, FileMode.Create);
stream.Position = 1; // Skip first byte.
using var gzipStream = new GZipStream(stream, CompressionMode.Decompress);
gzipStream.CopyTo(target);
requiredLength = target.Length;
}
}
catch
{
// for example there is not enough space on the disk
return false;
}
// make sure the file is actually written to the file system
if (HasValidFile())
return true;
// Ensure the file is actually written to the file system.
var stopwatch = new Stopwatch();
stopwatch.Start();
while (stopwatch.ElapsedMilliseconds < 2000)
{
try
{
if (File.Exists(filePath) && new FileInfo(filePath).Length == buffer.Length)
return true;
}
catch
{ }
if (HasValidFile())
return true;
Thread.Sleep(1);
Thread.Yield();
}
// file still has not the right size, something is wrong
return false;
bool HasValidFile()
{
try
{
return File.Exists(filePath) && new FileInfo(filePath).Length == requiredLength;
}
catch
{
return false;
}
}
}
}
LibreHardwareMonitorLib/Hardware/Ring0.cs
+48 -73
View File
@@ -7,10 +7,9 @@
using System;
using System.Diagnostics;
using System.IO;
using System.IO.Compression;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Security.AccessControl;
using System.Security.Principal;
using System.Text;
using System.Threading;
@@ -47,7 +46,7 @@ internal static class Ring0
{
// driver is not loaded, try to install and open
_filePath = GetFilePath();
if (_filePath != null && ExtractDriver(_filePath))
if (_filePath != null && Extract(_filePath))
{
if (_driver.Install(_filePath, out string installError))
{
@@ -82,7 +81,7 @@ internal static class Ring0
if (!_driver.IsOpen)
{
_driver.Delete();
DeleteDriver();
Delete();
}
}
else
@@ -113,90 +112,67 @@ internal static class Ring0
}
}
private static bool ExtractDriver(string filePath)
private static bool Extract(string filePath)
{
string resourceName = $"{nameof(LibreHardwareMonitor)}.Resources.{(Software.OperatingSystem.Is64Bit ? "WinRing0x64.sys" : "WinRing0.sys")}";
string resourceName = $"{nameof(LibreHardwareMonitor)}.Resources.{(Software.OperatingSystem.Is64Bit ? "WinRing0x64.gz" : "WinRing0.gz")}";
Assembly assembly = typeof(Ring0).Assembly;
string[] names = assembly.GetManifestResourceNames();
byte[] buffer = null;
for (int i = 0; i < names.Length; i++)
{
if (names[i].Replace('\\', '.') == resourceName)
{
using Stream stream = assembly.GetManifestResourceStream(names[i]);
if (stream != null)
{
buffer = new byte[stream.Length];
stream.Read(buffer, 0, buffer.Length);
}
}
}
if (buffer == null)
return false;
long requiredLength = 0;
try
{
using FileStream target = new(filePath, FileMode.Create);
using Stream stream = assembly.GetManifestResourceStream(resourceName);
target.Write(buffer, 0, buffer.Length);
target.Flush();
if (stream != null)
{
using FileStream target = new(filePath, FileMode.Create);
stream.Position = 1; // Skip first byte.
using var gzipStream = new GZipStream(stream, CompressionMode.Decompress);
gzipStream.CopyTo(target);
requiredLength = target.Length;
}
}
catch (IOException)
catch
{
// for example there is not enough space on the disk
return false;
}
// make sure the file is actually written to the file system
if (HasValidFile())
return true;
// Ensure the file is actually written to the file system.
var stopwatch = new Stopwatch();
stopwatch.Start();
while (stopwatch.ElapsedMilliseconds < 2000)
{
try
{
if (File.Exists(filePath) && new FileInfo(filePath).Length == buffer.Length)
return true;
}
catch
{ }
if (HasValidFile())
return true;
Thread.Sleep(1);
Thread.Yield();
}
// file still has not the right size, something is wrong
return false;
bool HasValidFile()
{
try
{
return File.Exists(filePath) && new FileInfo(filePath).Length == requiredLength;
}
catch
{
return false;
}
}
}
private static bool TryCreateOrOpenExistingMutex(string name, out Mutex mutex)
{
#if NETFRAMEWORK
MutexSecurity mutexSecurity = new();
SecurityIdentifier identity = new(WellKnownSidType.WorldSid, null);
mutexSecurity.AddAccessRule(new MutexAccessRule(identity, MutexRights.Synchronize | MutexRights.Modify, AccessControlType.Allow));
try
{
// If the CreateMutex call fails, the framework will attempt to use OpenMutex
// to open the named mutex requesting SYNCHRONIZE and MUTEX_MODIFY rights.
mutex = new Mutex(false, name, out _, mutexSecurity);
return true;
}
catch
{
// WaitHandleCannotBeOpenedException:
// The mutex cannot be opened, probably because a Win32 object of a different type with the same name already exists.
// UnauthorizedAccessException:
// The mutex exists, but the current process or thread token does not have permission to open the mutex with SYNCHRONIZE | MUTEX_MODIFY rights.
mutex = null;
return false;
}
#else
try
{
mutex = new Mutex(false, name);
@@ -209,15 +185,16 @@ internal static class Ring0
mutex = Mutex.OpenExisting(name);
return true;
}
catch { }
mutex = null;
catch
{
mutex = null;
}
}
return false;
#endif
}
private static void DeleteDriver()
private static void Delete()
{
try
{
@@ -228,9 +205,7 @@ internal static class Ring0
_filePath = null;
}
catch
{
// Mutex could not be created or opened
}
{ }
}
private static string GetServiceName()
@@ -378,7 +353,7 @@ internal static class Ring0
}
// try to delete temporary driver file again if failed during open
DeleteDriver();
Delete();
}
public static string GetReport()
LibreHardwareMonitorLib/LibreHardwareMonitorLib.csproj
+5 -5
View File
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
<AssemblyName>LibreHardwareMonitorLib</AssemblyName>
@@ -28,10 +28,10 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\inpout32.dll" />
<EmbeddedResource Include="Resources\inpoutx64.dll" />
<EmbeddedResource Include="Resources\WinRing0.sys" />
<EmbeddedResource Include="Resources\WinRing0x64.sys" />
<EmbeddedResource Include="Resources\inpout32.gz" />
<EmbeddedResource Include="Resources\inpoutx64.gz" />
<EmbeddedResource Include="Resources\WinRing0.gz" />
<EmbeddedResource Include="Resources\WinRing0x64.gz" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
LibreHardwareMonitorLib/Resources/WinRing0.gz
BIN
View File
Binary file not shown.
LibreHardwareMonitorLib/Resources/WinRing0x64.gz
BIN
View File
Binary file not shown.
LibreHardwareMonitorLib/Resources/inpout32.gz
BIN
View File
Binary file not shown.
LibreHardwareMonitorLib/Resources/inpoutx64.gz
BIN
View File
Binary file not shown.