Changeset 70428 in vbox for trunk/src/VBox/Runtime/r3/nt

Timestamp:

Jan 2, 2018 3:01:20 PM (7 years ago)

Author:

vboxsync

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

120033

Message:

IPRT: Changed the NT namespace passthru prefix from '
!\' to '
:iprtnt:\' to make it hard to use by mistake. Enabled it for everyone and all build types.

Location:

trunk/src/VBox/Runtime/r3/nt

Files:

• internal-r3-nt.h (modified) (1 diff)
• pathint-nt.cpp (modified) (5 diffs)

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

@@ -37 +37 @@
 
 
-#ifdef DEBUG_bird
+#if 1
 /** Enables the "\\!\" NT path pass thru as well as hacks for listing NT object
  * directories. */
 # define IPRT_WITH_NT_PATH_PASSTHRU 1
 #endif
+
 
 

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

@@ -226 +226 @@
         && pszPath[2])
     {
+#ifdef IPRT_WITH_NT_PATH_PASSTHRU
+        /*
+         * Special trick: The path starts with RTPATH_NT_PASSTHRU_PREFIX, we will skip past the bang and pass it thru.
+         */
+        if (   pszPath[2] == ':'
+            && pszPath[3] == 'i'
+            && pszPath[4] == 'p'
+            && pszPath[5] == 'r'
+            && pszPath[6] == 't'
+            && pszPath[7] == 'n'
+            && pszPath[8] == 't'
+            && pszPath[9] == ':'
+            && RTPATH_IS_SLASH(pszPath[10]))
+            return rtNtPathUtf8ToUniStr(pNtName, phRootDir, pszPath + 10);
+#endif
+
         if (   pszPath[2] == '?'
             && RTPATH_IS_SLASH(pszPath[3]))
             return rtNtPathFromWinUtf8PassThru(pNtName, phRootDir, pszPath);
-
-#ifdef IPRT_WITH_NT_PATH_PASSTHRU
-        /* Special hack: The path starts with "\\\\!\\", we will skip past the bang and pass it thru. */
-        if (   pszPath[2] == '!'
-            && RTPATH_IS_SLASH(pszPath[3]))
-            return rtNtPathUtf8ToUniStr(pNtName, phRootDir, pszPath + 3);
-#endif
 
         if (   pszPath[2] == '.'
@@ -331 +340 @@
         && !RTPATH_IS_SLASH(pwszWinPath[2]) )
     {
-        if (   pwszWinPath[2] == '?'
-            && cwcWinPath >= 4
-            && RTPATH_IS_SLASH(pwszWinPath[3]))
-            return rtNtPathFromWinUtf16PassThru(pNtName, phRootDir, pwszWinPath, cwcWinPath);
-
 #ifdef IPRT_WITH_NT_PATH_PASSTHRU
-        /* Special hack: The path starts with "\\\\!\\", we will skip past the bang and pass it thru. */
-        if (   pwszWinPath[2] == '!'
-            && cwcWinPath >= 4
-            && RTPATH_IS_SLASH(pwszWinPath[3]))
-        {
-            pwszWinPath += 3;
-            cwcWinPath  -= 3;
+        /*
+         * Special trick: The path starts with RTPATH_NT_PASSTHRU_PREFIX, we will skip past the bang and pass it thru.
+         */
+        if (   cwcWinPath >= sizeof(RTPATH_NT_PASSTHRU_PREFIX) - 1U
+            && pwszWinPath[2] == ':'
+            && pwszWinPath[3] == 'i'
+            && pwszWinPath[4] == 'p'
+            && pwszWinPath[5] == 'r'
+            && pwszWinPath[6] == 't'
+            && pwszWinPath[7] == 'n'
+            && pwszWinPath[8] == 't'
+            && pwszWinPath[9] == ':'
+            && RTPATH_IS_SLASH(pwszWinPath[10]) )
+        {
+            pwszWinPath += 10;
+            cwcWinPath  -= 10;
             if (cwcWinPath < _32K - 1)
             {
@@ -364 +377 @@
         }
 #endif
+
+        if (   pwszWinPath[2] == '?'
+            && cwcWinPath >= 4
+            && RTPATH_IS_SLASH(pwszWinPath[3]))
+            return rtNtPathFromWinUtf16PassThru(pNtName, phRootDir, pwszWinPath, cwcWinPath);
 
         if (   pwszWinPath[2] == '.'
@@ -866 +884 @@
             if (   !RTPATH_IS_SLASH(pszPath[0])
                 || !RTPATH_IS_SLASH(pszPath[1])
-                || pszPath[2] != '!'
-                || RTPATH_IS_SLASH(pszPath[3]))
+                || pszPath[2] != ':'
+                || pszPath[3] != 'i'
+                || pszPath[4] != 'p'
+                || pszPath[5] != 'r'
+                || pszPath[6] != 't'
+                || pszPath[7] != 'n'
+                || pszPath[8] != 't'
+                || pszPath[9] != ':'
+                || !RTPATH_IS_SLASH(pszPath[10]) )
 #endif
                 pfObjDir = NULL;
@@ -988 +1013 @@
         /* Rought conversion of the access flags. */
         ULONG fObjDesiredAccess = 0;
-        if (fDesiredAccess & (GENERIC_ALL | STANDARD_RIGHTS_ALL))
+        if (   (fDesiredAccess & GENERIC_ALL)
+            || (fDesiredAccess & STANDARD_RIGHTS_ALL) == STANDARD_RIGHTS_ALL)
             fObjDesiredAccess = DIRECTORY_ALL_ACCESS;
         else
         {
-            if (fDesiredAccess & (FILE_GENERIC_WRITE | GENERIC_WRITE | STANDARD_RIGHTS_WRITE))
-                fObjDesiredAccess |= DIRECTORY_CREATE_OBJECT | DIRECTORY_CREATE_OBJECT;
+            if (fDesiredAccess & (GENERIC_WRITE | STANDARD_RIGHTS_WRITE | FILE_WRITE_DATA))
+                fObjDesiredAccess |= DIRECTORY_CREATE_OBJECT | DIRECTORY_CREATE_OBJECT | DIRECTORY_CREATE_SUBDIRECTORY;
             if (   (fDesiredAccess & (FILE_LIST_DIRECTORY | FILE_GENERIC_READ | GENERIC_READ | STANDARD_RIGHTS_READ))
                 || !fObjDesiredAccess)