Changeset 50976 in vbox for trunk/src/VBox

Timestamp:

Apr 4, 2014 7:34:38 PM (11 years ago)

Author:

vboxsync

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

93145

Message:

RTSystemQueryOSInfo-win.cpp,init-win.cpp: Detect windows 8.1 correctly, it will try hide from us if we use GetVersionEx and the like. Fixed bug in service pack query where it would return ANSI strings instead of UTF-8 strings.

Location:

trunk/src/VBox/Runtime/r3/win

Files:

• RTSystemQueryOSInfo-win.cpp (modified) (1 diff)
• init-win.cpp (modified) (5 diffs)
• internal-r3-win.h (modified) (1 diff)

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

@@ -261 +261 @@
             {
                 /* just copy the entire string. */
-                memcpy(szTmp, g_WinOsInfoEx.szCSDVersion, sizeof(g_WinOsInfoEx.szCSDVersion));
-                szTmp[sizeof(g_WinOsInfoEx.szCSDVersion)] = '\0';
+                char *pszTmp = szTmp;
+                int rc = RTUtf16ToUtf8Ex(g_WinOsInfoEx.szCSDVersion, RT_ELEMENTS(g_WinOsInfoEx.szCSDVersion),
+                                         &pszTmp, sizeof(szTmp), NULL);
+                if (RT_SUCCESS(rc))
+                    RTStrStripR(szTmp);
+                else
+                    szTmp[0] = '\0';
                 AssertCompile(sizeof(szTmp) > sizeof(g_WinOsInfoEx.szCSDVersion));
             }

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

@@ -48 +48 @@
 *******************************************************************************/
 /** Windows DLL loader protection level. */
-DECLHIDDEN(RTR3WINLDRPROT)  g_enmWinLdrProt = RTR3WINLDRPROT_NONE;
+DECLHIDDEN(RTR3WINLDRPROT)      g_enmWinLdrProt = RTR3WINLDRPROT_NONE;
 /** Our simplified windows version.    */
-DECLHIDDEN(RTWINOSTYPE)     g_enmWinVer = kRTWinOSType_UNKNOWN;
+DECLHIDDEN(RTWINOSTYPE)         g_enmWinVer = kRTWinOSType_UNKNOWN;
 /** Extended windows version information. */
-DECLHIDDEN(OSVERSIONINFOEX) g_WinOsInfoEx;
+DECLHIDDEN(OSVERSIONINFOEXW)    g_WinOsInfoEx;
 /** The native kernel32.dll handle. */
-DECLHIDDEN(HMODULE)         g_hModKernel32 = NULL;
+DECLHIDDEN(HMODULE)             g_hModKernel32 = NULL;
 /** The native ntdll.dll handle. */
-DECLHIDDEN(HMODULE)         g_hModNtDll = NULL;
+DECLHIDDEN(HMODULE)             g_hModNtDll = NULL;
 
 
@@ -92 +92 @@
 </pre>
  */
-static RTWINOSTYPE rtR3InitWinSimplifiedVersion(OSVERSIONINFOEX const *pOSInfoEx)
+static RTWINOSTYPE rtR3InitWinSimplifiedVersion(OSVERSIONINFOEXW const *pOSInfoEx)
 {
     RTWINOSTYPE enmVer         = kRTWinOSType_UNKNOWN;
@@ -169 +169 @@
 
 
-DECLHIDDEN(int) rtR3InitNativeObtrusiveWorker(void)
+/**
+ * Initializes the global variables related to windows version.
+ */
+static void rtR3InitWindowsVersion(void)
+{
+    Assert(g_hModNtDll != NULL);
+
+    /*
+     * ASSUMES OSVERSIONINFOEX starts with the exact same layout as OSVERSIONINFO (safe).
+     */
+    AssertCompileMembersSameSizeAndOffset(OSVERSIONINFOEX, szCSDVersion, OSVERSIONINFO, szCSDVersion);
+    AssertCompileMemberOffset(OSVERSIONINFOEX, wServicePackMajor, sizeof(OSVERSIONINFO));
+
+    /*
+     * Use the NT version of GetVersionExW so we don't get fooled by
+     * compatability shims.
+     */
+    RT_ZERO(g_WinOsInfoEx);
+    g_WinOsInfoEx.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+
+    LONG (__stdcall *pfnRtlGetVersion)(OSVERSIONINFOEXW *);
+    *(FARPROC *)&pfnRtlGetVersion = GetProcAddress(g_hModNtDll, "RtlGetVersion");
+    LONG rcNt = -1;
+    if (pfnRtlGetVersion)
+        rcNt = pfnRtlGetVersion(&g_WinOsInfoEx);
+    if (rcNt != 0)
+    {
+        /*
+         * Couldn't find it or it failed, try the windows version of the API.
+         */
+        RT_ZERO(g_WinOsInfoEx);
+        g_WinOsInfoEx.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+        if (!GetVersionExW((POSVERSIONINFOW)&g_WinOsInfoEx))
+        {
+            /*
+             * If that didn't work either, just get the basic version bits.
+             */
+            RT_ZERO(g_WinOsInfoEx);
+            g_WinOsInfoEx.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+            if (GetVersionExA((POSVERSIONINFOA)&g_WinOsInfoEx))
+                Assert(g_WinOsInfoEx.dwPlatformId != VER_PLATFORM_WIN32_NT || g_WinOsInfoEx.dwMajorVersion < 5);
+            else
+            {
+                AssertBreakpoint();
+                RT_ZERO(g_WinOsInfoEx);
+            }
+        }
+    }
+
+    if (g_WinOsInfoEx.dwOSVersionInfoSize)
+        g_enmWinVer = rtR3InitWinSimplifiedVersion(&g_WinOsInfoEx);
+}
+
+
+static int rtR3InitNativeObtrusiveWorker(void)
 {
     /*
@@ -176 +230 @@
     UINT fOldErrMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
     SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX | fOldErrMode);
-
-    /*
-     * Query the Windows version.
-     * ASSUMES OSVERSIONINFOEX starts with the exact same layout as OSVERSIONINFO (safe).
-     */
-    AssertCompileMembersSameSizeAndOffset(OSVERSIONINFOEX, szCSDVersion, OSVERSIONINFO, szCSDVersion);
-    AssertCompileMemberOffset(OSVERSIONINFOEX, wServicePackMajor, sizeof(OSVERSIONINFO));
-    RT_ZERO(g_WinOsInfoEx);
-    g_WinOsInfoEx.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-    if (!GetVersionExA((POSVERSIONINFOA)&g_WinOsInfoEx))
-    {
-        /* Fallback, just get the basic info. */
-        RT_ZERO(g_WinOsInfoEx);
-        g_WinOsInfoEx.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-        if (GetVersionExA((POSVERSIONINFOA)&g_WinOsInfoEx))
-            Assert(g_WinOsInfoEx.dwPlatformId != VER_PLATFORM_WIN32_NT || g_WinOsInfoEx.dwMajorVersion < 5);
-        else
-        {
-            AssertBreakpoint();
-            RT_ZERO(g_WinOsInfoEx);
-        }
-    }
-    if (g_WinOsInfoEx.dwOSVersionInfoSize)
-        g_enmWinVer = rtR3InitWinSimplifiedVersion(&g_WinOsInfoEx);
 
     /*
@@ -252 +282 @@
         return VERR_INTERNAL_ERROR_2;
 
+    rtR3InitWindowsVersion();
+
     int rc = VINF_SUCCESS;
     if (!(fFlags & RTR3INIT_FLAGS_UNOBTRUSIVE))

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

@@ -60 +60 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-extern DECLHIDDEN(RTR3WINLDRPROT)  g_enmWinLdrProt;
-extern DECLHIDDEN(RTWINOSTYPE)     g_enmWinVer;
+extern DECLHIDDEN(RTR3WINLDRPROT)   g_enmWinLdrProt;
+extern DECLHIDDEN(RTWINOSTYPE)      g_enmWinVer;
 #ifdef _WINDEF_
-extern DECLHIDDEN(HMODULE)         g_hModKernel32;
-extern DECLHIDDEN(HMODULE)         g_hModNtDll;
-extern DECLHIDDEN(OSVERSIONINFOEX) g_WinOsInfoEx;
+extern DECLHIDDEN(HMODULE)          g_hModKernel32;
+extern DECLHIDDEN(HMODULE)          g_hModNtDll;
+extern DECLHIDDEN(OSVERSIONINFOEXW) g_WinOsInfoEx;
 #endif