Changeset 50561 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

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

Author:

vboxsync

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

92425

Message:

DnD: Update, bugfixes.

File:

• trunk/src/VBox/Main/src-client/GuestDnDImpl.cpp (modified) (27 diffs)

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

@@ -239 +239 @@
     DnDGuestResponse *response(void) const { return m_pDnDResponse; }
 
-    void adjustCoords(ULONG uScreenId, ULONG *puX, ULONG *puY) const;
-    void hostCall(uint32_t u32Function, uint32_t cParms, PVBOXHGCMSVCPARM paParms) const;
+    HRESULT adjustCoords(ULONG uScreenId, ULONG *puX, ULONG *puY) const;
+    int hostCall(uint32_t u32Function, uint32_t cParms, PVBOXHGCMSVCPARM paParms) const;
 
     /* Static helpers. */
@@ -310 +310 @@
 int DnDGuestResponse::waitForGuestResponse(RTMSINTERVAL msTimeout /*= 500 */)
 {
-    int vrc = RTSemEventWait(m_EventSem, msTimeout);
+    int rc = RTSemEventWait(m_EventSem, msTimeout);
 #ifdef DEBUG_andy
-    LogFlowFunc(("msTimeout=%RU32, rc=%Rrc\n", msTimeout, vrc));
+    LogFlowFunc(("msTimeout=%RU32, rc=%Rrc\n", msTimeout, rc));
 #endif
-    return vrc;
+    return rc;
 }
 
@@ -350 +350 @@
         m_pvData = NULL;
     }
-
     m_cbData = 0;
+
+    m_cbDataCurrent = 0;
+    m_cbDataTotal = 0;
 }
 
@@ -377 +379 @@
     {
         BOOL fCompleted;
-        HRESULT rc = m_progress->COMGETTER(Completed)(&fCompleted);
+        HRESULT hr = m_progress->COMGETTER(Completed)(&fCompleted);
         if (!fCompleted)
         {
             if (uState == DragAndDropSvc::DND_PROGRESS_ERROR)
             {
-                rc = m_progress->notifyComplete(E_FAIL,
+                hr = m_progress->notifyComplete(E_FAIL,
                                                 COM_IIDOF(IGuest),
                                                 m_parent->getComponentName(),
                                                 m_parent->tr("Drag'n drop guest error (%Rrc)"), rcOp);
+                reset();
             }
             else if (uState == DragAndDropSvc::DND_PROGRESS_CANCELLED)
             {
-                rc = m_progress->Cancel();
-                vrc = VERR_CANCELLED;
+                hr = m_progress->Cancel();
+                if (SUCCEEDED(hr))
+                    vrc = VERR_CANCELLED;
+
+                reset();
             }
             else /* uState == DragAndDropSvc::DND_PROGRESS_RUNNING */
             {
-                rc = m_progress->SetCurrentOperationProgress(uPercentage);
-#ifndef DEBUG_andy
-                Assert(SUCCEEDED(rc));
-#endif
+                hr = m_progress->SetCurrentOperationProgress(uPercentage);
+                AssertComRC(hr);
                 if (   uState      == DragAndDropSvc::DND_PROGRESS_COMPLETE
                     || uPercentage >= 100)
-                    rc = m_progress->notifyComplete(S_OK);
+                    hr = m_progress->notifyComplete(S_OK);
             }
+        }
+    }
+
+    return vrc;
+}
+
+int DnDGuestResponse::dataSetStatus(size_t cbDataAdd, size_t cbDataTotal /* = 0 */)
+{
+    if (cbDataTotal)
+    {
 #ifndef DEBUG_andy
-            Assert(SUCCEEDED(rc));
+        AssertMsg(m_cbDataTotal <= cbDataTotal, ("New data size must not be smaller (%zu) than old value (%zu)\n",
+                                                 cbDataTotal, m_cbDataTotal));
 #endif
-        }
-    }
-
-    return vrc;
-}
-
-int DnDGuestResponse::dataSetStatus(size_t cbDataAdd, size_t cbDataTotal /* = 0 */)
-{
-    if (cbDataTotal)
-    {
-        AssertMsg(m_cbDataTotal <= cbDataTotal, ("New data size size must not be smaller (%zu) than old value (%zu)\n",
-                                                 cbDataTotal, m_cbDataTotal));
+        LogFlowFunc(("Updating total data size from %zu to %zu\n", m_cbDataTotal, cbDataTotal));
         m_cbDataTotal = cbDataTotal;
-        LogFlowFunc(("Updating total data size to: %zu\n", m_cbDataTotal));
     }
     AssertMsg(m_cbDataTotal, ("m_cbDataTotal must not be <= 0\n"));
@@ -433 +436 @@
     LogFlowFunc(("Updating transfer status (%zu/%zu), status=%ld\n",
                  m_cbDataCurrent, m_cbDataTotal, uStatus));
-#endif
-
+#else
     AssertMsg(m_cbDataCurrent <= m_cbDataTotal,
               ("More data transferred (%RU32) than initially announced (%RU32)\n",
               m_cbDataCurrent, m_cbDataTotal));
-
+#endif
     int rc = setProgress(cPercentage, uStatus);
 
@@ -455 +457 @@
 }
 
-void GuestDnDPrivate::adjustCoords(ULONG uScreenId, ULONG *puX, ULONG *puY) const
+HRESULT GuestDnDPrivate::adjustCoords(ULONG uScreenId, ULONG *puX, ULONG *puY) const
 {
     /* For multi-monitor support we need to add shift values to the coordinates
      * (depending on the screen number). */
     ComPtr<IDisplay> pDisplay;
-    HRESULT rc = p->mParent->COMGETTER(Display)(pDisplay.asOutParam());
-    if (FAILED(rc))
-        throw rc;
+    HRESULT hr = p->mParent->COMGETTER(Display)(pDisplay.asOutParam());
+    if (FAILED(hr))
+        return hr;
 
     ComPtr<IFramebuffer> pFramebuffer;
     LONG xShift, yShift;
-    rc = pDisplay->GetFramebuffer(uScreenId, pFramebuffer.asOutParam(),
+    hr = pDisplay->GetFramebuffer(uScreenId, pFramebuffer.asOutParam(),
                                   &xShift, &yShift);
-    if (FAILED(rc))
-        throw rc;
+    if (FAILED(hr))
+        return hr;
 
     *puX += xShift;
     *puY += yShift;
-}
-
-void GuestDnDPrivate::hostCall(uint32_t u32Function, uint32_t cParms, PVBOXHGCMSVCPARM paParms) const
-{
-    VMMDev *vmmDev = NULL;
+
+    return hr;
+}
+
+int GuestDnDPrivate::hostCall(uint32_t u32Function, uint32_t cParms,
+                              PVBOXHGCMSVCPARM paParms) const
+{
+    VMMDev *pVMMDev = NULL;
     {
         /* Make sure mParent is valid, so set the read lock while using.
@@ -486 +491 @@
         /* Forward the information to the VMM device. */
         AssertPtr(p->mParent);
-        vmmDev = p->mParent->getVMMDev();
-    }
-
-    if (!vmmDev)
+        pVMMDev = p->mParent->getVMMDev();
+    }
+
+    if (!pVMMDev)
         throw p->setError(VBOX_E_VM_ERROR,
                           p->tr("VMM device is not available (is the VM running?)"));
 
     LogFlowFunc(("hgcmHostCall msg=%RU32, numParms=%RU32\n", u32Function, cParms));
-    int vrc = vmmDev->hgcmHostCall("VBoxDragAndDropSvc",
+    int rc = pVMMDev->hgcmHostCall("VBoxDragAndDropSvc",
                                    u32Function,
                                    cParms, paParms);
-    if (RT_FAILURE(vrc))
-    {
-        LogFlowFunc(("hgcmHostCall error: %Rrc\n", vrc));
+    if (RT_FAILURE(rc))
+    {
+        LogFlowFunc(("hgcmHostCall error: %Rrc\n", rc));
         throw p->setError(VBOX_E_VM_ERROR,
-                          p->tr("hgcmHostCall failed (%Rrc)"), vrc);
-    }
+                          p->tr("hgcmHostCall failed (%Rrc)"), rc);
+    }
+
+    return rc;
 }
 
@@ -653 +660 @@
         return S_OK;
 
-    HRESULT rc = S_OK;
+    HRESULT hr = S_OK;
 
     try
@@ -674 +681 @@
                     paParms);
 
-        DnDGuestResponse *pDnD = d->response();
+        DnDGuestResponse *pResp = d->response();
         /* This blocks until the request is answered (or timeout). */
-        if (pDnD->waitForGuestResponse() == VERR_TIMEOUT)
+        if (pResp->waitForGuestResponse() == VERR_TIMEOUT)
             return S_OK;
 
         /* Copy the response info */
-        *pResultAction = d->toMainAction(pDnD->defAction());
+        *pResultAction = d->toMainAction(pResp->defAction());
         LogFlowFunc(("*pResultAction=%ld\n", *pResultAction));
     }
-    catch (HRESULT rc2)
-    {
-        rc = rc2;
-    }
-
-    return rc;
+    catch (HRESULT hr2)
+    {
+        hr = hr2;
+    }
+
+    return hr;
 }
 
@@ -717 +724 @@
         return S_OK;
 
-    HRESULT rc = S_OK;
+    HRESULT hr = S_OK;
 
     try
@@ -738 +745 @@
                     paParms);
 
-        DnDGuestResponse *pDnD = d->response();
+        DnDGuestResponse *pResp = d->response();
         /* This blocks until the request is answered (or timeout). */
-        if (pDnD->waitForGuestResponse() == VERR_TIMEOUT)
+        if (pResp->waitForGuestResponse() == VERR_TIMEOUT)
             return S_OK;
 
         /* Copy the response info */
-        *pResultAction = d->toMainAction(pDnD->defAction());
+        *pResultAction = d->toMainAction(pResp->defAction());
         LogFlowFunc(("*pResultAction=%ld\n", *pResultAction));
     }
-    catch (HRESULT rc2)
-    {
-        rc = rc2;
-    }
-
-    return rc;
+    catch (HRESULT hr2)
+    {
+        hr = hr2;
+    }
+
+    return hr;
 }
 
@@ -760 +767 @@
     const ComObjPtr<Guest> &p = d->p;
 
-    HRESULT rc = S_OK;
+    HRESULT hr = S_OK;
 
     try
@@ -768 +775 @@
                     NULL);
 
-        DnDGuestResponse *pDnD = d->response();
+        DnDGuestResponse *pResp = d->response();
         /* This blocks until the request is answered (or timeout). */
-        pDnD->waitForGuestResponse();
-    }
-    catch (HRESULT rc2)
-    {
-        rc = rc2;
-    }
-
-    return rc;
+        pResp->waitForGuestResponse();
+    }
+    catch (HRESULT hr2)
+    {
+        hr = hr2;
+    }
+
+    return hr;
 }
 
@@ -807 +814 @@
         return S_OK;
 
-    HRESULT rc = S_OK;
+    HRESULT hr = S_OK;
 
     try
@@ -828 +835 @@
                     paParms);
 
-        DnDGuestResponse *pDnD = d->response();
+        DnDGuestResponse *pResp = d->response();
         /* This blocks until the request is answered (or timeout). */
-        if (pDnD->waitForGuestResponse() == VERR_TIMEOUT)
+        if (pResp->waitForGuestResponse() == VERR_TIMEOUT)
             return S_OK;
 
         /* Copy the response info */
-        *pResultAction = d->toMainAction(pDnD->defAction());
-        Bstr(pDnD->format()).cloneTo(pstrFormat);
+        *pResultAction = d->toMainAction(pResp->defAction());
+        Bstr(pResp->format()).cloneTo(pstrFormat);
 
         LogFlowFunc(("*pResultAction=%ld\n", *pResultAction));
     }
-    catch (HRESULT rc2)
-    {
-        rc = rc2;
-    }
-
-    return rc;
+    catch (HRESULT hr2)
+    {
+        hr = hr2;
+    }
+
+    return hr;
 }
 
@@ -853 +860 @@
     const ComObjPtr<Guest> &p = d->p;
 
-    HRESULT rc = S_OK;
+    HRESULT hr = S_OK;
 
     try
@@ -868 +875 @@
         paParms[i++].setUInt32((uint32_t)sfaData.size());
 
-        DnDGuestResponse *pDnD = d->response();
+        DnDGuestResponse *pResp = d->response();
         /* Reset any old progress status. */
-        pDnD->resetProgress(p);
+        pResp->resetProgress(p);
 
         /* Note: The actual data transfer of files/directoies is performed by the
@@ -879 +886 @@
 
         /* Query the progress object to the caller. */
-        pDnD->queryProgressTo(ppProgress);
-    }
-    catch (HRESULT rc2)
-    {
-        rc = rc2;
-    }
-
-    return rc;
+        pResp->queryProgressTo(ppProgress);
+    }
+    catch (HRESULT hr2)
+    {
+        hr = hr2;
+    }
+
+    return hr;
 }
 
@@ -901 +908 @@
     *pDefaultAction = DragAndDropAction_Ignore;
 
-    HRESULT rc = S_OK;
+    HRESULT hr = S_OK;
 
     try
@@ -913 +920 @@
                     paParms);
 
-        DnDGuestResponse *pDnD = d->response();
-        /* This blocks until the request is answered (or timeout). */
-        if (pDnD->waitForGuestResponse() == VERR_TIMEOUT)
+        /* This blocks until the request is answered (or timed out). */
+        DnDGuestResponse *pResp = d->response();
+        if (pResp->waitForGuestResponse() == VERR_TIMEOUT)
             return S_OK;
 
-        if (isDnDIgnoreAction(pDnD->defAction()))
+        if (isDnDIgnoreAction(pResp->defAction()))
             return S_OK;
 
         /* Fetch the default action to use. */
-        *pDefaultAction = d->toMainAction(pDnD->defAction());
-        /* Convert the formats strings to a vector of strings. */
-        d->toFormatSafeArray(pDnD->format(), ComSafeArrayOutArg(formats));
-        /* Convert the action bit field to a vector of actions. */
-        d->toMainActions(pDnD->allActions(), ComSafeArrayOutArg(allowedActions));
+        *pDefaultAction = d->toMainAction(pResp->defAction());
+        d->toFormatSafeArray(pResp->format(), ComSafeArrayOutArg(formats));
+        d->toMainActions(pResp->allActions(), ComSafeArrayOutArg(allowedActions));
 
         LogFlowFunc(("*pDefaultAction=0x%x\n", *pDefaultAction));
     }
-    catch (HRESULT rc2)
-    {
-        rc = rc2;
-    }
-
-    return rc;
+    catch (HRESULT hr2)
+    {
+        hr = hr2;
+    }
+
+    return hr;
 }
 
@@ -957 +962 @@
                  pcszFormat, uAction, fNeedsDropDir));
 
-    DnDGuestResponse *pDnD = d->response();
-    AssertPtr(pDnD);
+    DnDGuestResponse *pResp = d->response();
+    AssertPtr(pResp);
+
+    pResp->reset();
 
     if (fNeedsDropDir)
@@ -970 +977 @@
         LogFlowFunc(("Dropped files directory on the host is: %s\n", szDropDir));
 
-        pDnD->setDropDir(szDropDir);
+        pResp->setDropDir(szDropDir);
     }
 
@@ -982 +989 @@
 
         /* Reset any old data and the progress status. */
-        pDnD->reset();
-        pDnD->resetProgress(p);
+        pResp->reset();
+        pResp->resetProgress(p);
 
         d->hostCall(DragAndDropSvc::HOST_DND_GH_EVT_DROPPED,
@@ -990 +997 @@
 
         /* Query the progress object to the caller. */
-        pDnD->queryProgressTo(ppProgress);
-    }
-    catch (HRESULT rc2)
-    {
-        hr = rc2;
+        pResp->queryProgressTo(ppProgress);
+    }
+    catch (HRESULT hr2)
+    {
+        hr = hr2;
     }
 
@@ -1019 +1026 @@
 
             Utf8Str strFormat = pResp->format();
-            LogFlowFunc(("strFormat=%s, strDropDir=%s\n",
-                         strFormat.c_str(), pResp->dropDir().c_str()));
+            LogFlowFunc(("strFormat=%s, cbData=%zu, pvData=0x%p\n",
+                         strFormat.c_str(), cbData, pvData));
 
             if (DnDMIMEHasFileURLs(strFormat.c_str(), strFormat.length()))
             {
+                LogFlowFunc(("strDropDir=%s\n", pResp->dropDir().c_str()));
+
                 DnDURIList lstURI;
                 int rc2 = lstURI.RootFromURIData(pvData, cbData, 0 /* fFlags */);
@@ -1029 +1038 @@
                 {
                     Utf8Str strURIs = lstURI.RootToString(pResp->dropDir());
-                    if (sfaData.resize(strURIs.length()))
-                        memcpy(sfaData.raw(), strURIs.c_str(), strURIs.length());
+                    size_t cbURIs = strURIs.length();
+                    if (sfaData.resize(cbURIs + 1 /* Include termination */))
+                        memcpy(sfaData.raw(), strURIs.c_str(), cbURIs);
                     else
                         hr = E_OUTOFMEMORY;
@@ -1049 +1059 @@
         }
 
-        LogFlowFunc(("cbData=%zu\n", cbData));
-
         /* Detach in any case, regardless of data size. */
         sfaData.detachTo(ComSafeArrayOutArg(data));