Merge pull request #858 from mathoudebine/fix/855-windows-security-is-mislabing-the-sys-file

Author: mathoudebine

external/LibreHardwareMonitor/LibreHardwareMonitorLib.dll

@@ -3,38 +3,41 @@
 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 *
 
-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)
+MAIN_DIRECTORY = str(Path(__file__).parent.resolve())
 
 # noinspection PyUnresolvedReferences
-clr.AddReference(os.getcwd() + '\\LibreHardwareMonitorLib.dll')
+clr.AddReference(MAIN_DIRECTORY + '\\LibreHardwareMonitorLib.dll')
 # noinspection PyUnresolvedReferences
-clr.AddReference(os.getcwd() + '\\HidSharp.dll')
+clr.AddReference(MAIN_DIRECTORY + '\\HidSharp.dll')
 # noinspection PyUnresolvedReferences
 from LibreHardwareMonitor import Hardware
 
-File_information = GetFileVersionInfo(os.getcwd() + '\\LibreHardwareMonitorLib.dll', "\\")
+File_information = GetFileVersionInfo(MAIN_DIRECTORY + '\\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(os.getcwd() + '\\HidSharp.dll', "\\")
+File_information = GetFileVersionInfo(MAIN_DIRECTORY + '\\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