Changeset 93059 in vbox

Timestamp:

Dec 22, 2021 2:29:22 PM (3 years ago)

Author:

vboxsync

Message:

IPRT/utf8-win.cpp: Optimize string conversion from/to process codepage to UTF-8 if the codepage is UTF-8. This should be more likely after r149060, at least on more recent windows versions.

File:

• trunk/src/VBox/Runtime/r3/win/utf8-win.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/win/utf8-win.cpp

@@ -50 +50 @@
     Assert(ppszString);
     Assert(pszString);
+    *ppszString = NULL;
 
     /*
-     * Check for zero length input string.
+     * If the ANSI codepage (CP_ACP) is UTF-8, no translation is needed.
+     * Same goes for empty strings.
      */
-    if (cchString < 1 || !*pszString)
+    if (   cchString == 0
+        || *pszString == '\0')
+        return RTStrDupNExTag(ppszString, pszString, 0, pszTag);
+    if (GetACP() == CP_UTF8)
     {
-        *ppszString = (char *)RTMemTmpAllocZTag(sizeof(char), pszTag);
-        if (*ppszString)
-            return VINF_SUCCESS;
-        return VERR_NO_TMP_MEMORY;
+        int rc = RTStrValidateEncodingEx(pszString, cchString, 0);
+        AssertRCReturn(rc, rc);
+        return RTStrDupNExTag(ppszString, pszString, cchString, pszTag);
     }
-
-    *ppszString = NULL;
 
     /*
@@ -122 +124 @@
     *ppszString = NULL;
 
+    /*
+     * If the ANSI codepage (CP_ACP) is UTF-8, no translation is needed.
+     * Same goes for empty strings.
+     */
+    if (*pszString == '\0')
+        return RTStrDupExTag(ppszString, pszString, pszTag);
+    if (GetACP() == CP_UTF8)
+    {
+        int rc = RTStrValidateEncoding(pszString);
+        AssertRCReturn(rc, rc);
+        return RTStrDupExTag(ppszString, pszString, pszTag);
+    }
+
     /** @todo is there a quicker way? Currently: ACP -> UTF-16 -> UTF-8 */
-
-    size_t cch = strlen(pszString);
-    if (cch <= 0)
-    {
-        /* zero length string passed. */
-        *ppszString = (char *)RTMemTmpAllocZTag(sizeof(char), pszTag);
-        if (*ppszString)
-            return VINF_SUCCESS;
-        return VERR_NO_TMP_MEMORY;
-    }
 
     /*