Changeset 47011 in vbox for trunk/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp

Timestamp:

Jul 5, 2013 3:34:09 PM (11 years ago)

Author:

vboxsync

Message:

IPRT/RTSystemQueryOSInfo-win.cpp: Must be sizeof(OSVERSIONINFOEX).

File:

• trunk/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp (modified) (2 diffs)

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

@@ -309 +309 @@
      */
     OSVERSIONINFOEX OSInfoEx;
-    memset(&OSInfoEx, '\0', sizeof(OSInfoEx));
-    OSInfoEx.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+    RT_ZERO(OSInfoEx);
+    OSInfoEx.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
     if (!GetVersionEx((LPOSVERSIONINFO) &OSInfoEx))
     {
@@ -319 +319 @@
 
     /* Get extended version info for 2000 and later. */
-    if (    OSInfoEx.dwPlatformId == VER_PLATFORM_WIN32_NT
-        &&  OSInfoEx.dwMajorVersion >= 5)
-    {
-        ZeroMemory(&OSInfoEx, sizeof(OSInfoEx));
+    if (   OSInfoEx.dwPlatformId == VER_PLATFORM_WIN32_NT
+        && OSInfoEx.dwMajorVersion >= 5)
+    {
+        RT_ZERO(OSInfoEx);
         OSInfoEx.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
         if (!GetVersionEx((LPOSVERSIONINFO) &OSInfoEx))