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

Timestamp:

Feb 14, 2014 9:46:58 AM (11 years ago)

Author:

vboxsync

Message:

DnD: Update.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDnDImpl.cpp (modified) (17 diffs)
• GuestImpl.cpp (modified) (11 diffs)

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

@@ -24 +24 @@
 # include "GuestDnDImpl.h"
 
+# include <iprt/dir.h>
+# include <iprt/path.h>
+# include <iprt/stream.h>
+# include <iprt/semaphore.h>
+# include <iprt/cpp/utils.h>
+
 # include <VMMDev.h>
 
 # include <VBox/com/list.h>
+# include <VBox/GuestHost/DragAndDrop.h>
 # include <VBox/HostServices/DragAndDropSvc.h>
 
@@ -34 +41 @@
 # define LOG_GROUP LOG_GROUP_GUEST_DND
 # include <VBox/log.h>
-
-# include <iprt/stream.h>
-# include <iprt/semaphore.h>
-# include <iprt/cpp/utils.h>
 
 /* How does this work:
@@ -209 +212 @@
 };
 
+/** @todo This class needs a major cleanup. Later. */
 class GuestDnDPrivate
 {
 private:
-    /* todo: currently we only support one response. Maybe this needs to be extended at some time. */
+
+    /** @todo Currently we only support one response. Maybe this needs to be extended at some time. */
     GuestDnDPrivate(GuestDnD *q, const ComObjPtr<Guest>& pGuest)
         : q_ptr(q)
@@ -225 +230 @@
     void hostCall(uint32_t u32Function, uint32_t cParms, PVBOXHGCMSVCPARM paParms) const;
 
-    /* Static helper */
+    /* Static helpers. */
     static RTCString           toFormatString(ComSafeArrayIn(IN_BSTR, formats));
     static void                toFormatSafeArray(const RTCString &strFormats, ComSafeArrayOut(BSTR, formats));
@@ -238 +243 @@
     ComObjPtr<Guest>                 p;
 
-    /* Private helper members */
+    /* Private helper members. */
     static const RTCList<RTCString>  m_sstrAllowedMimeTypes;
     DnDGuestResponse                *m_pDnDResponse;
@@ -396 +401 @@
     ComPtr<IDisplay> pDisplay;
     HRESULT rc = p->mParent->COMGETTER(Display)(pDisplay.asOutParam());
-    if (FAILED(rc)) throw rc;
+    if (FAILED(rc))
+        throw rc;
+
     ComPtr<IFramebuffer> pFramebuffer;
     LONG xShift, yShift;
-    rc = pDisplay->GetFramebuffer(uScreenId, pFramebuffer.asOutParam(), &xShift, &yShift);
-    if (FAILED(rc)) throw rc;
+    rc = pDisplay->GetFramebuffer(uScreenId, pFramebuffer.asOutParam(),
+                                  &xShift, &yShift);
+    if (FAILED(rc))
+        throw rc;
+
     *puX += xShift;
     *puY += yShift;
@@ -696 +706 @@
 }
 
-HRESULT GuestDnD::dragHGDrop(ULONG uScreenId, ULONG uX, ULONG uY, DragAndDropAction_T defaultAction, ComSafeArrayIn(DragAndDropAction_T, allowedActions), ComSafeArrayIn(IN_BSTR, formats), BSTR *pstrFormat, DragAndDropAction_T *pResultAction)
+HRESULT GuestDnD::dragHGDrop(ULONG uScreenId, ULONG uX, ULONG uY,
+                             DragAndDropAction_T defaultAction,
+                             ComSafeArrayIn(DragAndDropAction_T, allowedActions),
+                             ComSafeArrayIn(IN_BSTR, formats),
+                             BSTR *pstrFormat,
+                             DragAndDropAction_T *pResultAction)
 {
     DPTR(GuestDnD);
@@ -783 +798 @@
         pDnD->resetProgress(p);
 
+        /* Note: The actual data transfer of files/directoies is performed by the
+         *       DnD host service. */
         d->hostCall(DragAndDropSvc::HOST_DND_HG_SND_DATA,
                     i,
@@ -854 +871 @@
 
     Utf8Str strFormat(bstrFormat);
-    HRESULT rc = S_OK;
+    HRESULT hr = S_OK;
 
     uint32_t uAction = d->toHGCMAction(action);
@@ -861 +878 @@
         return S_OK;
 
+    const char *pcszFormat = strFormat.c_str();
+    LogFlowFunc(("strFormat=%s, uAction=0x%x\n", pcszFormat, uAction));
+    if (DnDMIMENeedsDropDir(pcszFormat, strlen(pcszFormat)))
+    {
+        char szDropDir[RTPATH_MAX];
+        int rc = DnDDirCreateDroppedFiles(szDropDir, sizeof(szDropDir));
+        if (RT_FAILURE(rc))
+            return p->setError(VBOX_E_IPRT_ERROR,
+                               p->tr("Unable to create the temporary drag'n drop directory \"%s\" (%Rrc)\n"),
+                               szDropDir, rc);
+        LogFlowFunc(("Dropped files directory on the host is: %s\n", szDropDir));
+    }
+
     try
     {
-        LogFlowFunc(("strFormat=%s, uAction=0x%x\n", strFormat.c_str(), uAction));
-
         VBOXHGCMSVCPARM paParms[3];
         int i = 0;
@@ -872 +900 @@
 
         DnDGuestResponse *pDnD = d->response();
+
         /* Reset any old data and the progress status. */
         pDnD->reset();
@@ -885 +914 @@
     catch (HRESULT rc2)
     {
-        rc = rc2;
-    }
-
-    return rc;
+        hr = rc2;
+    }
+
+    return hr;
 }
 
@@ -906 +935 @@
         if (cbData)
         {
-            /* Copy the data into an safe array of bytes. */
+            /* Copy the data into a safe array of bytes. */
             const void *pvData = pDnD->data();
             if (sfaData.resize(cbData))
@@ -1006 +1035 @@
             if (RT_SUCCESS(rc))
             {
+                /** @todo Store pCBData->cbAllSize in the guest's response struct
+                 *        if not set already. */
                 uint32_t cbTotalSize = pCBData->cbAllSize;
                 unsigned int cPercentage;
@@ -1015 +1046 @@
                 /** @todo Don't use anonymous enums. */
                 uint32_t uState = DragAndDropSvc::DND_PROGRESS_RUNNING;
-                if (   pCBData->cbAllSize == cbCurSize
+                if (   cbTotalSize == cbCurSize
                     /* Empty data? Should not happen, but anyway ... */
-                    || !pCBData->cbAllSize)
+                    || !cbTotalSize)
                 {
                     uState = DragAndDropSvc::DND_PROGRESS_COMPLETE;
@@ -1024 +1055 @@
                 rc = pResp->setProgress(cPercentage, uState);
             }
-            /* Todo: for now we instantly confirm the cancel. Check if the
-             * guest should first clean up stuff itself and than really confirm
-             * the cancel request by an extra message. */
+
+            /** @todo For now we instantly confirm the cancel. Check if the
+             *        guest should first clean up stuff itself and than really confirm
+             *        the cancel request by an extra message. */
             if (rc == VERR_CANCELLED)
                 pResp->setProgress(100, DragAndDropSvc::DND_PROGRESS_CANCELLED);
@@ -1053 +1085 @@
     return rc;
 }
-
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 

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

@@ -838 +838 @@
 }
 
-STDMETHODIMP Guest::DragHGEnter(ULONG uScreenId, ULONG uX, ULONG uY, DragAndDropAction_T defaultAction, ComSafeArrayIn(DragAndDropAction_T, allowedActions), ComSafeArrayIn(IN_BSTR, formats), DragAndDropAction_T *pResultAction)
+STDMETHODIMP Guest::DragHGEnter(ULONG uScreenId, ULONG uX, ULONG uY,
+                                DragAndDropAction_T defaultAction,
+                                ComSafeArrayIn(DragAndDropAction_T, allowedActions),
+                                ComSafeArrayIn(IN_BSTR, formats),
+                                DragAndDropAction_T *pResultAction)
 {
     /* Input validation */
@@ -849 +853 @@
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
-    return m_pGuestDnD->dragHGEnter(uScreenId, uX, uY, defaultAction, ComSafeArrayInArg(allowedActions), ComSafeArrayInArg(formats), pResultAction);
+    return m_pGuestDnD->dragHGEnter(uScreenId, uX, uY, defaultAction,
+                                    ComSafeArrayInArg(allowedActions),
+                                    ComSafeArrayInArg(formats),
+                                    pResultAction);
 #else /* VBOX_WITH_DRAG_AND_DROP */
     ReturnComNotImplemented();
@@ -855 +862 @@
 }
 
-STDMETHODIMP Guest::DragHGMove(ULONG uScreenId, ULONG uX, ULONG uY, DragAndDropAction_T defaultAction, ComSafeArrayIn(DragAndDropAction_T, allowedActions), ComSafeArrayIn(IN_BSTR, formats), DragAndDropAction_T *pResultAction)
+STDMETHODIMP Guest::DragHGMove(ULONG uScreenId, ULONG uX, ULONG uY,
+                               DragAndDropAction_T defaultAction,
+                               ComSafeArrayIn(DragAndDropAction_T, allowedActions),
+                               ComSafeArrayIn(IN_BSTR, formats),
+                               DragAndDropAction_T *pResultAction)
 {
     /* Input validation */
@@ -866 +877 @@
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
-    return m_pGuestDnD->dragHGMove(uScreenId, uX, uY, defaultAction, ComSafeArrayInArg(allowedActions), ComSafeArrayInArg(formats), pResultAction);
+    return m_pGuestDnD->dragHGMove(uScreenId, uX, uY, defaultAction,
+                                   ComSafeArrayInArg(allowedActions),
+                                   ComSafeArrayInArg(formats),
+                                   pResultAction);
 #else /* VBOX_WITH_DRAG_AND_DROP */
     ReturnComNotImplemented();
@@ -884 +898 @@
 }
 
-STDMETHODIMP Guest::DragHGDrop(ULONG uScreenId, ULONG uX, ULONG uY, DragAndDropAction_T defaultAction, ComSafeArrayIn(DragAndDropAction_T, allowedActions), ComSafeArrayIn(IN_BSTR, formats), BSTR *pstrFormat, DragAndDropAction_T *pResultAction)
+STDMETHODIMP Guest::DragHGDrop(ULONG uScreenId, ULONG uX, ULONG uY,
+                               DragAndDropAction_T defaultAction,
+                               ComSafeArrayIn(DragAndDropAction_T, allowedActions),
+                               ComSafeArrayIn(IN_BSTR, formats),
+                               BSTR *pstrFormat, DragAndDropAction_T *pResultAction)
 {
     /* Input validation */
@@ -896 +914 @@
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
-    return m_pGuestDnD->dragHGDrop(uScreenId, uX, uY, defaultAction, ComSafeArrayInArg(allowedActions), ComSafeArrayInArg(formats), pstrFormat, pResultAction);
+    return m_pGuestDnD->dragHGDrop(uScreenId, uX, uY,
+                                   defaultAction,
+                                   ComSafeArrayInArg(allowedActions),
+                                   ComSafeArrayInArg(formats),
+                                   pstrFormat, pResultAction);
 #else /* VBOX_WITH_DRAG_AND_DROP */
     ReturnComNotImplemented();
@@ -902 +924 @@
 }
 
-STDMETHODIMP Guest::DragHGPutData(ULONG uScreenId, IN_BSTR bstrFormat, ComSafeArrayIn(BYTE, data), IProgress **ppProgress)
+STDMETHODIMP Guest::DragHGPutData(ULONG uScreenId, IN_BSTR bstrFormat,
+                                  ComSafeArrayIn(BYTE, data),
+                                  IProgress **ppProgress)
 {
     /* Input validation */
@@ -913 +937 @@
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
-    return m_pGuestDnD->dragHGPutData(uScreenId, bstrFormat, ComSafeArrayInArg(data), ppProgress);
+    return m_pGuestDnD->dragHGPutData(uScreenId, bstrFormat,
+                                      ComSafeArrayInArg(data), ppProgress);
 #else /* VBOX_WITH_DRAG_AND_DROP */
     ReturnComNotImplemented();
@@ -919 +944 @@
 }
 
-STDMETHODIMP Guest::DragGHPending(ULONG uScreenId, ComSafeArrayOut(BSTR, formats), ComSafeArrayOut(DragAndDropAction_T, allowedActions), DragAndDropAction_T *pDefaultAction)
+STDMETHODIMP Guest::DragGHPending(ULONG uScreenId,
+                                  ComSafeArrayOut(BSTR, formats),
+                                  ComSafeArrayOut(DragAndDropAction_T, allowedActions),
+                                  DragAndDropAction_T *pDefaultAction)
 {
     /* Input validation */
@@ -930 +958 @@
 
 #if defined(VBOX_WITH_DRAG_AND_DROP) && defined(VBOX_WITH_DRAG_AND_DROP_GH)
-    return m_pGuestDnD->dragGHPending(uScreenId, ComSafeArrayOutArg(formats), ComSafeArrayOutArg(allowedActions), pDefaultAction);
+    return m_pGuestDnD->dragGHPending(uScreenId,
+                                      ComSafeArrayOutArg(formats),
+                                      ComSafeArrayOutArg(allowedActions),
+                                      pDefaultAction);
 #else /* VBOX_WITH_DRAG_AND_DROP */
     ReturnComNotImplemented();
@@ -936 +967 @@
 }
 
-STDMETHODIMP Guest::DragGHDropped(IN_BSTR bstrFormat, DragAndDropAction_T action, IProgress **ppProgress)
+STDMETHODIMP Guest::DragGHDropped(IN_BSTR bstrFormat, DragAndDropAction_T action,
+                                  IProgress **ppProgress)
 {
     /* Input validation */