Changeset 7418 in vbox for trunk/src/VBox/Main/ConsoleImpl.cpp

Timestamp:

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

Author:

vboxsync

Message:

UCS-2 -> UTF-16.

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -4480 +4480 @@
     Log (("Adding shared folder '%ls' -> '%ls'\n", aName, aData.mHostPath.raw()));
 
-    cbString = (RTStrUcs2Len (aData.mHostPath) + 1) * sizeof (RTUCS2);
+    cbString = (RTUtf16Len (aData.mHostPath) + 1) * sizeof (RTUTF16);
     if (cbString >= UINT16_MAX)
         return setError (E_INVALIDARG, tr ("The name is too long"));
@@ -4488 +4488 @@
 
     pFolderName->u16Size   = (uint16_t)cbString;
-    pFolderName->u16Length = (uint16_t)cbString - sizeof(RTUCS2);
+    pFolderName->u16Length = (uint16_t)cbString - sizeof(RTUTF16);
 
     parms[0].type = VBOX_HGCM_SVC_PARM_PTR;
@@ -4494 +4494 @@
     parms[0].u.pointer.size = sizeof (SHFLSTRING) + (uint16_t)cbString;
 
-    cbString = (RTStrUcs2Len (aName) + 1) * sizeof (RTUCS2);
+    cbString = (RTUtf16Len (aName) + 1) * sizeof (RTUTF16);
     if (cbString >= UINT16_MAX)
     {
@@ -4505 +4505 @@
 
     pMapName->u16Size   = (uint16_t)cbString;
-    pMapName->u16Length = (uint16_t)cbString - sizeof (RTUCS2);
+    pMapName->u16Length = (uint16_t)cbString - sizeof (RTUTF16);
 
     parms[1].type = VBOX_HGCM_SVC_PARM_PTR;
@@ -4551 +4551 @@
     Log (("Removing shared folder '%ls'\n", aName));
 
-    cbString = (RTStrUcs2Len (aName) + 1) * sizeof (RTUCS2);
+    cbString = (RTUtf16Len (aName) + 1) * sizeof (RTUTF16);
     if (cbString >= UINT16_MAX)
         return setError (E_INVALIDARG, tr ("The name is too long"));
@@ -4559 +4559 @@
 
     pMapName->u16Size   = (uint16_t)cbString;
-    pMapName->u16Length = (uint16_t)cbString - sizeof (RTUCS2);
+    pMapName->u16Length = (uint16_t)cbString - sizeof (RTUTF16);
 
     parms.type = VBOX_HGCM_SVC_PARM_PTR;
@@ -6121 +6121 @@
     BSTR            str = NULL;
     *phrc = S_OK;
-#define STR_CONV()  do { rc = RTStrUcs2ToUtf8(&psz, str); RC_CHECK(); } while (0)
+#define STR_CONV()  do { rc = RTUtf16ToUtf8(str, &psz); RC_CHECK(); } while (0)
 #define STR_FREE()  do { if (str) { SysFreeString(str); str = NULL; } if (psz) { RTStrFree(psz); psz = NULL; } } while (0)
 #define RC_CHECK()  do { if (VBOX_FAILURE(rc)) { AssertMsgFailed(("rc=%Vrc\n", rc)); STR_FREE(); return rc; } } while (0)