Changeset 70361 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

Dec 27, 2017 4:58:28 PM (7 years ago)

Author:

vboxsync

Message:

iprt/process-win.cpp: shut up some annoying assertions on NT3.1.

Location:

trunk/src/VBox/Runtime/r3/win

Files:

• init-win.cpp (modified) (1 diff)
• process-win.cpp (modified) (3 diffs)

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

@@ -222 +222 @@
     else if (dwPlatformId == VER_PLATFORM_WIN32_NT)
     {
-        if (        dwMajorVersion == 3
-                 && dwMinorVersion == 1)
-            enmVer = kRTWinOSType_NT310;
-        else if (   dwMajorVersion == 3
-                 && dwMinorVersion == 50)
-            enmVer = kRTWinOSType_NT350;
-        else if (   dwMajorVersion == 3
-                 && dwMinorVersion == 51)
-            enmVer = kRTWinOSType_NT351;
-        else if (   dwMajorVersion == 4
-                 && dwMinorVersion == 0)
+        if (dwMajorVersion == 3)
+        {
+            if (     dwMinorVersion < 50)
+                enmVer = kRTWinOSType_NT310;
+            else if (dwMinorVersion == 50)
+                enmVer = kRTWinOSType_NT350;
+            else
+                enmVer = kRTWinOSType_NT351;
+        }
+        else if (dwMajorVersion == 4)
             enmVer = kRTWinOSType_NT4;
-        else if (   dwMajorVersion == 5
-                 && dwMinorVersion == 0)
-            enmVer = kRTWinOSType_2K;
-        else if (   dwMajorVersion == 5
-                 && dwMinorVersion == 1)
-            enmVer = kRTWinOSType_XP;
-        else if (   dwMajorVersion == 5
-                 && dwMinorVersion == 2)
-            enmVer = kRTWinOSType_2003;
-        else if (   dwMajorVersion == 6
-                 && dwMinorVersion == 0)
-        {
-            if (bProductType != VER_NT_WORKSTATION)
-                enmVer = kRTWinOSType_2008;
+        else if (dwMajorVersion == 5)
+        {
+            if (dwMinorVersion == 0)
+                enmVer = kRTWinOSType_2K;
+            else if (dwMinorVersion == 1)
+                enmVer = kRTWinOSType_XP;
             else
-                enmVer = kRTWinOSType_VISTA;
-        }
-        else if (   dwMajorVersion == 6
-                 && dwMinorVersion == 1)
-        {
-            if (bProductType != VER_NT_WORKSTATION)
-                enmVer = kRTWinOSType_2008R2;
+                enmVer = kRTWinOSType_2003;
+        }
+        else if (dwMajorVersion == 6)
+        {
+            if (dwMinorVersion == 0)
+                enmVer = bProductType != VER_NT_WORKSTATION ? kRTWinOSType_2008   : kRTWinOSType_VISTA;
+            else if (dwMinorVersion == 1)
+                enmVer = bProductType != VER_NT_WORKSTATION ? kRTWinOSType_2008R2 : kRTWinOSType_7;
+            else if (dwMinorVersion == 2)
+                enmVer = bProductType != VER_NT_WORKSTATION ? kRTWinOSType_2012   : kRTWinOSType_8;
+            else if (dwMinorVersion == 3)
+                enmVer = bProductType != VER_NT_WORKSTATION ? kRTWinOSType_2012R2 : kRTWinOSType_81;
+            else if (dwMinorVersion == 4)
+                enmVer = bProductType != VER_NT_WORKSTATION ? kRTWinOSType_2016   : kRTWinOSType_10;
             else
-                enmVer = kRTWinOSType_7;
-        }
-        else if (   dwMajorVersion == 6
-                 && dwMinorVersion == 2)
-        {
-            if (bProductType != VER_NT_WORKSTATION)
-                enmVer = kRTWinOSType_2012;
+                enmVer = kRTWinOSType_NT_UNKNOWN;
+        }
+        else if (dwMajorVersion == 10)
+        {
+            if (dwMinorVersion == 0)
+                enmVer = bProductType != VER_NT_WORKSTATION ? kRTWinOSType_2016   : kRTWinOSType_10;
             else
-                enmVer = kRTWinOSType_8;
-        }
-        else if (   dwMajorVersion == 6
-                 && dwMinorVersion == 3)
-        {
-            if (bProductType != VER_NT_WORKSTATION)
-                enmVer = kRTWinOSType_2012R2;
-            else
-                enmVer = kRTWinOSType_81;
-        }
-        else if (   (   dwMajorVersion == 6
-                     && dwMinorVersion == 4)
-                 || (   dwMajorVersion == 10
-                     && dwMinorVersion == 0))
-        {
-            if (bProductType != VER_NT_WORKSTATION)
-                enmVer = kRTWinOSType_2016;
-            else
-                enmVer = kRTWinOSType_10;
+                enmVer = kRTWinOSType_NT_UNKNOWN;
         }
         else

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

@@ -2298 +2298 @@
                 {
                     rc = RTErrConvertFromWin32(GetLastError());
-                    AssertMsgFailedReturn(("%Rrc %p\n", rc, *aphStds[i]), rc);
+                    if (rc != VERR_INVALID_FUNCTION || g_enmWinVer != kRTWinOSType_NT310)
+                        AssertMsgFailedReturn(("%Rrc %p\n", rc, *aphStds[i]), rc);
                 }
             }
@@ -2315 +2316 @@
             {
                 rc = RTErrConvertFromWin32(GetLastError());
-                AssertMsgFailedBreak(("%Rrc %p\n", rc, *aphStds[i]));
+                if (rc == VERR_INVALID_FUNCTION && g_enmWinVer == kRTWinOSType_NT310)
+                    rc = VINF_SUCCESS;
+                else
+                    AssertMsgFailedBreak(("%Rrc %p\n", rc,*aphStds[i]));
             }
         }
@@ -2424 +2428 @@
             &&  !(afInhStds[i] & HANDLE_FLAG_INHERIT))
         {
-            if (!SetHandleInformation(*aphStds[i], HANDLE_FLAG_INHERIT, 0))
+            if (   !SetHandleInformation(*aphStds[i], HANDLE_FLAG_INHERIT, 0)
+                && (   GetLastError() != ERROR_INVALID_FUNCTION
+                    || g_enmWinVer != kRTWinOSType_NT310) )
                 AssertMsgFailed(("%Rrc %p\n", RTErrConvertFromWin32(GetLastError()), *aphStds[i]));
         }