Changeset 7406 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Mar 10, 2008 2:34:31 PM (17 years ago)

Author:

vboxsync

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

28839

Message:

UCS2->UTF-16

File:

• trunk/src/VBox/Additions/WINNT/VBoxGINA/Helper.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/VBoxGINA/Helper.cpp

@@ -98 +98 @@
         return false;
     }
-    /* convert from UTF-8 to UCS2 and store in global variables */
-    PRTUCS2 ptr = NULL;
-    if (VBOX_SUCCESS(RTStrUtf8ToUcs2(&ptr, vmmreqCredentials.szUserName)) && ptr)
+    /* convert from UTF-8 to UTF-16 and store in global variables */
+    PRTUTF16 ptr = NULL;
+    if (RT_SUCCESS(RTStrToUtf16(vmmreqCredentials.szUserName, &ptr)) && ptr)
     {
         wcscpy(g_Username, ptr);
-        RTStrUcs2Free(ptr);
+        RTUtf16Free(ptr);
     }
     ptr = NULL;
-    if (VBOX_SUCCESS(RTStrUtf8ToUcs2(&ptr, vmmreqCredentials.szPassword)) && ptr)
+    if (RT_SUCCESS(RTStrToUtf16(vmmreqCredentials.szPassword, &ptr)) && ptr)
     {
         wcscpy(g_Password, ptr);
-        RTStrUcs2Free(ptr);
+        RTUtf16Free(ptr);
     }
     ptr = NULL;
-    if (VBOX_SUCCESS(RTStrUtf8ToUcs2(&ptr, vmmreqCredentials.szDomain)) && ptr)
+    if (RT_SUCCESS(RTStrToUtf16(vmmreqCredentials.szDomain, &ptr)) && ptr)
     {
         wcscpy(g_Domain, ptr);
-        RTStrUcs2Free(ptr);
+        RTUtf16Free(ptr);
     }
     Log(("VBoxGINA::credentialsRetrieve: returning user '%s', password '%s', domain '%s'\n",
@@ -189 +189 @@
     /* post termination event semaphore */
     int rc = RTThreadUserSignal(gThreadPoller);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         Log(("VBoxGINA::credentialsPollerTerminate: waiting for thread to terminate\n"));