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

Timestamp:

Apr 17, 2019 8:26:41 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/RTPathGetCurrent/win: Upper case the drive letter so it is consistent with RTPathAbsEx. bugref:9172

Location:

trunk/src/VBox/Runtime/r3

Files:

• dir.cpp (modified) (1 diff)
• win/path-win.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/dir.cpp

@@ -534 +534 @@
     if (!pszFilter)
     {
-        /* Note! RTPathAbs currently strips trailing slashes, so we have
-           to inspect pszPath to figure it out. */
         if (*pszPath != '\0')
         {

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

@@ -35 +35 @@
 #include <iprt/path.h>
 #include <iprt/assert.h>
+#include <iprt/ctype.h>
 #include <iprt/err.h>
 #include <iprt/ldr.h>
@@ -682 +683 @@
             RTUTF16 wszFullPath[RTPATH_MAX];
             if (GetFullPathNameW(wszCurPath, RTPATH_MAX, wszFullPath, NULL))
+            {
+                if (   wszFullPath[1] == ':'
+                    && RT_C_IS_LOWER(wszFullPath[0]))
+                    wszFullPath[0] = RT_C_TO_UPPER(wszFullPath[0]);
+
                 rc = RTUtf16ToUtf8Ex(&wszFullPath[0], RTSTR_MAX, &pszPath, cchPath, NULL);
+            }
             else
                 rc = RTErrConvertFromWin32(GetLastError());