Changeset 93640 in vbox for trunk/src/VBox

Timestamp:

Feb 7, 2022 2:02:44 PM (3 years ago)

Author:

vboxsync

Message:

Runtime: bugref:9955: Added conversion from console codepage to UTF-8 in Windows needed for proper handling the password containing national characters from console.

Location:

trunk/src/VBox/Runtime/r3

Files:

• posix/utf8-posix.cpp (modified) (1 diff)
• win/utf8-win.cpp (modified) (4 diffs)

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

@@ -693 +693 @@
 }
 
+
+RTR3DECL(int)  RTStrConsoleCPToUtf8Tag(char **ppszString, const char *pszString, const char *pszTag)
+{
+    return RTStrCurrentCPToUtf8Tag(ppszString, pszString, pszTag);
+}

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

@@ -117 +117 @@
 }
 
-
-RTR3DECL(int)  RTStrCurrentCPToUtf8Tag(char **ppszString, const char *pszString, const char *pszTag)
+static int rtStrCPToUtf8Tag(char **ppszString, const char *pszString, uint32_t uCodePage, const char *pszTag)
 {
     Assert(ppszString);
@@ -143 +142 @@
      */
     int rc;
-    int cwc = MultiByteToWideChar(CP_ACP, 0, pszString, -1, NULL, 0);
+    int cwc = MultiByteToWideChar((UINT)uCodePage, 0, pszString, -1, NULL, 0);
     if (cwc > 0)
     {
@@ -155 +154 @@
              * Do the translation.
              */
-            if (MultiByteToWideChar(CP_ACP, 0, pszString, -1, pwszString, cwc) > 0)
+            if (MultiByteToWideChar((UINT)uCodePage, 0, pszString, -1, pwszString, cwc) > 0)
             {
                 /*
@@ -183 +182 @@
 }
 
+
+RTR3DECL(int)  RTStrCurrentCPToUtf8Tag(char **ppszString, const char *pszString, const char *pszTag)
+{
+    return rtStrCPToUtf8Tag(ppszString, pszString, CP_ACP, pszTag);
+}
+
+
+RTR3DECL(int)  RTStrConsoleCPToUtf8Tag(char **ppszString, const char *pszString, const char *pszTag)
+{
+    return rtStrCPToUtf8Tag(ppszString, pszString, GetConsoleCP(), pszTag);
+}