Changeset 70346 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Dec 26, 2017 3:52:28 PM (7 years ago)

Author:

vboxsync

Message:

VBoxService: Needed to dynamically resolve two more APIs to make it work on NT 3.1.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxService-win.cpp (modified) (2 diffs)
• VBoxServiceInternal.h (modified) (1 diff)
• VBoxServiceTimeSync.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

@@ -189 +189 @@
 
 VBoxService_USES.win += vboximportchecker
-VBoxService_VBOX_IMPORT_CHECKER.win.x86 = nt4
+VBoxService_VBOX_IMPORT_CHECKER.win.x86 = nt31
 VBoxService_VBOX_IMPORT_CHECKER.win.amd64 = xp64
 

trunk/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp

@@ -78 +78 @@
 decltype(Module32First)                 *g_pfnModule32First;                    /**< W2K+, but Geoff says NT4. Hmm. */
 decltype(Module32Next)                  *g_pfnModule32Next;                     /**< W2K+, but Geoff says NT4. Hmm. */
+decltype(GetSystemTimeAdjustment)       *g_pfnGetSystemTimeAdjustment;          /**< NT 3.50+ */
+decltype(SetSystemTimeAdjustment)       *g_pfnSetSystemTimeAdjustment;          /**< NT 3.50+ */
 /** @} */
 
@@ -136 +138 @@
         RESOLVE_SYMBOL(Module32First);
         RESOLVE_SYMBOL(Module32Next);
+        RESOLVE_SYMBOL(GetSystemTimeAdjustment);
+        RESOLVE_SYMBOL(SetSystemTimeAdjustment);
         RTLdrClose(hLdrMod);
     }

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -209 +209 @@
 extern decltype(Module32Next)                  *g_pfnModule32Next;
 # endif
+extern decltype(GetSystemTimeAdjustment)       *g_pfnGetSystemTimeAdjustment;
+extern decltype(SetSystemTimeAdjustment)       *g_pfnSetSystemTimeAdjustment;
 # ifdef ___iprt_nt_nt_h___
 extern decltype(ZwQuerySystemInformation)      *g_pfnZwQuerySystemInformation;

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp

@@ -367 +367 @@
     }
 
-    if (GetSystemTimeAdjustment(&g_dwWinTimeAdjustment, &g_dwWinTimeIncrement, &g_bWinTimeAdjustmentDisabled))
-        vgsvcTimeSyncLog(0, "vgsvcTimeSyncInit: Initially %ld (100ns) units per %ld (100 ns) units interval, disabled=%d\n",
-                         g_dwWinTimeAdjustment, g_dwWinTimeIncrement, g_bWinTimeAdjustmentDisabled ? 1 : 0);
-    else
-    {
-        DWORD dwErr = GetLastError();
-        rc = RTErrConvertFromWin32(dwErr);
-        VGSvcError("vgsvcTimeSyncInit: Could not get time adjustment values! Last error: %ld!\n", dwErr);
+    if (g_pfnGetSystemTimeAdjustment)
+    {
+        if (g_pfnGetSystemTimeAdjustment(&g_dwWinTimeAdjustment, &g_dwWinTimeIncrement, &g_bWinTimeAdjustmentDisabled))
+            vgsvcTimeSyncLog(0, "vgsvcTimeSyncInit: Initially %ld (100ns) units per %ld (100 ns) units interval, disabled=%d\n",
+                             g_dwWinTimeAdjustment, g_dwWinTimeIncrement, g_bWinTimeAdjustmentDisabled ? 1 : 0);
+        else
+        {
+            DWORD dwErr = GetLastError();
+            rc = RTErrConvertFromWin32(dwErr);
+            VGSvcError("vgsvcTimeSyncInit: Could not get time adjustment values! Last error: %ld!\n", dwErr);
+        }
     }
 #endif /* RT_OS_WINDOWS */
@@ -400 +403 @@
         return false;
 
+    /* The API appeared in NT 3.50. */
+    if (   !g_pfnSetSystemTimeAdjustment
+        || !g_pfnGetSystemTimeAdjustment)
+        return false;
+
     DWORD dwWinTimeAdjustment, dwWinNewTimeAdjustment, dwWinTimeIncrement;
     BOOL  fWinTimeAdjustmentDisabled;
-    if (GetSystemTimeAdjustment(&dwWinTimeAdjustment, &dwWinTimeIncrement, &fWinTimeAdjustmentDisabled))
+    if (g_pfnGetSystemTimeAdjustment(&dwWinTimeAdjustment, &dwWinTimeIncrement, &fWinTimeAdjustmentDisabled))
     {
         DWORD dwDiffMax = g_dwWinTimeAdjustment * 0.50;
@@ -429 +437 @@
         vgsvcTimeSyncLog(3, "vgsvcTimeSyncAdjust: OrgTA=%ld, CurTA=%ld, NewTA=%ld, DiffNew=%ld, DiffMax=%ld\n",
                          g_dwWinTimeAdjustment, dwWinTimeAdjustment, dwWinNewTimeAdjustment, dwDiffNew, dwDiffMax);
-        if (SetSystemTimeAdjustment(dwWinNewTimeAdjustment, FALSE /* Periodic adjustments enabled. */))
+        if (g_pfnSetSystemTimeAdjustment(dwWinNewTimeAdjustment, FALSE /* Periodic adjustments enabled. */))
         {
             g_cTimeSyncErrors = 0;
@@ -475 +483 @@
     if (g_hTokenProcess == NULL) /* No process token (anymore)? */
         return;
-    if (SetSystemTimeAdjustment(0, TRUE /* Periodic adjustments disabled. */))
+    if (!g_pfnSetSystemTimeAdjustment)
+        return;
+    if (g_pfnSetSystemTimeAdjustment(0, TRUE /* Periodic adjustments disabled. */))
         vgsvcTimeSyncLog(5, "vgsvcTimeSyncCancelAdjust: Windows Time Adjustment is now disabled.\n");
     else if (g_cTimeSyncErrors++ < 10)