Changeset 70171 in vbox for trunk/src/VBox

Timestamp:

Dec 15, 2017 10:08:07 PM (7 years ago)

Author:

vboxsync

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

119736

Message:

VBoxService: Working on removing TARGET_NT4 here too...

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService-win.cpp (modified) (15 diffs)
• VBoxService.cpp (modified) (1 diff)
• VBoxServiceInternal.h (modified) (1 diff)
• VBoxServicePageSharing.cpp (modified) (18 diffs)
• VBoxServiceStats.cpp (modified) (2 diffs)

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

@@ -20 +20 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#undef _WIN32_WINNT           /// REMOVE WHEN VBoxServiceNT IS GONE
+#define _WIN32_WINNT 0x0501   /// REMOVE WHEN VBoxServiceNT IS GONE
 #include <iprt/assert.h>
 #include <iprt/err.h>
+#include <iprt/ldr.h>
 #include <iprt/system.h> /* For querying OS version. */
 #include <VBox/VBoxGuestLib.h>
-#include "VBoxServiceInternal.h"
-
-#include <iprt/win/windows.h>
+
+#include <iprt/nt/nt-and-windows.h>
 #include <process.h>
 #include <aclapi.h>
+#include <tlhelp32.h>
+
+#include "VBoxServiceInternal.h"
 
 
@@ -51 +56 @@
 };
 
+/** @name APIs from ADVAPI32.DLL.
+ * @{ */
+decltype(RegisterServiceCtrlHandlerExA) *g_pfnRegisterServiceCtrlHandlerExA;    /**< W2K+ */
+decltype(ChangeServiceConfig2A)         *g_pfnChangeServiceConfig2A;            /**< W2K+ */
+/** @} */
+
+/** @name API from KERNEL32.DLL
+ * @{ */
+decltype(CreateToolhelp32Snapshot)      *g_pfnCreateToolhelp32Snapshot;         /**< W2K+, but Geoff says NT4. Hmm. */
+decltype(Process32First)                *g_pfnProcess32First;                   /**< W2K+, but Geoff says NT4. Hmm. */
+decltype(Process32Next)                 *g_pfnProcess32Next;                    /**< W2K+, but Geoff says NT4. Hmm. */
+decltype(Module32First)                 *g_pfnModule32First;                    /**< W2K+, but Geoff says NT4. Hmm. */
+decltype(Module32Next)                  *g_pfnModule32Next;                     /**< W2K+, but Geoff says NT4. Hmm. */
+/** @} */
+
+/** @name API from NTDLL.DLL
+ * @{ */
+decltype(ZwQuerySystemInformation)      *g_pfnZwQuerySystemInformation;         /**< NT4 (where as NtQuerySystemInformation is W2K). */
+/** @} */
+
+
+/**
+ * Resolve APIs not present on older windows versions.
+ */
+void VGSvcWinResolveApis(void)
+{
+    RTLDRMOD hLdrMod;
+#define RESOLVE_SYMBOL(a_fn) do { RT_CONCAT(g_pfn, a_fn) = (decltype(a_fn) *)RTLdrGetFunction(hLdrMod, #a_fn); } while (0)
+
+    /* From ADVAPI32.DLL: */
+    int rc = RTLdrLoadSystem("advapi32.dll", false /*fNoUnload*/, &hLdrMod);
+    AssertRC(rc);
+    if (RT_SUCCESS(rc))
+    {
+        RESOLVE_SYMBOL(RegisterServiceCtrlHandlerExA);
+        RESOLVE_SYMBOL(ChangeServiceConfig2A);
+        RTLdrClose(hLdrMod);
+    }
+
+    /* From KERNEL32.DLL: */
+    rc = RTLdrLoadSystem("kernel32.dll", false /*fNoUnload*/, &hLdrMod);
+    AssertRC(rc);
+    if (RT_SUCCESS(rc))
+    {
+        RESOLVE_SYMBOL(CreateToolhelp32Snapshot);
+        RESOLVE_SYMBOL(Process32First);
+        RESOLVE_SYMBOL(Process32Next);
+        RESOLVE_SYMBOL(Module32First);
+        RESOLVE_SYMBOL(Module32Next);
+        RTLdrClose(hLdrMod);
+    }
+
+    /* From NTDLL.DLL: */
+    rc = RTLdrLoadSystem("ntdll.dll", false /*fNoUnload*/, &hLdrMod);
+    AssertRC(rc);
+    if (RT_SUCCESS(rc))
+    {
+        RESOLVE_SYMBOL(ZwQuerySystemInformation);
+        RTLdrClose(hLdrMod);
+    }
+}
+
 
 /**
@@ -58 +125 @@
  */
 static DWORD vgsvcWinAddAceToObjectsSecurityDescriptor(LPTSTR pszObjName,
-                                                             SE_OBJECT_TYPE ObjectType,
-                                                             LPTSTR pszTrustee,
-                                                             TRUSTEE_FORM TrusteeForm,
-                                                             DWORD dwAccessRights,
-                                                             ACCESS_MODE AccessMode,
-                                                             DWORD dwInheritance)
-{
-    DWORD dwRes = 0;
+                                                       SE_OBJECT_TYPE ObjectType,
+                                                       LPTSTR pszTrustee,
+                                                       TRUSTEE_FORM TrusteeForm,
+                                                       DWORD dwAccessRights,
+                                                       ACCESS_MODE AccessMode,
+                                                       DWORD dwInheritance)
+{
     PACL pOldDACL = NULL, pNewDACL = NULL;
     PSECURITY_DESCRIPTOR pSD = NULL;
@@ -74 +140 @@
 
     /* Get a pointer to the existing DACL. */
-    dwRes = GetNamedSecurityInfo(pszObjName, ObjectType,
-                                 DACL_SECURITY_INFORMATION,
-                                 NULL, NULL, &pOldDACL, NULL, &pSD);
+    DWORD dwRes = GetNamedSecurityInfo(pszObjName, ObjectType, DACL_SECURITY_INFORMATION, NULL, NULL, &pOldDACL, NULL, &pSD);
     if (ERROR_SUCCESS != dwRes)
     {
@@ -103 +167 @@
 
     /* Attach the new ACL as the object's DACL. */
-    dwRes = SetNamedSecurityInfo(pszObjName, ObjectType,
-                                 DACL_SECURITY_INFORMATION,
-                                 NULL, NULL, pNewDACL, NULL);
+    dwRes = SetNamedSecurityInfo(pszObjName, ObjectType, DACL_SECURITY_INFORMATION, NULL, NULL, pNewDACL, NULL);
     if (ERROR_SUCCESS != dwRes)
     {
@@ -142 +204 @@
     {
         ss.dwControlsAccepted     = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
-#ifndef TARGET_NT4
-        /* Don't use SERVICE_ACCEPT_SESSIONCHANGE on Windows 2000.
-         * This makes SCM angry. */
+
+        /* Don't use SERVICE_ACCEPT_SESSIONCHANGE on Windows 2000 or earlier.  This makes SCM angry. */
         char szOSVersion[32];
-        int rc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE,
-                                     szOSVersion, sizeof(szOSVersion));
+        int rc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, szOSVersion, sizeof(szOSVersion));
         if (RT_SUCCESS(rc))
         {
@@ -155 +215 @@
         else
             VGSvcError("Error determining OS version, rc=%Rrc\n", rc);
-#endif
     }
 
@@ -166 +225 @@
     if (!fStatusSet)
         VGSvcError("Error reporting service status=%ld (controls=%x, checkpoint=%ld) to SCM: %ld\n",
-                         dwStatus, ss.dwControlsAccepted, dwCheckPoint, GetLastError());
+                   dwStatus, ss.dwControlsAccepted, dwCheckPoint, GetLastError());
     return fStatusSet;
 }
@@ -184 +243 @@
 static RTEXITCODE vgsvcWinSetDesc(SC_HANDLE hService)
 {
-#ifndef TARGET_NT4
     /* On W2K+ there's ChangeServiceConfig2() which lets us set some fields
        like a longer service description. */
-    /** @todo On Vista+ SERVICE_DESCRIPTION also supports localized strings! */
-    SERVICE_DESCRIPTION desc;
-    desc.lpDescription = VBOXSERVICE_DESCRIPTION;
-    if (!ChangeServiceConfig2(hService,
-                              SERVICE_CONFIG_DESCRIPTION, /* Service info level */
-                              &desc))
-    {
-        VGSvcError("Cannot set the service description! Error: %ld\n", GetLastError());
-        return RTEXITCODE_FAILURE;
-    }
-#else
-    RT_NOREF(hService);
-#endif
+    if (g_pfnChangeServiceConfig2A)
+    {
+        /** @todo On Vista+ SERVICE_DESCRIPTION also supports localized strings! */
+        SERVICE_DESCRIPTION desc;
+        desc.lpDescription = VBOXSERVICE_DESCRIPTION;
+        if (!g_pfnChangeServiceConfig2A(hService, SERVICE_CONFIG_DESCRIPTION, &desc))
+        {
+            VGSvcError("Cannot set the service description! Error: %ld\n", GetLastError());
+            return RTEXITCODE_FAILURE;
+        }
+    }
     return RTEXITCODE_SUCCESS;
 }
@@ -327 +383 @@
     int rc = VINF_SUCCESS;
 
-#ifndef TARGET_NT4
     /* Create a well-known SID for the "Builtin Users" group. */
-    PSID pBuiltinUsersSID = NULL;
-    SID_IDENTIFIER_AUTHORITY SIDAuthWorld = SECURITY_LOCAL_SID_AUTHORITY;
-
-    if (!AllocateAndInitializeSid(&SIDAuthWorld, 1,
-                                  SECURITY_LOCAL_RID,
-                                  0, 0, 0, 0, 0, 0, 0,
-                                  &pBuiltinUsersSID))
-    {
-        rc = RTErrConvertFromWin32(GetLastError());
-    }
-    else
+    PSID                     pBuiltinUsersSID = NULL;
+    SID_IDENTIFIER_AUTHORITY SIDAuthWorld     = SECURITY_LOCAL_SID_AUTHORITY;
+    if (AllocateAndInitializeSid(&SIDAuthWorld, 1, SECURITY_LOCAL_RID, 0, 0, 0, 0, 0, 0, 0, &pBuiltinUsersSID))
     {
         DWORD dwRes = vgsvcWinAddAceToObjectsSecurityDescriptor(TEXT("\\\\.\\VBoxMiniRdrDN"),
-                                                                      SE_FILE_OBJECT,
-                                                                      (LPTSTR)pBuiltinUsersSID,
-                                                                      TRUSTEE_IS_SID,
-                                                                      FILE_GENERIC_READ | FILE_GENERIC_WRITE,
-                                                                      SET_ACCESS,
-                                                                      NO_INHERITANCE);
+                                                                SE_FILE_OBJECT,
+                                                                (LPTSTR)pBuiltinUsersSID,
+                                                                TRUSTEE_IS_SID,
+                                                                FILE_GENERIC_READ | FILE_GENERIC_WRITE,
+                                                                SET_ACCESS,
+                                                                NO_INHERITANCE);
         if (dwRes != ERROR_SUCCESS)
         {
@@ -361 +408 @@
         }
     }
-#endif
+    else
+        rc = RTErrConvertFromWin32(GetLastError());
 
     if (RT_SUCCESS(rc))
@@ -404 +452 @@
     if (!StartServiceCtrlDispatcher(&g_aServiceTable[0]))
         return VGSvcError("StartServiceCtrlDispatcher: %u. Please start %s with option -f (foreground)!\n",
-                                GetLastError(), g_pszProgName);
+                          GetLastError(), g_pszProgName);
     return RTEXITCODE_SUCCESS;
 }
 
 
-#ifndef TARGET_NT4
-static const char* vgsvcWTSStateToString(DWORD dwEvent)
+/**
+ * Event code to description.
+ *
+ * @returns String.
+ * @param   dwEvent             The event code.
+ */
+static const char *vgsvcWTSStateToString(DWORD dwEvent)
 {
     switch (dwEvent)
     {
-        case WTS_CONSOLE_CONNECT:
-            return "A session was connected to the console terminal";
-
-        case WTS_CONSOLE_DISCONNECT:
-            return "A session was disconnected from the console terminal";
-
-        case WTS_REMOTE_CONNECT:
-            return "A session connected to the remote terminal";
-
-        case WTS_REMOTE_DISCONNECT:
-            return "A session was disconnected from the remote terminal";
-
-        case WTS_SESSION_LOGON:
-            return "A user has logged on to a session";
-
-        case WTS_SESSION_LOGOFF:
-            return "A user has logged off the session";
-
-        case WTS_SESSION_LOCK:
-            return "A session has been locked";
-
-        case WTS_SESSION_UNLOCK:
-            return "A session has been unlocked";
-
-        case WTS_SESSION_REMOTE_CONTROL:
-            return "A session has changed its remote controlled status";
-#if 0
-        case WTS_SESSION_CREATE:
-            return "A session has been created";
-
-        case WTS_SESSION_TERMINATE:
-            return "The session has been terminated";
+        case WTS_CONSOLE_CONNECT:           return "A session was connected to the console terminal";
+        case WTS_CONSOLE_DISCONNECT:        return "A session was disconnected from the console terminal";
+        case WTS_REMOTE_CONNECT:            return "A session connected to the remote terminal";
+        case WTS_REMOTE_DISCONNECT:         return "A session was disconnected from the remote terminal";
+        case WTS_SESSION_LOGON:             return "A user has logged on to a session";
+        case WTS_SESSION_LOGOFF:            return "A user has logged off the session";
+        case WTS_SESSION_LOCK:              return "A session has been locked";
+        case WTS_SESSION_UNLOCK:            return "A session has been unlocked";
+        case WTS_SESSION_REMOTE_CONTROL:    return "A session has changed its remote controlled status";
+#ifdef WTS_SESSION_CREATE
+        case WTS_SESSION_CREATE:            return "A session has been created";
 #endif
-        default:
-            break;
-    }
-
-    return "Uknonwn state";
-}
-#endif /* !TARGET_NT4 */
-
-
-#ifdef TARGET_NT4
-static VOID WINAPI vgsvcWinCtrlHandler(DWORD dwControl)
-#else
-static DWORD WINAPI vgsvcWinCtrlHandler(DWORD dwControl, DWORD dwEventType, LPVOID lpEventData, LPVOID lpContext)
+#ifdef WTS_SESSION_TERMINATE
+        case WTS_SESSION_TERMINATE:         return "The session has been terminated";
 #endif
-{
-#ifdef TARGET_NT4
-    VGSvcVerbose(2, "Control handler: Control=%#x\n", dwControl);
-#else
-    RT_NOREF1(lpContext);
-    VGSvcVerbose(2, "Control handler: Control=%#x, EventType=%#x\n", dwControl, dwEventType);
-#endif
-
+        default:                            return "Uknonwn state";
+    }
+}
+
+
+/**
+ * Common control handler.
+ *
+ * @returns Return code for NT5+.
+ * @param   dwControl           The control code.
+ */
+static DWORD vgsvcWinCtrlHandlerCommon(DWORD dwControl)
+{
     DWORD rcRet = NO_ERROR;
     switch (dwControl)
@@ -494 +520 @@
         }
 
-# ifndef TARGET_NT4
-        case SERVICE_CONTROL_SESSIONCHANGE: /* Only Windows 2000 and up. */
-        {
-            AssertPtr(lpEventData);
-            PWTSSESSION_NOTIFICATION pNotify = (PWTSSESSION_NOTIFICATION)lpEventData;
-            Assert(pNotify->cbSize == sizeof(WTSSESSION_NOTIFICATION));
-
-            VGSvcVerbose(1, "Control handler: %s (Session=%ld, Event=%#x)\n",
-                               vgsvcWTSStateToString(dwEventType),
-                               pNotify->dwSessionId, dwEventType);
-
-            /* Handle all events, regardless of dwEventType. */
-            int rc2 = VGSvcVMInfoSignal();
-            AssertRC(rc2);
-            break;
-        }
-# endif /* !TARGET_NT4 */
-
         default:
             VGSvcVerbose(1, "Control handler: Function not implemented: %#x\n", dwControl);
@@ -518 +526 @@
     }
 
-#ifndef TARGET_NT4
     return rcRet;
-#endif
+}
+
+
+/**
+ * Callback registered by RegisterServiceCtrlHandler on NT4 and earlier.
+ */
+static VOID WINAPI vgsvcWinCtrlHandlerNt4(DWORD dwControl)
+{
+    VGSvcVerbose(2, "Control handler (NT4): dwControl=%#x\n", dwControl);
+    vgsvcWinCtrlHandlerCommon(dwControl);
+}
+
+
+/**
+ * Callback registered by RegisterServiceCtrlHandler on NT5 and later.
+ */
+static DWORD WINAPI vgsvcWinCtrlHandlerNt5Plus(DWORD dwControl, DWORD dwEventType, LPVOID lpEventData, LPVOID lpContext)
+{
+    VGSvcVerbose(2, "Control handler: dwControl=%#x, dwEventType=%#x\n", dwControl, dwEventType);
+    RT_NOREF1(lpContext);
+
+    switch (dwControl)
+    {
+        default:
+            return vgsvcWinCtrlHandlerCommon(dwControl);
+
+        case SERVICE_CONTROL_SESSIONCHANGE:  /* Only Windows 2000 and up. */
+        {
+            AssertPtr(lpEventData);
+            PWTSSESSION_NOTIFICATION pNotify = (PWTSSESSION_NOTIFICATION)lpEventData;
+            Assert(pNotify->cbSize == sizeof(WTSSESSION_NOTIFICATION));
+
+            VGSvcVerbose(1, "Control handler: %s (Session=%ld, Event=%#x)\n",
+                         vgsvcWTSStateToString(dwEventType), pNotify->dwSessionId, dwEventType);
+
+            /* Handle all events, regardless of dwEventType. */
+            int rc2 = VGSvcVMInfoSignal();
+            AssertRC(rc2);
+
+            return NO_ERROR;
+        }
+    }
 }
 
@@ -528 +576 @@
     RT_NOREF2(argc, argv);
     VGSvcVerbose(2, "Registering service control handler ...\n");
-#ifdef TARGET_NT4
-    g_hWinServiceStatus = RegisterServiceCtrlHandler(VBOXSERVICE_NAME, vgsvcWinCtrlHandler);
-#else
-    g_hWinServiceStatus = RegisterServiceCtrlHandlerEx(VBOXSERVICE_NAME, vgsvcWinCtrlHandler, NULL);
-#endif
+    if (g_pfnRegisterServiceCtrlHandlerExA)
+        g_hWinServiceStatus = g_pfnRegisterServiceCtrlHandlerExA(VBOXSERVICE_NAME, vgsvcWinCtrlHandlerNt5Plus, NULL);
+    else
+        g_hWinServiceStatus = RegisterServiceCtrlHandlerA(VBOXSERVICE_NAME, vgsvcWinCtrlHandlerNt4);
     if (g_hWinServiceStatus != NULL)
     {

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

@@ -882 +882 @@
         return RTMsgInitFailure(rc);
     g_pszProgName = RTPathFilename(argv[0]);
+#ifdef RT_OS_WINDOWS
+    VGSvcWinResolveApis();
+#endif
 #ifdef DEBUG
     rc = RTCritSectInit(&g_csLog);

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

@@ -197 +197 @@
 extern int                      VGSvcReportStatus(VBoxGuestFacilityStatus enmStatus);
 #ifdef RT_OS_WINDOWS
+extern void                     VGSvcWinResolveApis(void);
 extern RTEXITCODE               VGSvcWinInstall(void);
 extern RTEXITCODE               VGSvcWinUninstall(void);
 extern RTEXITCODE               VGSvcWinEnterCtrlDispatcher(void);
 extern void                     VGSvcWinSetStopPendingStatus(uint32_t uCheckPoint);
+# ifdef TH32CS_SNAPHEAPLIST
+extern decltype(CreateToolhelp32Snapshot)      *g_pfnCreateToolhelp32Snapshot;
+extern decltype(Process32First)                *g_pfnProcess32First;
+extern decltype(Process32Next)                 *g_pfnProcess32Next;
+extern decltype(Module32First)                 *g_pfnModule32First;
+extern decltype(Module32Next)                  *g_pfnModule32Next;
+# endif
+# ifdef ___iprt_nt_nt_h___
+extern decltype(ZwQuerySystemInformation)      *g_pfnZwQuerySystemInformation;
+# endif
 #endif
 

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

@@ -45 +45 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#undef _WIN32_WINNT           /// REMOVE WHEN VBoxServiceNT IS GONE
+#define _WIN32_WINNT 0x0501   /// REMOVE WHEN VBoxServiceNT IS GONE
 #include <iprt/assert.h>
 #include <iprt/avl.h>
@@ -62 +64 @@
 #include <VBox/VMMDev.h>
 #include <VBox/VBoxGuestLib.h>
-#include "VBoxServiceInternal.h"
-#include "VBoxServiceUtils.h"
-
-#if defined(RT_OS_WINDOWS) && !defined(TARGET_NT4)
+
+#ifdef RT_OS_WINDOWS
+#include <iprt/nt/nt-and-windows.h>
 # include <tlhelp32.h>
 # include <psapi.h>
@@ -71 +72 @@
 #endif
 
+#include "VBoxServiceInternal.h"
+#include "VBoxServiceUtils.h"
+
 
 /*********************************************************************************************************************************
@@ -81 +85 @@
     HMODULE         hModule;
     char            szFileVersion[16];
-# ifndef TARGET_NT4
     MODULEENTRY32   Info;
-# endif
-#endif /* RT_OS_WINDOWS */
+#endif
 } VGSVCPGSHKNOWNMOD, *PVGSVCPGSHKNOWNMOD;
-
-
-#ifdef RT_OS_WINDOWS
-/* NTDLL API we want to use: */
-# define SystemModuleInformation 11
-
-typedef struct _RTL_PROCESS_MODULE_INFORMATION
-{
-    ULONG Section;
-    PVOID MappedBase;
-    PVOID ImageBase;
-    ULONG ImageSize;
-    ULONG Flags;
-    USHORT LoadOrderIndex;
-    USHORT InitOrderIndex;
-    USHORT LoadCount;
-    USHORT OffsetToFileName;
-    CHAR FullPathName[256];
-} RTL_PROCESS_MODULE_INFORMATION, *PRTL_PROCESS_MODULE_INFORMATION;
-
-typedef struct _RTL_PROCESS_MODULES
-{
-    ULONG NumberOfModules;
-    RTL_PROCESS_MODULE_INFORMATION Modules[1];
-} RTL_PROCESS_MODULES, *PRTL_PROCESS_MODULES;
-
-typedef NTSTATUS (WINAPI *PFNZWQUERYSYSTEMINFORMATION)(ULONG, PVOID, ULONG, PULONG);
-
-#endif /* RT_OS_WINDOWS */
 
 
@@ -120 +93 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-#ifdef RT_OS_WINDOWS
-static PFNZWQUERYSYSTEMINFORMATION g_pfnZwQuerySystemInformation = NULL;
-#endif
-
 /** The semaphore we're blocking on. */
 static RTSEMEVENTMULTI  g_PageSharingEvent = NIL_RTSEMEVENTMULTI;
 
 static PAVLPVNODECORE   g_pKnownModuleTree = NULL;
-static uint64_t         g_idSession = 0;
+static uint64_t         g_idSession        = 0;
 
 
@@ -137 +106 @@
 
 
-#if defined(RT_OS_WINDOWS) && !defined(TARGET_NT4)
+#ifdef RT_OS_WINDOWS
 
 /**
@@ -149 +118 @@
     DWORD                    dwModuleSize = pModule->Info.modBaseSize;
     BYTE                    *pBaseAddress = pModule->Info.modBaseAddr;
-    DWORD                    cbVersionSize, dummy;
-    BYTE                    *pVersionInfo;
 
     VGSvcVerbose(3, "vgsvcPageSharingRegisterModule\n");
 
-    cbVersionSize = GetFileVersionInfoSize(pModule->Info.szExePath, &dummy);
-    if (!cbVersionSize)
+    DWORD dwDummy;
+    DWORD cbVersion = GetFileVersionInfoSize(pModule->Info.szExePath, &dwDummy);
+    if (!cbVersion)
     {
         VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: GetFileVersionInfoSize failed with %d\n", GetLastError());
         return;
     }
-    pVersionInfo = (BYTE *)RTMemAlloc(cbVersionSize);
+    BYTE *pVersionInfo = (BYTE *)RTMemAllocZ(cbVersion);
     if (!pVersionInfo)
         return;
 
-    if (!GetFileVersionInfo(pModule->Info.szExePath, 0, cbVersionSize, pVersionInfo))
+    if (!GetFileVersionInfo(pModule->Info.szExePath, 0, cbVersion, pVersionInfo))
     {
         VGSvcVerbose(3, "vgsvcPageSharingRegisterModule: GetFileVersionInfo failed with %d\n", GetLastError());
@@ -177 +145 @@
     } *lpTranslate;
 
-    UINT   cbTranslate;
+    UINT cbTranslate;
     BOOL fRet = VerQueryValue(pVersionInfo, TEXT("\\VarFileInfo\\Translation"), (LPVOID *)&lpTranslate, &cbTranslate);
     if (   !fRet
@@ -322 +290 @@
     }
 
-    HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, dwProcessId);
+    HANDLE hSnapshot = g_pfnCreateToolhelp32Snapshot(TH32CS_SNAPMODULE, dwProcessId);
     if (hSnapshot == INVALID_HANDLE_VALUE)
     {
@@ -336 +304 @@
 
     ModuleInfo.dwSize = sizeof(ModuleInfo);
-    bRet = Module32First(hSnapshot, &ModuleInfo);
+    bRet = g_pfnModule32First(hSnapshot, &ModuleInfo);
     do
     {
@@ -375 +343 @@
             Assert(ret); NOREF(ret);
         }
-    } while (Module32Next(hSnapshot, &ModuleInfo));
+    } while (g_pfnModule32Next(hSnapshot, &ModuleInfo));
 
     CloseHandle(hSnapshot);
@@ -389 +357 @@
 static void vgsvcPageSharingInspectGuest(void)
 {
-    HANDLE hSnapshot;
+    VGSvcVerbose(3, "vgsvcPageSharingInspectGuest\n");
     PAVLPVNODECORE pNewTree = NULL;
-    DWORD dwProcessId = GetCurrentProcessId();
-
-    VGSvcVerbose(3, "vgsvcPageSharingInspectGuest\n");
-
-    hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-    if (hSnapshot == INVALID_HANDLE_VALUE)
-    {
-        VGSvcVerbose(3, "vgsvcPageSharingInspectGuest: CreateToolhelp32Snapshot failed with %d\n", GetLastError());
-        return;
-    }
-
-    /* Check loaded modules for all running processes. */
-    PROCESSENTRY32 ProcessInfo;
-
-    ProcessInfo.dwSize = sizeof(ProcessInfo);
-    Process32First(hSnapshot, &ProcessInfo);
-
-    do
-    {
-        /* Skip our own process. */
-        if (ProcessInfo.th32ProcessID != dwProcessId)
-            vgsvcPageSharingInspectModules(ProcessInfo.th32ProcessID, &pNewTree);
-    }
-    while (Process32Next(hSnapshot, &ProcessInfo));
-
-    CloseHandle(hSnapshot);
-
-    /* Check all loaded kernel modules. */
+
+    /*
+     * Check loaded modules for all running processes.
+     */
+    if (   g_pfnProcess32First
+        && g_pfnProcess32Next
+        && g_pfnModule32First
+        && g_pfnModule32Next
+        && g_pfnCreateToolhelp32Snapshot)
+    {
+        HANDLE hSnapshot = g_pfnCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+        if (hSnapshot == INVALID_HANDLE_VALUE)
+        {
+            VGSvcVerbose(3, "vgsvcPageSharingInspectGuest: CreateToolhelp32Snapshot failed with %d\n", GetLastError());
+            return;
+        }
+
+        DWORD const dwProcessId = GetCurrentProcessId();
+
+        PROCESSENTRY32 ProcessInfo;
+        ProcessInfo.dwSize = sizeof(ProcessInfo);
+        g_pfnProcess32First(hSnapshot, &ProcessInfo);
+
+        do
+        {
+            /* Skip our own process. */
+            if (ProcessInfo.th32ProcessID != dwProcessId)
+                vgsvcPageSharingInspectModules(ProcessInfo.th32ProcessID, &pNewTree);
+        }
+        while (g_pfnProcess32Next(hSnapshot, &ProcessInfo));
+
+        CloseHandle(hSnapshot);
+    }
+
+    /*
+     * Check all loaded kernel modules.
+     */
     if (g_pfnZwQuerySystemInformation)
     {
@@ -468 +445 @@
                         break;
 
-/** @todo Use unicode APIs! */
-                    strcpy(pModule->Info.szModule, &pSystemModules->Modules[i].FullPathName[pSystemModules->Modules[i].OffsetToFileName]);
+/** @todo FullPathName not an UTF-8 string is! An ANSI string it is. */
+                    strcpy(pModule->Info.szModule,
+                           (const char *)&pSystemModules->Modules[i].FullPathName[pSystemModules->Modules[i].OffsetToFileName]);
                     GetSystemDirectoryA(szFullFilePath, sizeof(szFullFilePath));
 
                     /* skip \Systemroot\system32 */
-                    char *lpPath = strchr(&pSystemModules->Modules[i].FullPathName[1], '\\');
+                    char *lpPath = strchr((char *)&pSystemModules->Modules[i].FullPathName[1], '\\');
                     if (!lpPath)
                     {
                         /* Seen just file names in XP; try to locate the file in the system32 and system32\drivers directories. */
                         strcat(szFullFilePath, "\\");
-                        strcat(szFullFilePath, pSystemModules->Modules[i].FullPathName);
+                        strcat(szFullFilePath, (const char *)pSystemModules->Modules[i].FullPathName);
                         VGSvcVerbose(3, "Unexpected kernel module name try %s\n", szFullFilePath);
                         if (RTFileExists(szFullFilePath) == false)
@@ -484 +462 @@
                             GetSystemDirectoryA(szFullFilePath, sizeof(szFullFilePath));
                             strcat(szFullFilePath, "\\drivers\\");
-                            strcat(szFullFilePath, pSystemModules->Modules[i].FullPathName);
+                            strcat(szFullFilePath, (const char *)pSystemModules->Modules[i].FullPathName);
                             VGSvcVerbose(3, "Unexpected kernel module name try %s\n", szFullFilePath);
                             if (RTFileExists(szFullFilePath) == false)
@@ -496 +474 @@
                     else
                     {
-                        lpPath = strchr(lpPath+1, '\\');
+                        lpPath = strchr(lpPath + 1, '\\');
                         if (!lpPath)
                         {
@@ -568 +546 @@
 
 
-#elif TARGET_NT4
+#else  /* !RT_OS_WINDOWS */
 
 static void vgsvcPageSharingInspectGuest(void)
 {
-    /* not implemented */
-}
-
-#else
-
-static void vgsvcPageSharingInspectGuest(void)
-{
     /** @todo other platforms */
 }
 
-#endif
+#endif /* !RT_OS_WINDOWS */
 
 /** @interface_method_impl{VBOXSERVICE,pfnInit} */
@@ -592 +563 @@
     AssertRCReturn(rc, rc);
 
-#if defined(RT_OS_WINDOWS) && !defined(TARGET_NT4)
-    g_pfnZwQuerySystemInformation = (PFNZWQUERYSYSTEMINFORMATION)RTLdrGetSystemSymbol("ntdll.dll", "ZwQuerySystemInformation");
-
+#ifdef RT_OS_WINDOWS
     rc = VbglR3GetSessionId(&g_idSession);
     if (RT_FAILURE(rc))
@@ -653 +622 @@
             break;
         }
-#if defined(RT_OS_WINDOWS) && !defined(TARGET_NT4)
+#ifdef RT_OS_WINDOWS
         uint64_t idNewSession = g_idSession;
         rc =  VbglR3GetSessionId(&idNewSession);

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

@@ -31 +31 @@
 #if defined(RT_OS_WINDOWS)
 # ifdef TARGET_NT4
-#  undef _WIN32_WINNT
-#  define _WIN32_WINNT 0x501
+#  undef _WIN32_WINNT           /// REMOVE WHEN VBoxServiceNT IS GONE
+#  define _WIN32_WINNT 0x0501   /// REMOVE WHEN VBoxServiceNT IS GONE
 # endif
 # include <iprt/win/windows.h>
@@ -63 +63 @@
 #include <VBox/VMMDev.h> /* For VMMDevReportGuestStats and indirectly VbglR3StatReport. */
 #include <VBox/VBoxGuestLib.h>
+
 #include "VBoxServiceInternal.h"
 #include "VBoxServiceUtils.h"