Changeset 7401 in vbox

Timestamp:

Mar 10, 2008 1:48:33 PM (17 years ago)

Author:

vboxsync

Message:

Don't use UCS2 routines & types. Fixed bug in RTPathUserHome().

File:

• trunk/src/VBox/Runtime/r3/win/path-win.cpp (modified) (11 diffs)

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

@@ -54 +54 @@
 {
     /*
-     * Convert to UCS2, call Win32 APIs, convert back.
+     * Convert to UTF-16, call Win32 APIs, convert back.
      */
     PRTUTF16 pwszPath;
-    int rc = RTStrUtf8ToUcs2(&pwszPath, pszPath);
+    int rc = RTStrToUtf16(pszPath, &pwszPath);
     if (!RT_SUCCESS(rc))
         return (rc);
@@ -69 +69 @@
         DWORD dwAttr = GetFileAttributesW(wsz);
         if (dwAttr != INVALID_FILE_ATTRIBUTES)
-            rc = RTStrUcs2ToUtf8Ex(&pszRealPath, cchRealPath, (PRTUTF16)&wsz[0]);
+            rc = RTUtf16ToUtf8Ex((PRTUTF16)&wsz[0], RTSTR_MAX, &pszRealPath, cchRealPath, NULL);
         else
             rc = RTErrConvertFromWin32(GetLastError());
@@ -78 +78 @@
         rc = VERR_FILENAME_TOO_LONG;
 
-    RTStrUcs2Free(pwszPath);
+    RTUtf16Free(pwszPath);
 
     return rc;
@@ -95 +95 @@
 {
     /*
-     * Convert to UCS2, call Win32 API, convert back.
-     */
-    LPWSTR lpwPath;
-    int rc = RTStrUtf8ToUcs2(&lpwPath, pszPath);
+     * Convert to UTF-16, call Win32 API, convert back.
+     */
+    LPWSTR pwszPath;
+    int rc = RTStrToUtf16(pszPath, &pwszPath);
     if (!RT_SUCCESS(rc))
         return (rc);
 
-    LPWSTR lpFile;
-    RTUCS2 ucsz[RTPATH_MAX];
-    rc = GetFullPathNameW(lpwPath, ELEMENTS(ucsz), &ucsz[0], &lpFile);
-    if (rc > 0 && rc < ELEMENTS(ucsz))
-        rc = RTStrUcs2ToUtf8Ex(&pszAbsPath, cchAbsPath, &ucsz[0]);
+    LPWSTR pwszFile; /* Ignored */
+    RTUTF16 wsz[RTPATH_MAX];
+    rc = GetFullPathNameW(pwszPath, RT_ELEMENTS(wsz), &wsz[0], &pwszFile);
+    if (rc > 0 && rc < RT_ELEMENTS(wsz))
+        rc = RTUtf16ToUtf8Ex(&wsz[0], RTSTR_MAX, &pszAbsPath, cchAbsPath, NULL);
     else if (rc <= 0)
         rc = RTErrConvertFromWin32(GetLastError());
@@ -112 +112 @@
         rc = VERR_FILENAME_TOO_LONG;
 
-    RTStrUcs2Free(lpwPath);
+    RTUtf16Free(pwszPath);
 
     return rc;
@@ -165 +165 @@
 RTDECL(int) RTPathUserHome(char *pszPath, unsigned cchPath)
 {
-    RTUCS2  ucszPath[RTPATH_MAX];
+    RTUTF16 wszPath[RTPATH_MAX];
     DWORD   dwAttr;
 
@@ -171 +171 @@
      * There are multiple definitions for what WE think of as user home...
      */
-    if (    !GetEnvironmentVariableW(L"HOME", &ucszPath[0], RTPATH_MAX)
-        ||  (dwAttr = GetFileAttributesW(&ucszPath[0])) == INVALID_FILE_ATTRIBUTES
+    if (    !GetEnvironmentVariableW(L"HOME", &wszPath[0], RTPATH_MAX)
+        ||  (dwAttr = GetFileAttributesW(&wszPath[0])) == INVALID_FILE_ATTRIBUTES
         ||  !(dwAttr & FILE_ATTRIBUTE_DIRECTORY))
     {
-        if (    !GetEnvironmentVariableW(L"USERPROFILE", &ucszPath[0], RTPATH_MAX)
-            ||  (dwAttr = GetFileAttributesW(&ucszPath[0])) == INVALID_FILE_ATTRIBUTES
+        if (    !GetEnvironmentVariableW(L"USERPROFILE", &wszPath[0], RTPATH_MAX)
+            ||  (dwAttr = GetFileAttributesW(&wszPath[0])) == INVALID_FILE_ATTRIBUTES
             ||  !(dwAttr & FILE_ATTRIBUTE_DIRECTORY))
         {
-            if (!GetEnvironmentVariableW(L"HOMEDRIVE", &ucszPath[0], RTPATH_MAX))
+            /* %HOMEDRIVE%%HOMEPATH% */
+            if (!GetEnvironmentVariableW(L"HOMEDRIVE", &wszPath[0], RTPATH_MAX))
                 return VERR_PATH_NOT_FOUND;
-            PRTUCS2 pucsz = &ucszPath[RTStrUcs2Len(&ucszPath[0])];
-            if (    !GetEnvironmentVariableW(L"HOMEPATH", &ucszPath[0], RTPATH_MAX)
-                ||  (dwAttr = GetFileAttributesW(&ucszPath[0])) == INVALID_FILE_ATTRIBUTES
+            size_t const cwc = RTUtf16Len(&wszPath[0]);
+            if (    !GetEnvironmentVariableW(L"HOMEPATH", &wszPath[cwc], RTPATH_MAX - cwc)
+                ||  (dwAttr = GetFileAttributesW(&wszPath[0])) == INVALID_FILE_ATTRIBUTES
                 ||  !(dwAttr & FILE_ATTRIBUTE_DIRECTORY))
                 return VERR_PATH_NOT_FOUND;
@@ -192 +193 @@
      * Convert and return.
      */
-    return RTStrUcs2ToUtf8Ex(&pszPath, cchPath, &ucszPath[0]);
+    return RTStrUcs2ToUtf8Ex(&pszPath, cchPath, &wszPath[0]);
 }
 
@@ -223 +224 @@
     WIN32_FILE_ATTRIBUTE_DATA Data;
 #ifndef RT_DONT_CONVERT_FILENAMES
-    PRTUCS2 puszPath;
-    int rc = RTStrUtf8ToUcs2(&puszPath, pszPath);
+    PRTUTF16 pwszPath;
+    int rc = RTStrUtf8ToUcs2(&pwszPath, pszPath);
     if (RT_FAILURE(rc))
         return rc;
-    if (!GetFileAttributesExW(puszPath, GetFileExInfoStandard, &Data))
+    if (!GetFileAttributesExW(pwszPath, GetFileExInfoStandard, &Data))
     {
         rc = RTErrConvertFromWin32(GetLastError());
-        RTStrUcs2Free(puszPath);
+        RTUtf16Free(pwszPath);
         return rc;
     }
-    RTStrUcs2Free(puszPath);
+    RTUtf16Free(pwszPath);
 #else
     if (!GetFileAttributesExA(pszPath, GetFileExInfoStandard, &Data))
@@ -457 +458 @@
 /**
  * Checks if the path exists.
- * 
+ *
  * Symbolic links will all be attempted resolved.
- * 
+ *
  * @returns true if it exists and false if it doesn't
  * @param   pszPath     The path to check.
@@ -475 +476 @@
      */
 #ifndef RT_DONT_CONVERT_FILENAMES
-    PRTUCS2 puszPath;
-    int rc = RTStrUtf8ToUcs2(&puszPath, pszPath);
+    PRT16UTF pwszPath;
+    int rc = RTStrUtf8ToUcs2(&pwszPath, pszPath);
     if (RT_SUCCESS(rc))
     {
-        if (GetFileAttributesW(puszPath) == INVALID_FILE_ATTRIBUTES)
+        if (GetFileAttributesW(pwszPath) == INVALID_FILE_ATTRIBUTES)
             rc = VERR_GENERAL_FAILURE;
-        RTStrUcs2Free(puszPath);
+        RTUtf16Free(pwszPath);
     }
 #else