Changeset 96476 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

Aug 25, 2022 2:46:22 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

153324

Message:

IPRT: Resolve IsDebuggerPresent and GetSystemTimeAsFileTime dynamically as they are not present on windows version before NT4. bugref:10261

Location:

trunk/src/VBox/Runtime/r3/win

Files:

• init-win.cpp (modified) (2 diffs)
• internal-r3-win.h (modified) (1 diff)
• thread-win.cpp (modified) (1 diff)
• time-win.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/win/init-win.cpp

@@ -92 +92 @@
 DECL_HIDDEN_DATA(decltype(GetHandleInformation) *)              g_pfnGetHandleInformation = NULL;
 DECL_HIDDEN_DATA(decltype(SetHandleInformation) *)              g_pfnSetHandleInformation = NULL;
+DECL_HIDDEN_DATA(decltype(IsDebuggerPresent) *)                 g_pfnIsDebuggerPresent = NULL;
+DECL_HIDDEN_DATA(decltype(GetSystemTimeAsFileTime) *)           g_pfnGetSystemTimeAsFileTime = NULL;
 
 /** The native ntdll.dll handle. */
@@ -566 +568 @@
         g_pfnGetSystemWindowsDirectoryW  = (PFNGETWINSYSDIR)GetProcAddress(g_hModKernel32, "GetWindowsDirectoryW");
     g_pfnSystemTimeToTzSpecificLocalTime = (decltype(SystemTimeToTzSpecificLocalTime) *)GetProcAddress(g_hModKernel32, "SystemTimeToTzSpecificLocalTime");
-    g_pfnCreateWaitableTimerExW     = (PFNCREATEWAITABLETIMEREX)        GetProcAddress(g_hModKernel32, "CreateWaitableTimerExW");
-    g_pfnGetHandleInformation       = (decltype(GetHandleInformation) *)GetProcAddress(g_hModKernel32, "GetHandleInformation");
-    g_pfnSetHandleInformation       = (decltype(SetHandleInformation) *)GetProcAddress(g_hModKernel32, "SetHandleInformation");
-    Assert(g_pfnSetHandleInformation || g_enmWinVer < kRTWinOSType_NT351);
-    Assert(g_pfnGetHandleInformation || g_enmWinVer < kRTWinOSType_NT351);
+    g_pfnCreateWaitableTimerExW     = (PFNCREATEWAITABLETIMEREX)           GetProcAddress(g_hModKernel32, "CreateWaitableTimerExW");
+    g_pfnGetHandleInformation       = (decltype(GetHandleInformation) *)   GetProcAddress(g_hModKernel32, "GetHandleInformation");
+    g_pfnSetHandleInformation       = (decltype(SetHandleInformation) *)   GetProcAddress(g_hModKernel32, "SetHandleInformation");
+    g_pfnIsDebuggerPresent          = (decltype(IsDebuggerPresent) *)      GetProcAddress(g_hModKernel32, "IsDebuggerPresent");
+    g_pfnGetSystemTimeAsFileTime    = (decltype(GetSystemTimeAsFileTime) *)GetProcAddress(g_hModKernel32, "GetSystemTimeAsFileTime");
+    Assert(g_pfnSetHandleInformation    || g_enmWinVer < kRTWinOSType_NT351);
+    Assert(g_pfnGetHandleInformation    || g_enmWinVer < kRTWinOSType_NT351);
+    Assert(g_pfnIsDebuggerPresent       || g_enmWinVer < kRTWinOSType_NT4);
+    Assert(g_pfnGetSystemTimeAsFileTime || g_enmWinVer < kRTWinOSType_NT4);
 
     /*

trunk/src/VBox/Runtime/r3/win/internal-r3-win.h

@@ -116 +116 @@
 extern DECL_HIDDEN_DATA(HMODULE)                        g_hModKernel32;
 typedef UINT (WINAPI *PFNGETWINSYSDIR)(LPWSTR,UINT);
-extern DECL_HIDDEN_DATA(PFNGETWINSYSDIR)                g_pfnGetSystemWindowsDirectoryW;
+extern DECL_HIDDEN_DATA(PFNGETWINSYSDIR)                                g_pfnGetSystemWindowsDirectoryW;
 extern DECL_HIDDEN_DATA(decltype(SystemTimeToTzSpecificLocalTime) *)    g_pfnSystemTimeToTzSpecificLocalTime;
 typedef HANDLE (WINAPI *PFNCREATEWAITABLETIMEREX)(LPSECURITY_ATTRIBUTES, LPCWSTR, DWORD, DWORD);
-extern DECL_HIDDEN_DATA(PFNCREATEWAITABLETIMEREX)       g_pfnCreateWaitableTimerExW;
+extern DECL_HIDDEN_DATA(PFNCREATEWAITABLETIMEREX)                       g_pfnCreateWaitableTimerExW;
 extern DECL_HIDDEN_DATA(decltype(GetHandleInformation) *)               g_pfnGetHandleInformation;
 extern DECL_HIDDEN_DATA(decltype(SetHandleInformation) *)               g_pfnSetHandleInformation;
+extern DECL_HIDDEN_DATA(decltype(IsDebuggerPresent) *)                  g_pfnIsDebuggerPresent;
+extern DECL_HIDDEN_DATA(decltype(GetSystemTimeAsFileTime) *)            g_pfnGetSystemTimeAsFileTime;
 typedef UINT (WINAPI *PFNGETWINSYSDIR)(LPWSTR,UINT);
-extern DECL_HIDDEN_DATA(PFNGETWINSYSDIR)                g_pfnGetSystemWindowsDirectoryW;
+extern DECL_HIDDEN_DATA(PFNGETWINSYSDIR)                                g_pfnGetSystemWindowsDirectoryW;
 
 

trunk/src/VBox/Runtime/r3/win/thread-win.cpp

@@ -195 +195 @@
 DECLINLINE(void) rtThreadWinSetThreadName(PRTTHREADINT pThread, DWORD idThread)
 {
-    if (IsDebuggerPresent())
+    if (g_pfnIsDebuggerPresent && g_pfnIsDebuggerPresent())
         rtThreadWinTellDebuggerThreadName(idThread, &pThread->szName[0]);
 

trunk/src/VBox/Runtime/r3/win/time-win.cpp

@@ -178 +178 @@
     uint64_t u64;
     AssertCompile(sizeof(u64) == sizeof(FILETIME));
-    GetSystemTimeAsFileTime((LPFILETIME)&u64);
+    if (g_pfnGetSystemTimeAsFileTime)
+        g_pfnGetSystemTimeAsFileTime((LPFILETIME)&u64);
+    else
+    {
+        SYSTEMTIME SysTime = {0};
+        GetSystemTime(&SysTime);
+        BOOL fRet = SystemTimeToFileTime(&SysTime, (LPFILETIME)&u64);
+        Assert(fRet); RT_NOREF(fRet);
+    }
     return RTTimeSpecSetNtTime(pTime, u64);
+
 }
 
@@ -185 +194 @@
 RTDECL(PRTTIMESPEC) RTTimeLocalNow(PRTTIMESPEC pTime)
 {
-    uint64_t u64;
-    AssertCompile(sizeof(u64) == sizeof(FILETIME));
-    GetSystemTimeAsFileTime((LPFILETIME)&u64);
     uint64_t u64Local;
-    if (!FileTimeToLocalFileTime((FILETIME const *)&u64, (LPFILETIME)&u64Local))
-        u64Local = u64;
+    if (g_pfnGetSystemTimeAsFileTime)
+    {
+        uint64_t u64;
+        AssertCompile(sizeof(u64) == sizeof(FILETIME));
+        g_pfnGetSystemTimeAsFileTime((LPFILETIME)&u64);
+        if (!FileTimeToLocalFileTime((FILETIME const *)&u64, (LPFILETIME)&u64Local))
+            u64Local = u64;
+    }
+    else
+    {
+        SYSTEMTIME SysTime = {0};
+        GetLocalTime(&SysTime);
+        BOOL fRet = SystemTimeToFileTime(&SysTime, (LPFILETIME)&u64Local);
+        Assert(fRet); RT_NOREF(fRet);
+    }
     return RTTimeSpecSetNtTime(pTime, u64Local);
 }