Changeset 70200 in vbox for trunk

Timestamp:

Dec 18, 2017 2:09:58 PM (7 years ago)

Author:

vboxsync

Message:

IPRT/R3: Made the core work on NT 3.51 (still experimental). [build fix]

File:

• trunk/src/VBox/Runtime/r3/nt/pathint-nt.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/r3/nt/pathint-nt.cpp

@@ -38 +38 @@
 #include <iprt/assert.h>
 
-#include "../win/internal-r3-win.h"
-
 
 /*********************************************************************************************************************************
@@ -69 +67 @@
         {
             *phRootDir = NULL;
-            if (   g_enmWinVer >=  kRTWinOSType_NT4
-                || g_enmWinVer == kRTWinOSType_UNKNOWN)
+            if (RT_MAKE_U64(RTNtCurrentPeb()->OSMinorVersion, RTNtCurrentPeb()->OSMajorVersion) >= RT_MAKE_U64(0, 4))
             {
                 pwszPath[0] = '\\';
@@ -121 +118 @@
     if (cwcWinPath < _32K - 1)
     {
-        size_t const cwcExtraPrefix =  g_enmWinVer >=  kRTWinOSType_NT4 || g_enmWinVer == kRTWinOSType_UNKNOWN
+
+        size_t const cwcExtraPrefix =    RT_MAKE_U64(RTNtCurrentPeb()->OSMinorVersion, RTNtCurrentPeb()->OSMajorVersion)
+                                      >= RT_MAKE_U64(0, 4)
                                     ? 0 : sizeof(g_szPrefixNt3x) - 1 - 4;
         PRTUTF16 pwszNtPath = (PRTUTF16)RTUtf16Alloc((cwcExtraPrefix + cwcWinPath + 1) * sizeof(RTUTF16));
@@ -210 +209 @@
     const char *pszPrefix;
     size_t      cchPrefix;
-    if (   g_enmWinVer >=  kRTWinOSType_NT4
-        || g_enmWinVer == kRTWinOSType_UNKNOWN)
+    if (RT_MAKE_U64(RTNtCurrentPeb()->OSMinorVersion, RTNtCurrentPeb()->OSMajorVersion) >= RT_MAKE_U64(0, 4))
     {
         pszPrefix = g_szPrefix;
@@ -251 +249 @@
         {
             /* UNC */
-            if (   g_enmWinVer >=  kRTWinOSType_NT4
-                || g_enmWinVer == kRTWinOSType_UNKNOWN)
+            if (RT_MAKE_U64(RTNtCurrentPeb()->OSMinorVersion, RTNtCurrentPeb()->OSMajorVersion) >= RT_MAKE_U64(0, 4))
             {
                 pszPrefix = g_szPrefixUnc;