Changeset 59835 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 26, 2016 10:24:40 AM (9 years ago)

Author:

vboxsync

Message:

DnD: FE/Qt/UIDnDDataObject_win.cpp: Be more specific for CF_TEXT/CF_UNICODETEXT.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDDataObject_win.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDDataObject_win.cpp

@@ -255 +255 @@
                    )
                 {
-                    strMIMEType = "text/plain"; /** @todo Indicate UTF8 encoding? */
-                    vaType = QVariant::String;
+                    /* Use UTF-8, always. */
+                    strMIMEType = "text/plain;charset=utf-8";
+                    vaType      = QVariant::String;
                 }
                 else if (   (pFormatEtc->tymed & TYMED_HGLOBAL)
@@ -435 +436 @@
                         }
                     }
-                    else if (   strMIMEType.startsWith("text/plain")
+                    else if (   strMIMEType.startsWith("text/plain;charset=utf-8") /* Use UTF-8, always. */
                              && m_vaData.canConvert(QVariant::String))
                     {
@@ -443 +444 @@
 
                         QString strText = m_vaData.toString();
-                        size_t cbSrc = strText.length() * cbCh;
-                        Assert(cbSrc);
-                        LPCVOID pvSrc = fUnicode
-                                      ? (void *)strText.unicode()
-                                      : (void *)strText.toUtf8().constData();
+                        size_t cbSrc    = strText.length() * cbCh;
+                        LPCVOID pvSrc   = fUnicode
+                                        ? (void *)strText.unicode()
+                                        : (void *)strText.toUtf8().constData();
+
+                        AssertMsg(cbSrc, ("pvSrc=0x%p, cbSrc=%zu, cbCh=%zu\n", pvSrc, cbSrc, cbCh));
                         AssertPtr(pvSrc);