Changeset 78937 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

Timestamp:

Jun 3, 2019 1:52:06 PM (6 years ago)

Author:

vboxsync

Message:

VBoxTray: Use RTSystemGetNtVersion() rather than GetVersion or GetVersionEx for determining the actual windows version. Some cleanups.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp (modified) (8 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

@@ -142 +142 @@
 HWND                  g_hwndToolWindow;
 NOTIFYICONDATA        g_NotifyIconData;
-DWORD                 g_dwMajorVersion;
 
 uint32_t              g_fGuestDisplaysChanged = 0;
@@ -685 +684 @@
 static int vboxTraySetupSeamless(void)
 {
-    OSVERSIONINFO info;
-    g_dwMajorVersion = 5; /* Default to Windows XP. */
-    info.dwOSVersionInfoSize = sizeof(info);
-    if (GetVersionEx(&info))
-    {
-        Log(("Windows version %ld.%ld\n", info.dwMajorVersion, info.dwMinorVersion));
-        g_dwMajorVersion = info.dwMajorVersion;
-    }
-
     /* We need to setup a security descriptor to allow other processes modify access to the seamless notification event semaphore. */
     SECURITY_ATTRIBUTES     SecAttr;
@@ -713 +703 @@
     {
         /* For Vista and up we need to change the integrity of the security descriptor, too. */
-        if (g_dwMajorVersion >= 6)
+        uint64_t const uNtVersion = RTSystemGetNtVersion();
+        if (uNtVersion >= RTSYSTEM_MAKE_NT_VERSION(6, 0, 0))
         {
             BOOL (WINAPI * pfnConvertStringSecurityDescriptorToSecurityDescriptorA)(LPCSTR StringSecurityDescriptor, DWORD StringSDRevision, PSECURITY_DESCRIPTOR  *SecurityDescriptor, PULONG  SecurityDescriptorSize);
@@ -755 +746 @@
 
         if (   dwErr == ERROR_SUCCESS
-            && g_dwMajorVersion >= 5) /* Only for W2K and up ... */
+            && uNtVersion >= RTSYSTEM_MAKE_NT_VERSION(5, 0, 0)) /* Only for W2K and up ... */
         {
             g_hSeamlessWtNotifyEvent = CreateEvent(&SecAttr, FALSE, FALSE, VBOXHOOK_GLOBAL_WT_EVENT_NAME);
@@ -837 +828 @@
         else
         {
+            uint64_t const uNtVersion = RTSystemGetNtVersion();
             rc = vboxTrayCreateTrayIcon();
             if (   RT_SUCCESS(rc)
-                && g_dwMajorVersion >= 5) /* Only for W2K and up ... */
+                && uNtVersion >= RTSYSTEM_MAKE_NT_VERSION(5, 0, 0)) /* Only for W2K and up ... */
             {
                 /* We're ready to create the tooltip balloon.
@@ -998 +990 @@
         if (RT_SUCCESS(rc))
         {
+            /* Log the major windows NT version: */
+            uint64_t const uNtVersion = RTSystemGetNtVersion();
+            LogRel(("Windows version %u.%u build %u (uNtVersion=%#RX64)\n", RTSYSTEM_NT_VERSION_GET_MAJOR(uNtVersion),
+                    RTSYSTEM_NT_VERSION_GET_MINOR(uNtVersion), RTSYSTEM_NT_VERSION_GET_BUILD(uNtVersion), uNtVersion ));
+
             /* Save instance handle. */
             g_hInstance = hInstance;
@@ -1465 +1462 @@
 static int vboxDtInit()
 {
-    int rc = VINF_SUCCESS;
-    OSVERSIONINFO info;
-    g_dwMajorVersion = 5; /* Default to Windows XP. */
-    info.dwOSVersionInfoSize = sizeof(info);
-    if (GetVersionEx(&info))
-    {
-        LogRel(("Windows version %ld.%ld\n", info.dwMajorVersion, info.dwMinorVersion));
-        g_dwMajorVersion = info.dwMajorVersion;
-    }
-
     RT_ZERO(gVBoxDt);
 
+    int rc;
     gVBoxDt.hNotifyEvent = CreateEvent(NULL, FALSE, FALSE, VBOXHOOK_GLOBAL_DT_EVENT_NAME);
     if (gVBoxDt.hNotifyEvent != NULL)
@@ -1523 +1511 @@
                     BOOL fRc = FALSE;
                     /* For Vista and up we need to change the integrity of the security descriptor, too. */
-                    if (g_dwMajorVersion >= 6)
+                    uint64_t const uNtVersion = RTSystemGetNtVersion();
+                    if (uNtVersion >= RTSYSTEM_MAKE_NT_VERSION(6, 0, 0))
                     {
                         HMODULE hModHook = (HMODULE)RTLdrGetNativeHandle(gVBoxDt.hLdrModHook);