diff --git a/external/LibreHardwareMonitor/LibreHardwareMonitorLib.dll b/external/LibreHardwareMonitor/LibreHardwareMonitorLib.dll index 35cdb183..2e27dbb9 100644 Binary files a/external/LibreHardwareMonitor/LibreHardwareMonitorLib.dll and b/external/LibreHardwareMonitor/LibreHardwareMonitorLib.dll differ diff --git a/external/LibreHardwareMonitor/test_librehardwaremonitor.py b/external/LibreHardwareMonitor/test_librehardwaremonitor.py index 9f4e8e0d..7a5d5d7c 100644 --- a/external/LibreHardwareMonitor/test_librehardwaremonitor.py +++ b/external/LibreHardwareMonitor/test_librehardwaremonitor.py @@ -3,41 +3,38 @@ import ctypes import os import sys -from pathlib import Path import clr # Clr is from pythonnet package. Do not install clr package from win32api import * -MAIN_DIRECTORY = str(Path(__file__).parent.resolve()) +if ctypes.windll.shell32.IsUserAnAdmin() == 0: + print("Program is not running as administrator. Please run again with admin rights.") + try: + sys.exit(0) + except: + os._exit(0) # noinspection PyUnresolvedReferences -clr.AddReference(MAIN_DIRECTORY + '\\LibreHardwareMonitorLib.dll') +clr.AddReference(os.getcwd() + '\\LibreHardwareMonitorLib.dll') # noinspection PyUnresolvedReferences -clr.AddReference(MAIN_DIRECTORY + '\\HidSharp.dll') +clr.AddReference(os.getcwd() + '\\HidSharp.dll') # noinspection PyUnresolvedReferences from LibreHardwareMonitor import Hardware -File_information = GetFileVersionInfo(MAIN_DIRECTORY + '\\LibreHardwareMonitorLib.dll', "\\") +File_information = GetFileVersionInfo(os.getcwd() + '\\LibreHardwareMonitorLib.dll', "\\") ms_file_version = File_information['FileVersionMS'] ls_file_version = File_information['FileVersionLS'] print("Found LibreHardwareMonitorLib %s" % ".".join([str(HIWORD(ms_file_version)), str(LOWORD(ms_file_version)), str(HIWORD(ls_file_version)), str(LOWORD(ls_file_version))])) -File_information = GetFileVersionInfo(MAIN_DIRECTORY + '\\HidSharp.dll', "\\") +File_information = GetFileVersionInfo(os.getcwd() + '\\HidSharp.dll', "\\") ms_file_version = File_information['FileVersionMS'] ls_file_version = File_information['FileVersionLS'] print("Found HidSharp %s" % ".".join([str(HIWORD(ms_file_version)), str(LOWORD(ms_file_version)), str(HIWORD(ls_file_version)), str(LOWORD(ls_file_version))])) -if ctypes.windll.shell32.IsUserAnAdmin() == 0: - print("Program is not running as administrator. Please run again with admin rights.") - try: - sys.exit(0) - except: - os._exit(0) - handle = Hardware.Computer() handle.IsCpuEnabled = True handle.IsGpuEnabled = True