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

Timestamp:

Feb 24, 2014 9:07:22 PM (11 years ago)

Author:

vboxsync

Message:

DnD: Update, bugfixes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIDnDDataObject_win.cpp (modified) (11 diffs)
• UIDnDDataObject_win.h (modified) (2 diffs)
• UIDnDDrag.cpp (modified) (6 diffs)

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

@@ -231 +231 @@
     if (mStatus == Dropped)
     {
-#ifdef VBOX_DND_DEBUG_FORMATS
         LogFlowFunc(("cfFormat=%RI16, sFormat=%s, tyMed=%RU32, dwAspect=%RU32\n",
                      pThisFormat->cfFormat, UIDnDDataObject::ClipboardFormatToString(pFormatEtc->cfFormat),
@@ -237 +236 @@
         LogFlowFunc(("Got strFormat=%s, pvData=%p, cbData=%RU32\n",
                      mstrFormat.toAscii().constData(), mpvData, mcbData));
-#endif
+
         QVariant::Type vaType;
         QString strMIMEType;
@@ -256 +255 @@
             vaType = QVariant::StringList;
         }
-#if 0
+#if 0 /* More formats; not needed right now. */
         else if (   (pFormatEtc->tymed & TYMED_ISTREAM)
                 && (pFormatEtc->dwAspect == DVASPECT_CONTENT)
@@ -285 +284 @@
                      strMIMEType.toAscii().constData(), vaType));
 
-        QVariant va;
-        int rc = mpParent->RetrieveData(strMIMEType, vaType, va);
+        int rc;
+        if (!mVaData.isValid())
+            rc = mpParent->RetrieveData(strMIMEType, vaType, mVaData);
+        else
+            rc = VINF_SUCCESS; /* Data already retrieved. */
+
         if (RT_SUCCESS(rc))
         {
             if (   strMIMEType.startsWith("text/uri-list")
                        /* One item. */
-                && (   va.canConvert(QVariant::String)
+                && (   mVaData.canConvert(QVariant::String)
                        /* Multiple items. */
-                    || va.canConvert(QVariant::StringList))
+                    || mVaData.canConvert(QVariant::StringList))
                )
             {
-                QStringList lstFilesURI = va.toStringList();
+                QStringList lstFilesURI = mVaData.toStringList();
                 QStringList lstFiles;
                 for (size_t i = 0; i < lstFilesURI.size(); i++)
@@ -326 +329 @@
 
                 size_t cbBuf = sizeof(DROPFILES) + ((cchFiles + 1) * sizeof(RTUTF16));
-                DROPFILES *pBuf = (DROPFILES *)RTMemAllocZ(cbBuf);
-                if (pBuf)
+                DROPFILES *pDropFiles = (DROPFILES *)RTMemAllocZ(cbBuf);
+                if (pDropFiles)
                 {
-                    pBuf->pFiles = sizeof(DROPFILES);
-                    pBuf->fWide = 1; /* We use unicode. Always. */
-
-                    uint8_t *pCurFile = (uint8_t *)pBuf + pBuf->pFiles;
+                    pDropFiles->pFiles = sizeof(DROPFILES);
+                    pDropFiles->fWide = 1; /* We use unicode. Always. */
+
+                    uint8_t *pCurFile = (uint8_t *)pDropFiles + pDropFiles->pFiles;
                     AssertPtr(pCurFile);
 
@@ -368 +371 @@
                         if (pMedium->hGlobal)
                         {
-                            LPVOID pMem = GlobalLock(pMedium->hGlobal);
-                            if (pMem)
+                            LPVOID pvMem = GlobalLock(pMedium->hGlobal);
+                            if (pvMem)
                             {
-                                memcpy(pMem, pBuf, cbBuf);
+                                memcpy(pvMem, pDropFiles, cbBuf);
                                 GlobalUnlock(pMedium->hGlobal);
 
@@ -383 +386 @@
                     }
 
-                    RTMemFree(pBuf);
+                    RTMemFree(pDropFiles);
                 }
             }
             else if (   strMIMEType.startsWith("text/plain")
-                     && va.canConvert(QVariant::String))
+                     && mVaData.canConvert(QVariant::String))
             {
                 bool fUnicode = pFormatEtc->cfFormat == CF_UNICODETEXT;
-                int cbch = fUnicode
+                int cbCh = fUnicode
                          ? sizeof(WCHAR) : sizeof(char);
 
-                QString strText = va.toString();
-                size_t cbSrc = (strText.length() + 1) * cbch;
+                QString strText = mVaData.toString();
+                size_t cbSrc = strText.length() * cbCh;
                 Assert(cbSrc);
                 LPCVOID pvSrc = fUnicode
@@ -400 +403 @@
                               : (void *)strText.toAscii().constData();
                 AssertPtr(pvSrc);
-#ifdef DEBUG_andy
+
                 LogFlowFunc(("pvSrc=0x%p, cbSrc=%zu, cbch=%d, fUnicode=%RTbool\n",
-                             pvSrc, cbSrc, cbch, fUnicode));
-#endif
+                             pvSrc, cbSrc, cbCh, fUnicode));
+
                 pMedium->tymed = TYMED_HGLOBAL;
                 pMedium->pUnkForRelease = NULL;
                 pMedium->hGlobal = GlobalAlloc(  GMEM_ZEROINIT
                                                | GMEM_MOVEABLE
-                                               | GMEM_DDESHARE, cbSrc);
+                                               | GMEM_DDESHARE,
+                                               cbSrc);
                 if (pMedium->hGlobal)
                 {
@@ -423 +427 @@
                 }
                 else
-                    hr  = E_OUTOFMEMORY;
+                    hr  = VERR_NO_MEMORY;
             }
             else
@@ -445 +449 @@
         case TYMED_HGLOBAL:
             pMedium->hGlobal = (HGLOBAL)OleDuplicateData(pThisMedium->hGlobal,
-                                                         pThisFormat->cfFormat, NULL);
+                                                         pThisFormat->cfFormat,
+                                                         0 /* Flags */);
             break;
 
@@ -452 +457 @@
         }
 
-        pMedium->tymed          = pThisFormat->tymed;
+        pMedium->tymed          = pFormatEtc->tymed;
         pMedium->pUnkForRelease = NULL;
     }
 
-    LogFlowFunc(("hr=%Rhrc\n", hr));
+    LogFlowFunc(("Returning hr=%Rhrc\n", hr));
     return hr;
 }

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

@@ -25 +25 @@
 #include <QString>
 #include <QStringList>
+#include <QVariant>
 
 /* Forward declarations: */
@@ -92 +93 @@
     QStringList mlstFormats;
     QString     mstrFormat;
+    /** The retrieved data as a QVariant. Needed
+     *  for buffering in case a second format needs
+     *  the same data, e.g. CF_TEXT and CF_UNICODETEXT. */
+    QVariant    mVaData;
+    /** The retrieved data as a raw buffer. */
     void       *mpvData;
+    /** Raw buffer size (in bytes). */
     uint32_t    mcbData;
 };

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

@@ -89 +89 @@
         HRESULT hr = ::DoDragDrop(pDataObject, pDropSource,
                                   dwOKEffects, &dwEffect);
-        LogFlowThisFunc(("hr=%Rhrc, dwEffect=%RI32\n", hr, dwEffect));
+        LogFlowThisFunc(("DoDragDrop ended with hr=%Rhrc, dwEffect=%RI32\n",
+                         hr, dwEffect));
 
         if (pDropSource)
@@ -150 +151 @@
     {
         msgCenter().showModalProgressDialog(progress,
-                                            tr("Retrieving metadata ..."), ":/progress_dnd_gh_90px.png",
+                                            tr("Retrieving data ..."), ":/progress_dnd_gh_90px.png",
                                             m_pParent);
         if (!progress.GetCanceled())
@@ -161 +162 @@
             {
                 /* After the data successfully arrived from the guest, we query it from Main. */
-                QVector<uint8_t> data = guest.DragGHGetData();
-                if (!data.isEmpty())
+                QVector<uint8_t> vecData = guest.DragGHGetData();
+                if (!vecData.isEmpty())
                 {
                     switch (vaType)
@@ -168 +169 @@
                         case QVariant::String:
                         {
-                            vaData = QVariant(QString(reinterpret_cast<const char*>(data.data())));
+                            vaData = QVariant(QString(reinterpret_cast<const char*>(vecData.constData())));
                             break;
                         }
@@ -174 +175 @@
                         case QVariant::ByteArray:
                         {
-                            QByteArray ba(reinterpret_cast<const char*>(data.constData()), data.size());
+                            QByteArray ba(reinterpret_cast<const char*>(vecData.constData()), vecData.size());
                             vaData = QVariant(ba);
                             break;
@@ -181 +182 @@
                         case QVariant::StringList:
                         {
-                            QString strData = QString(reinterpret_cast<const char*>(data.data()));
+                            QString strData = QString(reinterpret_cast<const char*>(vecData.constData()));
                             QStringList lstString = strData.split("\r\n", QString::SkipEmptyParts);