Changeset 7418 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

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

Author:

vboxsync

Message:

UCS-2 -> UTF-16.

File:

• trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

@@ -1182 +1182 @@
             SHFLSTRING      *pFolderName, *pMapName;
             int              cbString;
-            PRTUCS2          aHostPath, aMapName;
+            PRTUTF16         aHostPath, aMapName;
             int              rc;
 
-            rc = RTStrUtf8ToUcs2(&aHostPath, g_pszShareDir[i]);
+            rc = RTStrToUtf16(g_pszShareDir[i], &aHostPath);
             AssertRC(rc);
-            rc = RTStrUtf8ToUcs2(&aMapName, g_pszShareName[i]);
+            rc = RTStrToUtf16(g_pszShareName[i], &aMapName);
             AssertRC(rc);
 
-            cbString = (RTStrUcs2Len (aHostPath) + 1) * sizeof (RTUCS2);
+            cbString = (RTUtf16Len (aHostPath) + 1) * sizeof (RTUTF16);
             pFolderName = (SHFLSTRING *) RTMemAllocZ (sizeof (SHFLSTRING) + cbString);
             Assert (pFolderName);
@@ -1196 +1196 @@
 
             pFolderName->u16Size   = cbString;
-            pFolderName->u16Length = cbString - sizeof(RTUCS2);
+            pFolderName->u16Length = cbString - sizeof(RTUTF16);
 
             parms[0].type = VBOX_HGCM_SVC_PARM_PTR;
@@ -1202 +1202 @@
             parms[0].u.pointer.size = sizeof (SHFLSTRING) + cbString;
 
-            cbString = (RTStrUcs2Len (aMapName) + 1) * sizeof (RTUCS2);
+            cbString = (RTUtf16Len (aMapName) + 1) * sizeof (RTUTF16);
             pMapName = (SHFLSTRING *) RTMemAllocZ (sizeof(SHFLSTRING) + cbString);
             Assert (pMapName);
@@ -1208 +1208 @@
 
             pMapName->u16Size   = cbString;
-            pMapName->u16Length = cbString - sizeof (RTUCS2);
+            pMapName->u16Length = cbString - sizeof (RTUTF16);
 
             parms[1].type = VBOX_HGCM_SVC_PARM_PTR;
@@ -1223 +1223 @@
             RTMemFree (pFolderName);
             RTMemFree (pMapName);
-            RTStrUcs2Free (aHostPath);
-            RTStrUcs2Free (aMapName);
+            RTUtf16Free (aHostPath);
+            RTUtf16Free (aMapName);
         }
     }