Changeset 3125 in vbox for trunk/src

Timestamp:

Jun 15, 2007 4:52:14 PM (18 years ago)

Author:

vboxsync

Message:

Fixed RTUtf16ToUtf8Ex so that it doesn't ignore the second parameter

File:

• trunk/src/VBox/Runtime/utf-16.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/utf-16.cpp

@@ -461 +461 @@
      */
     size_t cchResult;
-    int rc = rtUtf16CalcUtf8Length(pwszString, RTSTR_MAX, &cchResult);
+    int rc = rtUtf16CalcUtf8Length(pwszString, cwcString, &cchResult);
     if (RT_SUCCESS(rc))
     {
@@ -477 +477 @@
             if (cch <= cchResult)
                 return VERR_BUFFER_OVERFLOW;
-            cchResult = cch;
+            // cchResult = cch;
             pszResult = *ppsz;
         }
@@ -484 +484 @@
             *ppsz = NULL;
             fShouldFree = true;
-            cchResult = RT_MAX(cch, cchResult + 1);
-            pszResult = (char *)RTMemAlloc(cchResult);
+            // cchResult = RT_MAX(cch, cchResult + 1);
+            cch = RT_MAX(cch, cchResult + 1);
+            pszResult = (char *)RTMemAlloc(cch);
         }
         if (pszResult)
         {
-            rc = rtUtf16RecodeAsUtf8(pwszString, RTSTR_MAX, pszResult, cchResult, &cchResult);
+            rc = rtUtf16RecodeAsUtf8(pwszString, cwcString, pszResult, cch, &cchResult);
             if (RT_SUCCESS(rc))
             {