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

Timestamp:

Feb 26, 2014 8:44:58 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

92464

Message:

DnD: Bugfixes for Linux hosts.

Location:

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

Files:

• UIDnDDrag.cpp (modified) (3 diffs)
• UIDnDDrag.h (modified) (1 diff)
• UIDnDHandler.cpp (modified) (1 diff)
• UIDnDMIMEData.cpp (modified) (3 diffs)
• UIDnDMIMEData.h (modified) (3 diffs)

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

@@ -56 +56 @@
 #endif
 {
-    LogFlowFunc(("m_defAction=0x%x, m_actions=0x%x\n", m_defAction, m_actions));
+    LogFlowFunc(("m_defAction=0x%x\n", m_defAction));
     LogFlowFunc(("Number of formats: %d\n", m_lstFormats.size()));
 #ifdef DEBUG
@@ -69 +69 @@
 
     int rc = VINF_SUCCESS;
-    try
+#ifdef RT_OS_WINDOWS
+    UIDnDDropSource *pDropSource = new UIDnDDropSource(this /* pParent */);
+    UIDnDDataObject *pDataObject = new UIDnDDataObject(m_lstFormats, this /* pParent */);
+
+    DWORD dwOKEffects = DROPEFFECT_NONE;
+    if (m_actions)
     {
-#ifdef RT_OS_WINDOWS
-        UIDnDDropSource *pDropSource = new UIDnDDropSource(this /* pParent */);
-        UIDnDDataObject *pDataObject = new UIDnDDataObject(m_lstFormats, this /* pParent */);
+        if (m_actions & Qt::CopyAction)
+            dwOKEffects |= DROPEFFECT_COPY;
+        if (m_actions & Qt::MoveAction)
+            dwOKEffects |= DROPEFFECT_MOVE;
+        if (m_actions & Qt::LinkAction)
+            dwOKEffects |= DROPEFFECT_LINK;
+    }
 
-        DWORD dwOKEffects = DROPEFFECT_NONE;
-        if (m_actions)
-        {
-            if (m_actions & Qt::CopyAction)
-                dwOKEffects |= DROPEFFECT_COPY;
-            if (m_actions & Qt::MoveAction)
-                dwOKEffects |= DROPEFFECT_MOVE;
-            if (m_actions & Qt::LinkAction)
-                dwOKEffects |= DROPEFFECT_LINK;
-        }
+    DWORD dwEffect;
+    HRESULT hr = ::DoDragDrop(pDataObject, pDropSource,
+                              dwOKEffects, &dwEffect);
+    LogFlowThisFunc(("DoDragDrop ended with hr=%Rhrc, dwEffect=%RI32\n",
+                     hr, dwEffect));
 
-        DWORD dwEffect;
-        HRESULT hr = ::DoDragDrop(pDataObject, pDropSource,
-                                  dwOKEffects, &dwEffect);
-        LogFlowThisFunc(("DoDragDrop ended with hr=%Rhrc, dwEffect=%RI32\n",
-                         hr, dwEffect));
+    if (pDropSource)
+        pDropSource->Release();
+    if (pDataObject)
+        pDataObject->Release();
+#else
+    QDrag *pDrag = new QDrag(m_pParent);
 
-        if (pDropSource)
-            pDropSource->Release();
-        if (pDataObject)
-            pDataObject->Release();
-#else
-        QDrag *pDrag = new QDrag(m_pParent);
+    /* pMData is transfered to the QDrag object, so no need for deletion. */
+    pMData = new UIDnDMimeData(m_session, m_lstFormats,
+                               m_defAction, m_actions, m_pParent);
 
-        /* pMData is transfered to the QDrag object, so no need for deletion. */
-        pMData = new UIDnDMimeData(m_session, m_lstFormats,
-                                   m_defAction, m_actions, m_pParent);
+    /* Inform the MIME data object of any changes in the current action. */
+    connect(pDrag, SIGNAL(actionChanged(Qt::DropAction)),
+            pMData, SLOT(sltDropActionChanged(Qt::DropAction)));
 
-        /* Inform this object that MIME data from the guest is available so that
-         * it can update the MIME data object accordingly. */
-        connect(pMData, SIGNAL(sigDataAvailable(QString)),
-                this, SLOT(sltDataAvailable(QString)), Qt::DirectConnection);
+    /* Fire it up.
+     *
+     * On Windows this will start a modal operation using OLE's
+     * DoDragDrop() method, so this call will block until the DnD operation
+     * is finished. */
+    pDrag->setMimeData(pMData);
+    Qt::DropAction dropAction = pDrag->exec(m_actions, m_defAction);
+    LogFlowFunc(("dropAction=%ld\n", UIDnDHandler::toVBoxDnDAction(dropAction)));
 
-        /* Inform the MIME data object of any changes in the current action. */
-        connect(pDrag, SIGNAL(actionChanged(Qt::DropAction)),
-                pMData, SLOT(sltDropActionChanged(Qt::DropAction)));
-
-        /* Fire it up.
-         *
-         * On Windows this will start a modal operation using OLE's
-         * DoDragDrop() method, so this call will block until the DnD operation
-         * is finished. */
-        pDrag->setMimeData(pMData);
-        Qt::DropAction dropAction = pDrag->exec(m_actions, m_defAction);
-        LogFlowFunc(("dropAction=%ld\n", UIDnDHandler::toVBoxDnDAction(dropAction)));
-
-         /* Note: The UIDnDMimeData object will not be not accessible here anymore,
-         *        since QDrag had its ownership and deleted it after the (blocking)
-         *        QDrag::exec() call. */
+     /* Note: The UIDnDMimeData object will not be not accessible here anymore,
+     *        since QDrag had its ownership and deleted it after the (blocking)
+     *        QDrag::exec() call. */
 #endif /* !RT_OS_WINDOWS */
-    }
-    catch (std::bad_alloc)
-    {
-        rc = VERR_NO_MEMORY;
-    }
 
     LogFlowFuncLeaveRC(rc);
@@ -135 +123 @@
 }
 
-int UIDnDDrag::RetrieveData(const QString &strMimeType,
-                            QVariant::Type vaType, QVariant &vaData)
-{
-    LogFlowFunc(("Retrieving data as type=%s (variant type=%ld)\n",
-                 strMimeType.toAscii().constData(), vaType));
-
-    int rc = VINF_SUCCESS;
-    CGuest guest = m_session.GetConsole().GetGuest();
-
-    /* Start getting the data from the guest. First inform the guest we
-     * want the data in the specified MIME type. */
-    CProgress progress = guest.DragGHDropped(strMimeType,
-                                             UIDnDHandler::toVBoxDnDAction(m_defAction));
-    if (guest.isOk())
-    {
-        msgCenter().showModalProgressDialog(progress,
-                                            tr("Retrieving data ..."), ":/progress_dnd_gh_90px.png",
-                                            m_pParent);
-        if (!progress.GetCanceled())
-        {
-            rc =   (   progress.isOk()
-                    && progress.GetResultCode() == 0)
-                 ? VINF_SUCCESS : VERR_GENERAL_FAILURE; /** @todo Fudge; do a GetResultCode() to rc translation. */
-
-            if (RT_SUCCESS(rc))
-            {
-                /* After the data successfully arrived from the guest, we query it from Main. */
-                QVector<uint8_t> vecData = guest.DragGHGetData();
-                if (!vecData.isEmpty())
-                {
-                    switch (vaType)
-                    {
-                        case QVariant::String:
-                        {
-                            vaData = QVariant(QString(reinterpret_cast<const char*>(vecData.constData())));
-                            break;
-                        }
-
-                        case QVariant::ByteArray:
-                        {
-                            QByteArray ba(reinterpret_cast<const char*>(vecData.constData()), vecData.size());
-                            vaData = QVariant(ba);
-                            break;
-                        }
-
-                        case QVariant::StringList:
-                        {
-                            QString strData = QString(reinterpret_cast<const char*>(vecData.constData()));
-                            QStringList lstString = strData.split("\r\n", QString::SkipEmptyParts);
-
-                            vaData = QVariant(lstString);
-                            break;
-                        }
-
-                        default:
-                            rc = VERR_NOT_SUPPORTED;
-                            break;
-                    }
-                }
-                else
-                    rc = VERR_NO_DATA;
-            }
-            else
-                msgCenter().cannotDropData(progress, m_pParent);
-        }
-        else
-            rc = VERR_CANCELLED;
-    }
-    else
-    {
-        msgCenter().cannotDropData(guest, m_pParent);
-        rc = VERR_GENERAL_FAILURE; /** @todo Fudge; do a GetResultCode() to rc translation. */
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
-#ifndef RT_OS_WINDOWS
-void UIDnDDrag::sltDataAvailable(const QString &mimeType)
-{
-    LogFlowFunc(("pMData=0x%p, mimeType=%s\n",
-                 pMData, mimeType.toAscii().constData()));
-
-    if (pMData)
-        pMData->setData(mimeType);
-}
-#endif
-
 #include "UIDnDDrag.moc"
 

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

@@ -56 +56 @@
                      QVariant::Type vaType, QVariant &vaData);
 
-public slots:
-
-#ifndef RT_OS_WINDOWS
-    void sltDataAvailable(const QString &mimetype);
-#endif
-
 private:
 

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

@@ -234 +234 @@
     if (!lstFmtNative.isEmpty())
     {
-        try
-        {
-            UIDnDDrag *pDrag = new UIDnDDrag(session, lstFmtNative,
-                                             toQtDnDAction(defaultAction),
-                                             toQtDnDActions(vecActions), pParent);
-            rc = pDrag->DoDragDrop();
-
-            delete pDrag;
-        }
-        catch (std::bad_alloc)
-        {
-            rc = VERR_NO_MEMORY;
-        }
+        UIDnDDrag *pDrag = new UIDnDDrag(session, lstFmtNative,
+                                         toQtDnDAction(defaultAction),
+                                         toQtDnDActions(vecActions), pParent);
+        rc = pDrag->DoDragDrop();
+
+        delete pDrag;
     }
     else

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

@@ -40 +40 @@
 UIDnDMimeData::UIDnDMimeData(CSession &session, QStringList formats,
                              Qt::DropAction defAction, Qt::DropActions actions,
-                             UIDnDDrag *pParent)
+                             QWidget *pParent)
     : m_pParent(pParent)
     , m_session(session)
@@ -164 +164 @@
     {
         AssertPtr(m_pParent);
-        rc = m_pParent->RetrieveData(strMIMEType, type, m_data);
+        rc = retrieveDataInternal(strMIMEType, type, m_data);
         if (RT_SUCCESS(rc))
         {
@@ -178 +178 @@
     LogFlowFunc(("Returning rc=%Rrc, m_enmState=%ld\n",
                  rc, m_enmState));
-    return QMimeData::retrieveData(strMIMEType, type);
+    return m_data;
+}
+
+int UIDnDMimeData::retrieveDataInternal(const QString &strMimeType,
+                                        QVariant::Type vaType, QVariant &vaData) const
+{
+    LogFlowFunc(("Retrieving data as type=%s (variant type=%ld)\n",
+                 strMimeType.toAscii().constData(), vaType));
+
+    int rc = VINF_SUCCESS;
+    CGuest guest = m_session.GetConsole().GetGuest();
+
+    /* Start getting the data from the guest. First inform the guest we
+     * want the data in the specified MIME type. */
+    CProgress progress = guest.DragGHDropped(strMimeType,
+                                             UIDnDHandler::toVBoxDnDAction(m_defAction));
+    if (guest.isOk())
+    {
+        msgCenter().showModalProgressDialog(progress,
+                                            tr("Retrieving data ..."), ":/progress_dnd_gh_90px.png",
+                                            m_pParent);
+        if (!progress.GetCanceled())
+        {
+            rc =   (   progress.isOk()
+                    && progress.GetResultCode() == 0)
+                 ? VINF_SUCCESS : VERR_GENERAL_FAILURE; /** @todo Fudge; do a GetResultCode() to rc translation. */
+
+            if (RT_SUCCESS(rc))
+            {
+                /* After the data successfully arrived from the guest, we query it from Main. */
+                QVector<uint8_t> vecData = guest.DragGHGetData();
+                if (!vecData.isEmpty())
+                {
+                    switch (vaType)
+                    {
+                        case QVariant::String:
+                        {
+                            vaData = QVariant(QString(reinterpret_cast<const char*>(vecData.constData())));
+                            break;
+                        }
+
+                        case QVariant::ByteArray:
+                        {
+                            QByteArray ba(reinterpret_cast<const char*>(vecData.constData()), vecData.size());
+                            vaData = QVariant(ba);
+                            break;
+                        }
+
+                        case QVariant::StringList:
+                        {
+                            QString strData = QString(reinterpret_cast<const char*>(vecData.constData()));
+                            QStringList lstString = strData.split("\r\n", QString::SkipEmptyParts);
+
+                            vaData = QVariant(lstString);
+                            break;
+                        }
+
+                        default:
+                            rc = VERR_NOT_SUPPORTED;
+                            break;
+                    }
+                }
+                else
+                    rc = VERR_NO_DATA;
+            }
+            else
+                msgCenter().cannotDropData(progress, m_pParent);
+        }
+        else
+            rc = VERR_CANCELLED;
+    }
+    else
+    {
+        msgCenter().cannotDropData(guest, m_pParent);
+        rc = VERR_GENERAL_FAILURE; /** @todo Fudge; do a GetResultCode() to rc translation. */
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 

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

@@ -51 +51 @@
          *  having retrieved the metadata from the guest yet. */
         Dragging = 0,
-        /** Guest sent over the (MIME) metadata so that the
-         *  host knows which DnD targets can be used. */
-        MetaDataRetrieved,
         /** There has been a "dropped" action which indicates
          *  that the guest can continue sending more data (if any)
@@ -66 +63 @@
     UIDnDMimeData(CSession &session, QStringList formats,
                   Qt::DropAction defAction,
-                  Qt::DropActions actions, UIDnDDrag *pParent);
+                  Qt::DropActions actions, QWidget *pParent);
 
     int setData(const QString &mimeType);
@@ -98 +95 @@
 #endif
 
+protected:
+
+    int retrieveDataInternal(const QString &strMimeType, QVariant::Type vaType, QVariant &vaData) const;
+
 private:
 
-    UIDnDDrag        *m_pParent;
+    QWidget          *m_pParent;
     CSession          m_session;
     QStringList       m_lstFormats;