Changeset 80764 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

Sep 13, 2019 6:52:50 AM (5 years ago)

Author:

vboxsync

Message:

IPRT: Optimized RTEnvPutEx. bugref:9341

Location:

trunk/src/VBox/Runtime/r3/win

Files:

• env-win.cpp (modified) (3 diffs)
• utf8-win.cpp (modified) (3 diffs)

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

@@ -173 +173 @@
 }
 
-RTDECL(int) RTEnvSetUtf8(const char *pszVar, const char *pszValue)
-{
-    AssertReturn(strchr(pszVar, '=') == NULL, VERR_ENV_INVALID_VAR_NAME);
-
+
+/**
+ * Worker common to RTEnvSetUtf8() and rtEnvSetExWorker().
+ */
+int rtEnvSetUtf8Worker(const char *pchVar, size_t cchVar, const char *pszValue)
+{
     size_t cwcVar;
-    int rc = RTStrCalcUtf16LenEx(pszVar, RTSTR_MAX, &cwcVar);
+    int rc = RTStrCalcUtf16LenEx(pchVar, cchVar, &cwcVar);
     if (RT_SUCCESS(rc))
     {
         size_t cwcValue;
-        rc = RTStrCalcUtf16LenEx(pszVar, RTSTR_MAX, &cwcValue);
+        rc = RTStrCalcUtf16LenEx(pszValue, RTSTR_MAX, &cwcValue);
         if (RT_SUCCESS(rc))
         {
@@ -188 +190 @@
             if (pwszTmp)
             {
-                rc = RTStrToUtf16Ex(pszVar, RTSTR_MAX, &pwszTmp, cwcVar + 1, NULL);
+                rc = RTStrToUtf16Ex(pchVar, cchVar, &pwszTmp, cwcVar + 1, NULL);
                 if (RT_SUCCESS(rc))
                 {
@@ -212 +214 @@
 
 
+RTDECL(int) RTEnvSetUtf8(const char *pszVar, const char *pszValue)
+{
+    size_t cchVar = strlen(pszVar);
+    AssertReturn(memchr(pszVar, '=', cchVar) == NULL, VERR_ENV_INVALID_VAR_NAME);
+    return rtEnvSetUtf8Worker(pszVar, cchVar, pszValue);
+}
+
+
 RTDECL(int) RTEnvUnsetBad(const char *pszVar)
 {

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

@@ -39 +39 @@
 
 
+
 RTR3DECL(int)  RTStrUtf8ToCurrentCPTag(char **ppszString, const char *pszString, const char *pszTag)
+{
+    return RTStrUtf8ToCurrentCPExTag(ppszString, pszString, RTSTR_MAX, pszTag);
+}
+
+
+RTR3DECL(int)  RTStrUtf8ToCurrentCPExTag(char **ppszString, const char *pszString, size_t cchString, const char *pszTag)
 {
     Assert(ppszString);
@@ -47 +54 @@
      * Check for zero length input string.
      */
-    if (!*pszString)
+    if (cchString < 1 || !*pszString)
     {
         *ppszString = (char *)RTMemTmpAllocZTag(sizeof(char), pszTag);
@@ -61 +68 @@
      */
     PRTUTF16 pwszString = NULL;
-    int rc = RTStrToUtf16(pszString, &pwszString);
+    int rc = RTStrToUtf16Ex(pszString, cchString, &pwszString, 0, NULL);
     if (RT_FAILURE(rc))
         return rc;