Changeset 7418 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

Mar 10, 2008 4:01:58 PM (17 years ago)

Author:

vboxsync

Message:

UCS-2 -> UTF-16.

Location:

trunk/src/VBox/Runtime/r3/win

Files:

• dir-win.cpp (modified) (11 diffs)
• fs-win.cpp (modified) (17 diffs)
• path-win.cpp (modified) (3 diffs)
• utf8-win.cpp (modified) (6 diffs)

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

@@ -52 +52 @@
 
     /*
-     * Convert to UCS2.
-     */
-    PRTUCS2 pucszString;
-    int rc = RTStrUtf8ToUcs2(&pucszString, pszPath);
+     * Convert to UTF-16.
+     */
+    PRTUTF16 pwszString;
+    int rc = RTStrToUtf16(pszPath, &pwszString);
     AssertRC(rc);
     if (RT_SUCCESS(rc))
@@ -62 +62 @@
          * Query and check attributes.
          */
-        DWORD dwAttr = GetFileAttributesW((LPCWSTR)pucszString);
+        DWORD dwAttr = GetFileAttributesW((LPCWSTR)pwszString);
         fRc = dwAttr != INVALID_FILE_ATTRIBUTES
             && (dwAttr & FILE_ATTRIBUTE_DIRECTORY);
 
-        RTStrUcs2Free(pucszString);
+        RTUtf16Free(pwszString);
     }
 
@@ -84 +84 @@
     {
         /*
-         * Convert to UCS2.
+         * Convert to UTF-16.
          */
-        PRTUCS2 pucszString;
-        rc = RTStrUtf8ToUcs2(&pucszString, pszPath);
+        PRTUTF16 pwszString;
+        rc = RTStrToUtf16(pszPath, &pwszString);
         AssertRC(rc);
         if (RT_SUCCESS(rc))
@@ -94 +94 @@
              * Create the directory.
              */
-            if (CreateDirectoryW((LPCWSTR)pucszString, NULL))
+            if (CreateDirectoryW((LPCWSTR)pwszString, NULL))
                 rc = VINF_SUCCESS;
             else
@@ -104 +104 @@
             if (RT_SUCCESS(rc))
             {
-                if (SetFileAttributesW((LPCWSTR)pucszString, FILE_ATTRIBUTE_NOT_CONTENT_INDEXED))
+                if (SetFileAttributesW((LPCWSTR)pwszString, FILE_ATTRIBUTE_NOT_CONTENT_INDEXED))
                     rc = VINF_SUCCESS;
                 else
@@ -110 +110 @@
             }
 
-            RTStrUcs2Free(pucszString);
+            RTUtf16Free(pwszString);
         }
     }
@@ -127 +127 @@
 {
     /*
-     * Convert to UCS2.
-     */
-    PRTUCS2 pucszString;
-    int rc = RTStrUtf8ToUcs2(&pucszString, pszPath);
+     * Convert to UTF-16.
+     */
+    PRTUTF16 pwszString;
+    int rc = RTStrToUtf16(pszPath, &pwszString);
     AssertRC(rc);
     if (RT_SUCCESS(rc))
@@ -137 +137 @@
          * Remove the directory.
          */
-        if (RemoveDirectoryW((LPCWSTR)pucszString))
+        if (RemoveDirectoryW((LPCWSTR)pwszString))
             rc = VINF_SUCCESS;
         else
             rc = RTErrConvertFromWin32(GetLastError());
 
-        RTStrUcs2Free(pucszString);
+        RTUtf16Free(pwszString);
     }
 
@@ -181 +181 @@
     int rc = VINF_SUCCESS;
 #ifndef RT_DONT_CONVERT_FILENAMES
-    PRTUCS2 puszName;
-    rc = RTStrUtf8ToUcs2(&puszName, pszPathBuf);
+    PRTUTF16 pwszName;
+    rc = RTStrToUtf16(pszPathBuf, &pwszName);
     if (RT_SUCCESS(rc))
     {
-        pDir->hDir    = FindFirstFileW((LPCWSTR)puszName, &pDir->Data);
+        pDir->hDir    = FindFirstFileW((LPCWSTR)pwszName, &pDir->Data);
 #else
         pDir->hDir    = FindFirstFileA(pszPathBuf, &pDir->Data);
@@ -197 +197 @@
             rc = RTErrConvertFromWin32(GetLastError());
 #ifndef RT_DONT_CONVERT_FILENAMES
-        RTStrUcs2Free(puszName);
+        RTUtf16Free(pwszName);
     }
 #endif
@@ -430 +430 @@
     {
         /* copy and calc length */
-        PCRTUCS2 pucSrc = (PCRTUCS2)pDir->Data.cAlternateFileName;
-        PRTUCS2  pucDst = pDirEntry->uszShortName;
-        while (*pucSrc)
-            *pucDst++ = *pucSrc++;
-        pDirEntry->cucShortName = pucDst - &pDirEntry->uszShortName[0];
+        PCRTUTF16 pwszSrc = (PCRTUTF16)pDir->Data.cAlternateFileName;
+        PRTUTF16  pwszDst = pDirEntry->wszShortName;
+        while (*pwszSrc)
+            *pwszDst++ = *pwszSrc++;
+        pDirEntry->cwcShortName = pwszDst - &pDirEntry->wszShortName[0];
         /* zero the rest */
-        const PRTUCS2 pucEnd = &pDirEntry->uszShortName[ELEMENTS(pDirEntry->uszShortName)];
-        while (pucDst < pucEnd)
-            *pucDst++ = '\0';
+        const PRTUTF16 pwszEnd = &pDirEntry->wszShortName[RT_ELEMENTS(pDirEntry->wszShortName)];
+        while (pwszDst < pwszEnd)
+            *pwszDst++ = '\0';
     }
     else
 #endif
     {
-        memset(pDirEntry->uszShortName, 0, sizeof(pDirEntry->uszShortName));
-        pDirEntry->cucShortName = 0;
+        memset(pDirEntry->wszShortName, 0, sizeof(pDirEntry->wszShortName));
+        pDirEntry->cwcShortName = 0;
     }
 

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

@@ -87 +87 @@
 
 #ifndef RT_DONT_CONVERT_FILENAMES
+
 /**
  * Finds the root of the specified volume.
@@ -92 +93 @@
  * @returns iprt status code.
  * @param   pszFsPath       Path within the filesystem. Verified as one byte or more.
- * @param   ppuszFsRoot     Where to store the returned string. Free with rtFsFreeRoot(),
- */
-static int rtFsGetRoot(const char *pszFsPath, PRTUCS2 *ppuszFsRoot)
+ * @param   ppwszFsRoot     Where to store the returned string. Free with rtFsFreeRoot(),
+ */
+static int rtFsGetRoot(const char *pszFsPath, PRTUTF16 *ppwszFsRoot)
 {
     /*
@@ -100 +101 @@
      */
     if (rtFsIsRoot(pszFsPath))
-        return RTStrUtf8ToUcs2(ppuszFsRoot, pszFsPath);
+        return RTStrToUtf16(pszFsPath, ppwszFsRoot);
 
     /*
@@ -120 +121 @@
      * Convert the path.
      */
-    rc = RTStrUtf8ToUcs2(ppuszFsRoot, szFullPath);
+    rc = RTStrToUtf16(szFullPath, ppwszFsRoot);
     if (RT_FAILURE(rc))
         return rc == VERR_BUFFER_OVERFLOW ? VERR_FILENAME_TOO_LONG : rc;
@@ -127 +128 @@
      * Walk the path until our proper API is happy or there is no more path left.
      */
-    PRTUCS2 puszStart = *ppuszFsRoot;
-    if (!GetVolumeInformationW(puszStart, NULL, 0, NULL, NULL, 0, NULL, 0))
-    {
-        PRTUCS2 puszEnd = puszStart + RTStrUcs2Len(puszStart);
-        PRTUCS2 puszMin = puszStart + 2;
+    PRTUTF16 pwszStart = *ppwszFsRoot;
+    if (!GetVolumeInformationW(pwszStart, NULL, 0, NULL, NULL, 0, NULL, 0))
+    {
+        PRTUTF16 pwszEnd = pwszStart + RTUtf16Len(pwszStart);
+        PRTUTF16 pwszMin = pwszStart + 2;
         do
         {
             /* Strip off the last path component. */
-            while (puszEnd-- > puszMin)
-                if (RTPATH_IS_SLASH(*puszEnd))
+            while (pwszEnd-- > pwszMin)
+                if (RTPATH_IS_SLASH(*pwszEnd))
                     break;
-            AssertReturn(puszEnd >= puszMin, VERR_INTERNAL_ERROR); /* leaks, but that's irrelevant for an internal error. */
-            puszEnd[1] = '\0';
-        } while (!GetVolumeInformationW(puszStart, NULL, 0, NULL, NULL, 0, NULL, 0));
+            AssertReturn(pwszEnd >= pwszMin, VERR_INTERNAL_ERROR); /* leaks, but that's irrelevant for an internal error. */
+            pwszEnd[1] = '\0';
+        } while (!GetVolumeInformationW(pwszStart, NULL, 0, NULL, NULL, 0, NULL, 0));
     }
 
@@ -149 +150 @@
  * Frees string returned by rtFsGetRoot().
  */
-static void rtFsFreeRoot(PRTUCS2 puszFsRoot)
-{
-    RTStrUcs2Free(puszFsRoot);
-}
-
-#else
+static void rtFsFreeRoot(PRTUTF16 pwszFsRoot)
+{
+    RTUtf16Free(pwszFsRoot);
+}
+
+#else /* RT_DONT_CONVERT_FILENAMES */
 
 /**
@@ -214 +215 @@
     RTStrFree(pszFsRoot);
 }
-#endif
+
+#endif /* RT_DONT_CONVERT_FILENAMES*/
 
 
@@ -225 +227 @@
     AssertMsgReturn(VALID_PTR(pszFsPath) && *pszFsPath, ("%p", pszFsPath), VERR_INVALID_PARAMETER);
 #ifndef RT_DONT_CONVERT_FILENAMES
-    PRTUCS2 puszFsRoot;
-    int rc = rtFsGetRoot(pszFsPath, &puszFsRoot);
+    PRTUTF16 pwszFsRoot;
+    int rc = rtFsGetRoot(pszFsPath, &pwszFsRoot);
 #else
     char pszFsRoot;
@@ -242 +244 @@
         ULARGE_INTEGER cbFree;
 #ifndef RT_DONT_CONVERT_FILENAMES
-        if (GetDiskFreeSpaceExW(puszFsRoot, &cbFree, &cbTotal, NULL))
+        if (GetDiskFreeSpaceExW(pwszFsRoot, &cbFree, &cbTotal, NULL))
 #else
         if (GetDiskFreeSpaceExA(pszFsRoot, &cbFree, &cbTotal, NULL))
@@ -271 +273 @@
         DWORD cSectorsPerCluster;
 #ifndef RT_DONT_CONVERT_FILENAMES
-        if (GetDiskFreeSpaceW(puszFsRoot, &cSectorsPerCluster, &cbSector, &dwDummy1, &dwDummy2))
+        if (GetDiskFreeSpaceW(pwszFsRoot, &cSectorsPerCluster, &cbSector, &dwDummy1, &dwDummy2))
 #else
         if (GetDiskFreeSpaceA(pszFsRoot, &cSectorsPerCluster, &cbSector, &dwDummy1, &dwDummy2))
@@ -291 +293 @@
 
 #ifndef RT_DONT_CONVERT_FILENAMES
-    rtFsFreeRoot(puszFsRoot);
+    rtFsFreeRoot(pwszFsRoot);
 #else
     rtFsFreeRoot(pszFsRoot);
@@ -314 +316 @@
     AssertMsgReturn(VALID_PTR(pu32Serial), ("%p", pu32Serial), VERR_INVALID_PARAMETER);
 #ifndef RT_DONT_CONVERT_FILENAMES
-    PRTUCS2 puszFsRoot;
-    int rc = rtFsGetRoot(pszFsPath, &puszFsRoot);
+    PRTUTF16 pwszFsRoot;
+    int rc = rtFsGetRoot(pszFsPath, &pwszFsRoot);
 #else
     char pszFsRoot;
@@ -330 +332 @@
     DWORD   dwSerial;
 #ifndef RT_DONT_CONVERT_FILENAMES
-    if (GetVolumeInformationW(puszFsRoot, NULL, 0, &dwSerial, &dwMaxName, &dwFlags, NULL, 0))
+    if (GetVolumeInformationW(pwszFsRoot, NULL, 0, &dwSerial, &dwMaxName, &dwFlags, NULL, 0))
 #else
     if (GetVolumeInformationA(pszFsRoot, NULL, 0, &dwSerial, &dwMaxName, &dwFlags, NULL, 0))
@@ -344 +346 @@
 
 #ifndef RT_DONT_CONVERT_FILENAMES
-    RTStrUcs2Free(puszFsRoot);
-#else
-    RTStrUcs2Free(pszFsRoot);
+    RTUtf16Free(pwszFsRoot);
+#else
+    RTStrFree(pszFsRoot);
 #endif
     return rc;
@@ -367 +369 @@
     AssertMsgReturn(VALID_PTR(pProperties), ("%p", pProperties), VERR_INVALID_PARAMETER);
 #ifndef RT_DONT_CONVERT_FILENAMES
-    PRTUCS2 puszFsRoot;
-    int rc = rtFsGetRoot(pszFsPath, &puszFsRoot);
+    PRTUTF16 pwszFsRoot;
+    int rc = rtFsGetRoot(pszFsPath, &pwszFsRoot);
 #else
     char pszFsRoot;
@@ -383 +385 @@
     DWORD   dwSerial;
 #ifndef RT_DONT_CONVERT_FILENAMES
-    if (GetVolumeInformationW(puszFsRoot, NULL, 0, &dwSerial, &dwMaxName, &dwFlags, NULL, 0))
+    if (GetVolumeInformationW(pwszFsRoot, NULL, 0, &dwSerial, &dwMaxName, &dwFlags, NULL, 0))
 #else
     if (GetVolumeInformationA(pszFsRoot, NULL, 0, &dwSerial, &dwMaxName, &dwFlags, NULL, 0))
@@ -406 +408 @@
 
 #ifndef RT_DONT_CONVERT_FILENAMES
-    RTStrUcs2Free(puszFsRoot);
-#else
-    RTStrUcs2Free(pszFsRoot);
+    RTUtf16Free(pwszFsRoot);
+#else
+    RTStrFree(pszFsRoot);
 #endif
     return rc;

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

@@ -193 +193 @@
      * Convert and return.
      */
-    return RTStrUcs2ToUtf8Ex(&pszPath, cchPath, &wszPath[0]);
+    return RTUtf16ToUtf8Ex(&wszPath[0], RTSTR_MAX, &pszPath, cchPath, NULL);
 }
 
@@ -225 +225 @@
 #ifndef RT_DONT_CONVERT_FILENAMES
     PRTUTF16 pwszPath;
-    int rc = RTStrUtf8ToUcs2(&pwszPath, pszPath);
+    int rc = RTStrToUtf16(pszPath, &pwszPath);
     if (RT_FAILURE(rc))
         return rc;
@@ -477 +477 @@
 #ifndef RT_DONT_CONVERT_FILENAMES
     PRTUTF16 pwszPath;
-    int rc = RTStrUtf8ToUcs2(&pwszPath, pszPath);
+    int rc = RTStrToUtf16(pszPath, &pwszPath);
     if (RT_SUCCESS(rc))
     {

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

@@ -67 +67 @@
      * Convert to wide char first.
      */
-    PRTUCS2 pucszString = NULL;
-    int rc = RTStrUtf8ToUcs2(&pucszString, pszString);
+    PRTUTF16 pwszString = NULL;
+    int rc = RTStrToUtf16(pszString, &pwszString);
     if (RT_FAILURE(rc))
         return rc;
@@ -75 +75 @@
      * First calc result string length.
      */
-    int cbResult = WideCharToMultiByte(CP_ACP, 0, pucszString, -1, NULL, 0, NULL, NULL);
+    int cbResult = WideCharToMultiByte(CP_ACP, 0, pwszString, -1, NULL, 0, NULL, NULL);
     if (cbResult > 0)
     {
@@ -87 +87 @@
              * Do the translation.
              */
-            if (WideCharToMultiByte(CP_ACP, 0, pucszString, -1, lpString, cbResult, NULL, NULL) > 0)
+            if (WideCharToMultiByte(CP_ACP, 0, pwszString, -1, lpString, cbResult, NULL, NULL) > 0)
             {
                 /* ok */
                 *ppszString = lpString;
-                RTMemTmpFree(pucszString);
+                RTMemTmpFree(pwszString);
                 return VINF_SUCCESS;
             }
@@ -111 +111 @@
         rc = RTErrConvertFromWin32(iLastErr);
     }
-    RTMemTmpFree(pucszString);
+    RTMemTmpFree(pwszString);
     return rc;
 }
@@ -129 +129 @@
     *ppszString = NULL;
 
-    /** @todo is there a quicker way? Currently: ACP -> UCS-2 -> UTF-8 */
+    /** @todo is there a quicker way? Currently: ACP -> UTF-16 -> UTF-8 */
 
     size_t cch = strlen(pszString);
@@ -145 +145 @@
      */
     int rc;
-    int cuc = MultiByteToWideChar(CP_ACP, 0, pszString, -1, NULL, 0);
-    if (cuc > 0)
+    int cwc = MultiByteToWideChar(CP_ACP, 0, pszString, -1, NULL, 0);
+    if (cwc > 0)
     {
         /*
          * Alloc space for result buffer.
          */
-        PRTUCS2 pucszString = (PRTUCS2)RTMemTmpAlloc(cuc * sizeof(RTUCS2));
-        if (pucszString)
+        PRTUTF16 pwszString = (PRTUTF16)RTMemTmpAlloc(cwc * sizeof(RTUTF16));
+        if (pwszString)
         {
             /*
              * Do the translation.
              */
-            if (MultiByteToWideChar(CP_ACP, 0, pszString, -1, pucszString, cuc) > 0)
+            if (MultiByteToWideChar(CP_ACP, 0, pszString, -1, pwszString, cwc) > 0)
             {
                 /*
-                 * Now we got UCS-2. Convert to UTF-8
+                 * Now we got UTF-16, convert it to UTF-8
                  */
-                rc = RTStrUcs2ToUtf8(ppszString, pucszString);
-                RTMemTmpFree(pucszString);
+                rc = RTUtf16ToUtf8(pwszString, ppszString);
+                RTMemTmpFree(pwszString);
                 return rc;
             }
-            RTMemTmpFree(pucszString);
+            RTMemTmpFree(pwszString);
             /* translation error */
             int iLastErr = GetLastError();