Browse Source

* fix for Mantis #38020: apply patch by Sergey Larin to use GetModuleHandle instead of LoadLibrary to retrieve GetTickCount64

git-svn-id: trunk@47274 -
svenbarth 4 years ago
parent
commit
71c30761dd
1 changed files with 3 additions and 9 deletions
  1. 3 9
      rtl/win/sysutils.pp

+ 3 - 9
rtl/win/sysutils.pp

@@ -911,19 +911,13 @@ var
 {$ENDIF}
 
 function GetTickCount64: QWord;
-{$IFNDEF WINCE}
-var
-  lib: THandle;
-{$ENDIF}
 begin
 {$IFNDEF WINCE}
+  if Assigned(WinGetTickCount64) then
+    Exit(WinGetTickCount64());
   { on Vista and newer there is a GetTickCount64 implementation }
   if Win32MajorVersion >= 6 then begin
-    if not Assigned(WinGetTickCount64) then begin
-      lib := LoadLibrary('kernel32.dll');
-      WinGetTickCount64 := TGetTickCount64(
-                             GetProcAddress(lib, 'GetTickCount64'));
-    end;
+    WinGetTickCount64 := TGetTickCount64(GetProcAddress(GetModuleHandle('kernel32.dll'), 'GetTickCount64'));
     Result := WinGetTickCount64();
   end else
 {$ENDIF}