Changeset 58440 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Oct 27, 2015 5:40:34 PM (9 years ago)

Author:

vboxsync

Message:

Runtime: pathint-nt.cpp Win32 to NT path prefix conversion fix

File:

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

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

@@ -47 +47 @@
 /**
  * Handles the pass thru case for UTF-8 input.
+ * Win32 path uses "\\?\" prefix which is converted to "\??\" NT prefix.
  *
  * @returns IPRT status code.
@@ -57 +58 @@
     PRTUTF16 pwszPath = NULL;
     size_t   cwcLen;
-    int rc = RTStrToUtf16Ex(pszPath + 1, RTSTR_MAX, &pwszPath, 0, &cwcLen);
+    int rc = RTStrToUtf16Ex(pszPath, RTSTR_MAX, &pwszPath, 0, &cwcLen);
     if (RT_SUCCESS(rc))
     {
@@ -63 +64 @@
         {
             pwszPath[0] = '\\';
-            pwszPath[1] = '.';
-            pwszPath[2] = '\\';
+            pwszPath[1] = '?';
+            pwszPath[2] = '?';
+            pwszPath[3] = '\\';
 
             pNtName->Buffer = pwszPath;
@@ -82 +84 @@
 /**
  * Handles the pass thru case for UTF-16 input.
+ * Win32 path uses "\\?\" prefix which is converted to "\??\" NT prefix.
  *
  * @returns IPRT status code.
@@ -92 +95 @@
                                         PCRTUTF16 pwszWinPath, size_t cwcWinPath)
 {
-    /* Drop a character because: \\?\ -> \.\ */
-    pwszWinPath++;
-    cwcWinPath--;
-
     /* Check length and allocate memory for it. */
     int rc;
@@ -105 +104 @@
             /* Intialize the path. */
             pwszNtPath[0] = '\\';
-            pwszNtPath[1] = '.';
-            pwszNtPath[2] = '\\';
-            memcpy(pwszNtPath + 3, pwszWinPath + 3, (cwcWinPath - 3) * sizeof(RTUTF16));
+            pwszNtPath[1] = '?';
+            pwszNtPath[2] = '?';
+            pwszNtPath[3] = '\\';
+            memcpy(pwszNtPath + 4, pwszWinPath + 4, (cwcWinPath - 4) * sizeof(RTUTF16));
             pwszNtPath[cwcWinPath] = '\0';