Changeset 81321 in vbox

Timestamp:

Oct 17, 2019 2:46:33 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Convert ANSI to UTF-8 in SharedClipboardWinDropFilesToStringList(). Untested.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp (modified) (1 diff)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp

@@ -1128 +1128 @@
         {
             /* Allocate enough space (including terminator). */
-            pszFileUtf8 = (char *)RTMemAlloc((cchFile + 1) * sizeof(char));
-            if (pszFileUtf8)
+            char *pszFileANSI = (char *)RTMemAlloc((cchFile + 1) * sizeof(char));
+            UINT  cchFileANSI = 0;
+            if (pszFileANSI)
             {
-                cchFileUtf8 = DragQueryFileA(hDrop, i /* File index */,
-                                             pszFileUtf8, cchFile + 1 /* Include terminator */);
-
-                AssertMsg(cchFileUtf8 == cchFile, ("cchFileUtf8 (%RU16) does not match cchFile (%RU16)\n",
-                                                   cchFileUtf8, cchFile));
+                cchFileANSI = DragQueryFileA(hDrop, i /* File index */,
+                                             pszFileANSI, cchFile + 1 /* Include terminator */);
+
+                AssertMsg(cchFileANSI == cchFile, ("cchFileANSI (%RU16) does not match cchFile (%RU16)\n",
+                                                   cchFileANSI, cchFile));
+
+                /* Convert the ANSI codepage to UTF-8. */
+                rc = RTStrCurrentCPToUtf8(&pszFileUtf8, pszFileANSI);
+                if (RT_SUCCESS(rc))
+                {
+                    cchFileUtf8 = (UINT)strlen(pszFileUtf8);
+                }
             }
             else