Changeset 57221 in vbox for trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

Timestamp:

Aug 6, 2015 7:19:19 PM (9 years ago)

Author:

vboxsync

Message:

DnD: Added support for "drag promises" on OS X for guest to host transfers, cleaned up MIME type conversion/handling, bugfixes.

File:

• trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp (modified) (14 diffs)

trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

@@ -177 +177 @@
 }
 
-HRESULT GuestDnDTarget::getFormats(std::vector<com::Utf8Str> &aFormats)
+HRESULT GuestDnDTarget::getFormats(GuestDnDMIMEList &aFormats)
 {
 #if !defined(VBOX_WITH_DRAG_AND_DROP)
@@ -192 +192 @@
 }
 
-HRESULT GuestDnDTarget::addFormats(const std::vector<com::Utf8Str> &aFormats)
+HRESULT GuestDnDTarget::addFormats(const GuestDnDMIMEList &aFormats)
 {
 #if !defined(VBOX_WITH_DRAG_AND_DROP)
@@ -207 +207 @@
 }
 
-HRESULT GuestDnDTarget::removeFormats(const std::vector<com::Utf8Str> &aFormats)
+HRESULT GuestDnDTarget::removeFormats(const GuestDnDMIMEList &aFormats)
 {
 #if !defined(VBOX_WITH_DRAG_AND_DROP)
@@ -243 +243 @@
                               DnDAction_T                      aDefaultAction,
                               const std::vector<DnDAction_T>  &aAllowedActions,
-                              const std::vector<com::Utf8Str> &aFormats,
+                              const GuestDnDMIMEList           &aFormats,
                               DnDAction_T                     *aResultAction)
 {
@@ -276 +276 @@
         return S_OK;
 
-    /* Make a flat data string out of the supported format list. */
-    Utf8Str strFormats = GuestDnD::toFormatString(m_vecFmtSup, aFormats);
-
-    /* If there is no valid supported format, ignore this request. */
+    /*
+     * Make a flat data string out of the supported format list.
+     * In the GuestDnDTarget case the source formats are from the host,
+     * as GuestDnDTarget acts as a source for the guest.
+     */
+    Utf8Str strFormats = GuestDnD::toFormatString(GuestDnD::toFilteredFormatList(m_lstFmtSupported, aFormats));
     if (strFormats.isEmpty())
-        return setError(E_INVALIDARG, tr("Specified format(s) not supported"));
+        return setError(E_INVALIDARG, tr("No or not supported format(s) specified"));
 
     LogRel2(("DnD: Offered formats to guest:\n"));
@@ -290 +292 @@
     /* Save the formats offered to the guest. This is needed to later
      * decide what to do with the data when sending stuff to the guest. */
-    m_vecFmtOff = aFormats;
-    Assert(m_vecFmtOff.size());
+    m_lstFmtOffered = aFormats;
+    Assert(m_lstFmtOffered.size());
 
     HRESULT hr = S_OK;
@@ -335 +337 @@
                              DnDAction_T                      aDefaultAction,
                              const std::vector<DnDAction_T>  &aAllowedActions,
-                             const std::vector<com::Utf8Str> &aFormats,
+                             const GuestDnDMIMEList          &aFormats,
                              DnDAction_T                     *aResultAction)
 {
@@ -359 +361 @@
         return S_OK;
 
-    /* Make a flat data string out of the supported format list. */
-    RTCString strFormats = GuestDnD::toFormatString(m_vecFmtSup, aFormats);
-    /* If there is no valid supported format, ignore this request. */
+    /*
+     * Make a flat data string out of the supported format list.
+     * In the GuestDnDTarget case the source formats are from the host,
+     * as GuestDnDTarget acts as a source for the guest.
+     */
+    Utf8Str strFormats = GuestDnD::toFormatString(GuestDnD::toFilteredFormatList(m_lstFmtSupported, aFormats));
     if (strFormats.isEmpty())
-        return setError(E_INVALIDARG, tr("Specified format(s) not supported"));
+        return setError(E_INVALIDARG, tr("No or not supported format(s) specified"));
 
     HRESULT hr = S_OK;
@@ -433 +438 @@
                              DnDAction_T                      aDefaultAction,
                              const std::vector<DnDAction_T>  &aAllowedActions,
-                             const std::vector<com::Utf8Str> &aFormats,
+                             const GuestDnDMIMEList          &aFormats,
                              com::Utf8Str                    &aFormat,
                              DnDAction_T                     *aResultAction)
@@ -441 +446 @@
 #else /* VBOX_WITH_DRAG_AND_DROP */
 
-    /* Input validation. */
-
-    /* Everything else is optional. */
+    if (aDefaultAction == DnDAction_Ignore)
+        return setError(E_INVALIDARG, tr("Invalid default action specified"));
+    if (!aAllowedActions.size())
+        return setError(E_INVALIDARG, tr("Invalid allowed actions specified"));
+    if (!aFormats.size())
+        return setError(E_INVALIDARG, tr("No drop format(s) specified"));
+    /* aResultAction is optional. */
 
     AutoCaller autoCaller(this);
@@ -449 +458 @@
 
     /* Default action is ignoring. */
-    DnDAction_T resAction = DnDAction_Ignore;
-
-    /* Check & convert the drag & drop actions. */
-    uint32_t uDefAction      = 0;
+    DnDAction_T resAction    = DnDAction_Ignore;
+
+    /* Check & convert the drag & drop actions to HGCM codes. */
+    uint32_t uDefAction      = DND_IGNORE_ACTION;
     uint32_t uAllowedActions = 0;
-    GuestDnD::toHGCMActions(aDefaultAction, &uDefAction,
+    GuestDnD::toHGCMActions(aDefaultAction,  &uDefAction,
                             aAllowedActions, &uAllowedActions);
     /* If there is no usable action, ignore this request. */
@@ -465 +474 @@
     }
 
-    /* Make a flat data string out of the supported format list. */
-    Utf8Str strFormats = GuestDnD::toFormatString(m_vecFmtSup, aFormats);
-    /* If there is no valid supported format, ignore this request. */
+    /*
+     * Make a flat data string out of the supported format list.
+     * In the GuestDnDTarget case the source formats are from the host,
+     * as GuestDnDTarget acts as a source for the guest.
+     */
+    Utf8Str strFormats = GuestDnD::toFormatString(GuestDnD::toFilteredFormatList(m_lstFmtSupported, aFormats));
     if (strFormats.isEmpty())
-        return setError(E_INVALIDARG, tr("Specified format(s) not supported"));
-
-    HRESULT hr = S_OK;
+        return setError(E_INVALIDARG, tr("No or not supported format(s) specified"));
 
     /* Adjust the coordinates in a multi-monitor setup. */
-    int rc = GuestDnDInst()->adjustScreenCoordinates(aScreenId, &aX, &aY);
-    if (RT_SUCCESS(rc))
+    HRESULT hr = GuestDnDInst()->adjustScreenCoordinates(aScreenId, &aX, &aY);
+    if (SUCCEEDED(hr))
     {
         GuestDnDMsg Msg;
@@ -487 +497 @@
         Msg.setNextUInt32(strFormats.length() + 1);
 
-        rc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
+        int rc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
         if (RT_SUCCESS(rc))
         {
             GuestDnDResponse *pResp = GuestDnDInst()->response();
-            if (pResp && RT_SUCCESS(pResp->waitForGuestResponse()))
+            AssertPtr(pResp);
+
+            rc = pResp->waitForGuestResponse();
+            if (RT_SUCCESS(rc))
             {
                 resAction = GuestDnD::toMainAction(pResp->defAction());
-                aFormat = pResp->fmtReq();
-
-                LogFlowFunc(("resFormat=%s, resAction=%RU32\n",
-                             pResp->fmtReq().c_str(), pResp->defAction()));
+
+                GuestDnDMIMEList lstFormats = pResp->formats();
+                if (lstFormats.size() == 1) /* Exactly one format to use specified? */
+                {
+                    aFormat = lstFormats.at(0);
+                    LogFlowFunc(("resFormat=%s, resAction=%RU32\n", aFormat.c_str(), pResp->defAction()));
+                }
+                else
+                    hr = setError(VBOX_E_IPRT_ERROR, tr("Guest returned invalid drop formats (%zu formats)"), lstFormats.size());
             }
-        }
-    }
-
-    if (RT_FAILURE(rc))
-        hr = VBOX_E_IPRT_ERROR;
+            else
+                hr = setError(VBOX_E_IPRT_ERROR, tr("Waiting for response of dropped event failed (%Rrc)"), rc);
+        }
+        else
+            hr = setError(VBOX_E_IPRT_ERROR, tr("Sending dropped event to guest failed (%Rrc)"), rc);
+    }
+    else
+        hr = setError(hr, tr("Retrieving drop coordinates failed"));
 
     if (SUCCEEDED(hr))
@@ -737 +758 @@
      *
      ** @todo Support more than one format; add a format<->function handler concept. Later. */
-    bool fHasURIList = std::find(m_vecFmtOff.begin(),
-                                 m_vecFmtOff.end(), "text/uri-list") != m_vecFmtOff.end();
+    bool fHasURIList = std::find(m_lstFmtOffered.begin(),
+                                 m_lstFmtOffered.end(), "text/uri-list") != m_lstFmtOffered.end();
     if (fHasURIList)
     {