Changeset 7418 in vbox for trunk/src/VBox/Main

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

28852

Message:

UCS-2 -> UTF-16.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (7 diffs)
• ConsoleImpl2.cpp (modified) (1 diff)
• glue/com.cpp (modified) (4 diffs)
• linux/helpers.cpp (modified) (2 diffs)
• testcase/tstAPI.cpp (modified) (2 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)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -98 +98 @@
     unsigned        i;
 
-#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)

trunk/src/VBox/Main/glue/com.cpp

@@ -51 +51 @@
 #else
 #define VBOX_USER_HOME_SUFFIX   ".VirtualBox"
-#endif 
+#endif
 
 
@@ -117 +117 @@
             iinfo->GetNameShared (&iname);
             char *utf8IName = NULL;
-            if (VBOX_SUCCESS (RTStrCurrentCPToUtf8 (&utf8IName, iname)))
+            if (RT_SUCCESS (RTStrCurrentCPToUtf8 (&utf8IName, iname)))
             {
                 PRTUCS2 ucs2IName = NULL;
-                if (VBOX_SUCCESS (RTStrUtf8ToUcs2 (&ucs2IName, utf8IName)))
+                if (RT_SUCCESS (RTStrToUtf16 (utf8IName, &ucs2IName)))
                 {
                     *aName = SysAllocString ((OLECHAR *) ucs2IName);
-                    RTStrUcs2Free (ucs2IName);
+                    RTUtf16Free (ucs2IName);
                 }
                 RTStrFree (utf8IName);
@@ -170 +170 @@
         if (RT_SUCCESS (vrc))
         {
-            size_t len = 
+            size_t len =
                 RTStrPrintf (aDir, aDirLen, "%s%c%s",
                              path, RTPATH_DELIMITER, VBOX_USER_HOME_SUFFIX);
@@ -187 +187 @@
 
 /* static */
-const Guid Guid::Empty; /* default ctor is OK */ 
+const Guid Guid::Empty; /* default ctor is OK */
 
 } /* namespace com */

trunk/src/VBox/Main/linux/helpers.cpp

@@ -176 +176 @@
 unsigned int SysStringByteLen(BSTR bstr)
 {
-    return RTStrUcs2Len(bstr) * sizeof(OLECHAR);
+    return RTUtf16Len(bstr) * sizeof(OLECHAR);
 }
 
@@ -186 +186 @@
 unsigned int SysStringLen(BSTR bstr)
 {
-    return RTStrUcs2Len(bstr);
+    return RTUtf16Len(bstr);
 }

trunk/src/VBox/Main/testcase/tstAPI.cpp

@@ -379 +379 @@
                 char *driveNameUtf8;
                 dvdDrive->GetDriveName(&driveName);
-                RTStrUcs2ToUtf8(&driveNameUtf8, (PCRTUCS2)driveName);
+                RTUtf16ToUtf8((PCRTUTF16)driveName, &driveNameUtf8);
                 printf("Host DVD drive name: %s\n", driveNameUtf8);
                 RTStrFree(driveNameUtf8);
@@ -404 +404 @@
                 char *driveNameUtf8;
                 floppyDrive->GetDriveName(&driveName);
-                RTStrUcs2ToUtf8(&driveNameUtf8, (PCRTUCS2)driveName);
+                RTUtf16ToUtf8((PCRTUTF16)driveName, &driveNameUtf8);
                 printf("Host floppy drive name: %s\n", driveNameUtf8);
                 RTStrFree(driveNameUtf8);