Changeset 55512 in vbox

Timestamp:

Apr 29, 2015 11:34:53 AM (9 years ago)

Author:

vboxsync

Message:

DnD: Bugfixes, cleanup, spelling.

Location:

trunk

Files:

• include/VBox/GuestHost/DragAndDrop.h (modified) (3 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIDnDDrag.cpp (modified) (1 diff)
• src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp (modified) (4 diffs)
• src/VBox/GuestHost/DragAndDrop/DnDURIObject.cpp (modified) (2 diffs)
• src/VBox/Main/include/GuestDnDPrivate.h (modified) (9 diffs)
• src/VBox/Main/include/GuestDnDSourceImpl.h (modified) (1 diff)
• src/VBox/Main/src-client/GuestDnDPrivate.cpp (modified) (7 diffs)
• src/VBox/Main/src-client/GuestDnDSourceImpl.cpp (modified) (29 diffs)
• src/VBox/Main/src-client/GuestDnDTargetImpl.cpp (modified) (16 diffs)

trunk/include/VBox/GuestHost/DragAndDrop.h

@@ -94 +94 @@
     int OpenEx(const RTCString &strPath, Type enmType, Dest enmDest, uint64_t fMode = 0, uint32_t fFlags = 0);
     int Read(void *pvBuf, size_t cbBuf, uint32_t *pcbRead);
+    void Reset(void);
     int Write(const void *pvBuf, size_t cbBuf, uint32_t *pcbWritten);
 
@@ -145 +146 @@
     RTCString RootToString(const RTCString &strBasePath = "", const RTCString &strSeparator = "\r\n");
     size_t RootCount(void) { return m_lstRoot.size(); }
+    uint32_t TotalCount(void) { return m_cTotal; }
     size_t TotalBytes(void) { return m_cbTotal; }
 
@@ -159 +161 @@
     /** List of all URI objects added. */
     RTCList<DnDURIObject>  m_lstTree;
+    /** Total number of all URI objects. */
+    uint32_t               m_cTotal;
     /** Total size of all URI objects, that is, the file
      *  size of all objects (in bytes). */

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

@@ -164 +164 @@
             if (RT_SUCCESS(rc))
             {
-                /* After we successfully retrieved data from
-                * the source, we query it from Main. */
+                /* After we successfully retrieved data from the source we query it from Main. */
                 QVector<uint8_t> vecData = dndSource.ReceiveData();
                 if (!vecData.isEmpty())

trunk/src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp

@@ -35 +35 @@
 
 DnDURIList::DnDURIList(void)
-    : m_cbTotal(0)
+    : m_cTotal(0)
+    , m_cbTotal(0)
 {
 }
@@ -78 +79 @@
                                   pcszPath, &pcszPath[cbBaseLen],
                                   objInfo.Attr.fMode, cbSize));
+    m_cTotal++;
     m_cbTotal += cbSize;
 #ifdef DEBUG_andy
@@ -257 +259 @@
                 char *pszRoot = &pszFilePath[cbBase];
                 m_lstRoot.append(pszRoot);
+                m_cTotal++;
 #ifdef DEBUG_andy
                 LogFlowFunc(("pszFilePath=%s, pszFileName=%s, pszRoot=%s\n",
@@ -356 +359 @@
             rc = DnDPathSanitize(pszFilePath, strlen(pszFilePath));
             if (RT_SUCCESS(rc))
+            {
                 m_lstRoot.append(pszFilePath);
+                m_cTotal++;
+            }
 
             RTStrFree(pszFilePath);

trunk/src/VBox/GuestHost/DragAndDrop/DnDURIObject.cpp

@@ -198 +198 @@
                     if (RT_SUCCESS(rc))
                         rc = RTFileGetSize(u.m_hFile, &m_cbSize);
+                    if (RT_SUCCESS(rc))
+                        m_cbProcessed = 0;
                 }
                 else
@@ -340 +342 @@
 }
 
+void DnDURIObject::Reset(void)
+{
+    Close();
+
+    m_Type        = Unknown;
+    m_strSrcPath  = "";
+    m_strTgtPath  = "";
+    m_fMode       = 0;
+    m_cbSize      = 0;
+    m_cbProcessed = 0;
+}
+
 int DnDURIObject::Write(const void *pvBuf, size_t cbBuf, uint32_t *pcbWritten)
 {

trunk/src/VBox/Main/include/GuestDnDPrivate.h

@@ -33 +33 @@
 class Progress;
 
-/** Array (vector) of guest DnD data. This might be an URI list, according
- *  to the format being set. */
-typedef std::vector<BYTE> GuestDnDData;
+class GuestDnDCallbackEvent
+{
+public:
+
+    GuestDnDCallbackEvent(void)
+        : mSemEvent(NIL_RTSEMEVENT)
+        , mRc(VINF_SUCCESS) { }
+
+    virtual ~GuestDnDCallbackEvent(void);
+
+public:
+
+    int Reset(void);
+
+    int Notify(int rc);
+
+    int Result(void) const { return mRc; }
+
+    int Wait(RTMSINTERVAL msTimeout);
+
+protected:
+
+    /** Event semaphore to notify on error/completion. */
+    RTSEMEVENT mSemEvent;
+    /** Callback result. */
+    int        mRc;
+};
+
+/**
+ * Structure for keeping the (URI) data to be sent/received.
+ */
+typedef struct GuestDnDData
+{
+    /** Array (vector) of guest DnD data. This might be an URI list, according
+     *  to the format being set. */
+    std::vector<BYTE>         vecData;
+    /** Overall size (in bytes) of data to send. */
+    uint64_t                  cbToProcess;
+    /** Overall size (in bytes) of processed file data. */
+    uint64_t                  cbProcessed;
+} GuestDnDData;
 
 /**
@@ -56 +94 @@
      *  This can be arbitrary data or an URI list. */
     GuestDnDData                        mData;
+    /** Callback event to use. */
+    GuestDnDCallbackEvent               mCallback;
     /** Struct for keeping data required for URI list processing. */
     struct
@@ -61 +101 @@
         /** List of all URI objects to send. */
         DnDURIList                      lstURI;
-        /** Event semaphore to notify in case of callback completion. */
-        RTSEMEVENT                      SemEvent;
-        /** Overall size (in bytes) of data to send. */
-        uint64_t                        cbToProcess;
-        /** Overall number of processed URI objects. */
-        uint32_t                        cProcessed;
-        /** Overall size (in bytes) of processed file data. */
-        uint64_t                        cbProcessed;
         /** Pointer to scratch buffer to use for
          *  doing the actual chunk transfers. */
@@ -99 +131 @@
      *  This can be arbitrary data or an URI list. */
     GuestDnDData                        mData;
-    /** Event semaphore to notify in case of callback completion. */
-    RTSEMEVENT                          SemEvent;
+    /** Callback event to use. */
+    GuestDnDCallbackEvent               mCallback;
     /** Struct for keeping data required for URI list processing. */
     struct
@@ -111 +143 @@
         /** Current object to receive. */
         DnDURIObject                    objURI;
-        /** Overall size (in bytes) of data to send. */
-        uint64_t                        cbToProcess;
-        /** Overall number of processed URI objects. */
-        uint32_t                        cProcessed;
-        /** Overall size (in bytes) of processed file data. */
-        uint64_t                        cbProcessed;
         /** List for holding created directories in the case of a rollback. */
         RTCList<RTCString>              lstDirs;
@@ -299 +325 @@
     uint32_t defAction(void) const { return m_defAction; }
 
-    void setDropDir(const Utf8Str &strDropDir) { m_strDropDir = strDropDir; }
-    Utf8Str dropDir(void) const { return m_strDropDir; }
-
     void setFormat(const Utf8Str &strFormat) { m_strFormat = strFormat; }
     Utf8Str format(void) const { return m_strFormat; }
-
-    int dataAdd(const void *pvData, uint32_t cbData, uint32_t *pcbCurSize);
-    int dataSetStatus(size_t cbDataAdd, size_t cbDataTotal = 0);
-    const void *data(void) { return m_pvData; }
-    size_t size(void) const { return m_cbData; }
 
     void reset(void);
@@ -338 +356 @@
     Utf8Str               m_strFormat;
 
-    /** The actual MIME data.*/
-    void                 *m_pvData;
-    /** Size (in bytes) of MIME data. */
-    uint32_t              m_cbData;
-
-    size_t                m_cbDataCurrent;
-    size_t                m_cbDataTotal;
-    /** Dropped files directory on the host. */
-    Utf8Str               m_strDropDir;
-    /** URI object to use for reading/writing from/to files
-     *  and handling directories. */
-    DnDURIObject          m_URIObj;
     /** Pointer to IGuest parent object. */
     ComObjPtr<Guest>      m_parent;
@@ -496 +502 @@
     }
 
-    /** Static callbacks.
-     * @{ */
-    //static DECLCALLBACK(int) i_getNextMsgCallback(GuestDnDBase *pThis, uint32_t *puMsg, uint32_t *pcParms, PVBOXHGCMSVCPARM paParms);
-    /** @}  */
-
 protected:
 
@@ -520 +521 @@
     } mData;
 };
-
 #endif /* ____H_GUESTDNDPRIVATE */
 

trunk/src/VBox/Main/include/GuestDnDSourceImpl.h

@@ -87 +87 @@
     int i_receiveRawData(PRECVDATACTX pCtx);
     int i_receiveURIData(PRECVDATACTX pCtx);
+
+protected:
+
+    int i_updateProcess(PRECVDATACTX pCtx, uint32_t cbDataAdd);
 };
 

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

@@ -160 +160 @@
  */
 
+GuestDnDCallbackEvent::~GuestDnDCallbackEvent(void)
+{
+    if (NIL_RTSEMEVENT != mSemEvent)
+        RTSemEventDestroy(mSemEvent);
+}
+
+int GuestDnDCallbackEvent::Reset(void)
+{
+    int rc = VINF_SUCCESS;
+
+    if (NIL_RTSEMEVENT == mSemEvent)
+        rc = RTSemEventCreate(&mSemEvent);
+
+    mRc = VINF_SUCCESS;
+    return rc;
+}
+
+int GuestDnDCallbackEvent::Notify(int rc)
+{
+    mRc = rc;
+    return RTSemEventSignal(mSemEvent);
+}
+
+int GuestDnDCallbackEvent::Wait(RTMSINTERVAL msTimeout)
+{
+    return RTSemEventWait(mSemEvent, msTimeout);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 GuestDnDResponse::GuestDnDResponse(const ComObjPtr<Guest>& pGuest)
     : m_EventSem(NIL_RTSEMEVENT)
     , m_defAction(0)
     , m_allActions(0)
-    , m_pvData(0)
-    , m_cbData(0)
-    , m_cbDataCurrent(0)
-    , m_cbDataTotal(0)
     , m_parent(pGuest)
 {
@@ -181 +207 @@
     int rc = RTSemEventDestroy(m_EventSem);
     AssertRC(rc);
-}
-
-int GuestDnDResponse::dataAdd(const void *pvData, uint32_t cbData,
-                              uint32_t *pcbCurSize)
-{
-    AssertPtrReturn(pvData, VERR_INVALID_POINTER);
-    AssertReturn(cbData, VERR_INVALID_PARAMETER);
-    /* pcbCurSize is optional. */
-
-    int rc = VINF_SUCCESS;
-
-    /** @todo Make reallocation scheme a bit smarter here. */
-    m_pvData = RTMemRealloc(m_pvData, m_cbData + cbData);
-    if (m_pvData)
-    {
-        memcpy(&static_cast<uint8_t*>(m_pvData)[m_cbData],
-               pvData, cbData);
-        m_cbData += cbData;
-
-        if (pcbCurSize)
-            *pcbCurSize = m_cbData;
-    }
-    else
-        rc = VERR_NO_MEMORY;
-
-    return rc;
 }
 
@@ -252 +252 @@
     LogFlowThisFuncEnter();
 
-    m_defAction = 0;
+    m_defAction  = 0;
     m_allActions = 0;
 
-    m_strDropDir = "";
-    m_strFormat = "";
-
-    if (m_pvData)
-    {
-        RTMemFree(m_pvData);
-        m_pvData = NULL;
-    }
-
-    m_cbData        = 0;
-    m_cbDataCurrent = 0;
-    m_cbDataTotal   = 0;
+    m_strFormat  = "";
 }
 
@@ -290 +279 @@
         AssertComRC(hr);
     }
-    else fCanceled = TRUE;
+    else
+        fCanceled = TRUE;
 
     return RT_BOOL(fCanceled);
@@ -336 +326 @@
         AssertComRC(hr);
 
-        LogFlowFunc(("fCompleted=%RTbool, fCanceled=%RTbool\n", fCompleted, fCanceled));
+        LogFlowFunc(("Current: fCompleted=%RTbool, fCanceled=%RTbool\n", fCompleted, fCanceled));
 
         if (!fCompleted)
@@ -382 +372 @@
             }
         }
+
+        hr = m_progress->COMGETTER(Completed)(&fCompleted);
+        AssertComRC(hr);
+        hr = m_progress->COMGETTER(Canceled)(&fCanceled);
+        AssertComRC(hr);
+
+        LogFlowFunc(("New: fCompleted=%RTbool, fCanceled=%RTbool\n", fCompleted, fCanceled));
     }
 
     LogFlowFuncLeaveRC(vrc);
     return vrc;
-}
-
-int GuestDnDResponse::dataSetStatus(size_t cbDataAdd, size_t cbDataTotal /* = 0 */)
-{
-    if (cbDataTotal)
-    {
-#ifndef DEBUG_andy
-        AssertMsg(m_cbDataTotal <= cbDataTotal, ("New data size must not be smaller (%zu) than old value (%zu)\n",
-                                                 cbDataTotal, m_cbDataTotal));
-#endif
-        LogFlowFunc(("Updating total data size from %zu to %zu\n", m_cbDataTotal, cbDataTotal));
-        m_cbDataTotal = cbDataTotal;
-    }
-    AssertMsg(m_cbDataTotal, ("m_cbDataTotal must not be <= 0\n"));
-
-    m_cbDataCurrent += cbDataAdd;
-    unsigned int cPercentage = RT_MIN(m_cbDataCurrent * 100.0 / m_cbDataTotal, 100);
-
-    /** @todo Don't use anonymous enums (uint32_t). */
-    uint32_t uStatus = DragAndDropSvc::DND_PROGRESS_RUNNING;
-    Assert(m_cbDataCurrent <= m_cbDataTotal);
-    if (m_cbDataCurrent >= m_cbDataTotal) uStatus = DragAndDropSvc::DND_PROGRESS_COMPLETE;
-
-    LogFlowFunc(("Updating transfer status (%zu/%zu), status=%ld\n", m_cbDataCurrent, m_cbDataTotal, uStatus));
-    AssertMsg(m_cbDataCurrent <= m_cbDataTotal,
-              ("More data transferred (%zu) than initially announced (%zu), cbDataAdd=%zu\n",
-               m_cbDataCurrent, m_cbDataTotal, cbDataAdd));
-
-    int rc = setProgress(cPercentage, uStatus);
-
-    /** @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) rc = setProgress(100, DragAndDropSvc::DND_PROGRESS_CANCELLED);
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
 }
 
@@ -839 +799 @@
     return rc;
 }
-
-#if 0
-/**
- * Returns back information (message type + parameter count) of the current message in
- * the local outgoing message queue.
- *
- * @return  IPRT status code.
- * @param   pThis
- * @param   puMsg
- * @param   pcParms
- * @param   paParms
- */
-/* static */
-DECLCALLBACK(int) GuestDnDBase::i_getNextMsgCallback(GuestDnDBase *pThis, uint32_t *puMsg,
-                                                     uint32_t *pcParms, PVBOXHGCMSVCPARM paParms)
-{
-    AssertPtrReturn(pThis,   VERR_INVALID_POINTER);
-    AssertPtrReturn(puMsg,   VERR_INVALID_POINTER);
-    AssertPtrReturn(pcParms, VERR_INVALID_POINTER);
-    AssertPtrReturn(paParms, VERR_INVALID_POINTER);
-
-    if (pThis->mData.m_lstOutgoing.empty())
-        return VERR_NO_DATA;
-
-    GuestDnDMsg *pMsg = pThis->mData.m_lstOutgoing.front();
-    AssertPtr(pMsg);
-
-    *puMsg   = pMsg->uMsg;
-    *pcParms = pMsg->cParms;
-
-    return VINF_SUCCESS;
-}
-#endif
 #endif /* VBOX_WITH_DRAG_AND_DROP */
 

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

@@ -281 +281 @@
     if (RT_FAILURE(rc))
         hr = setError(VBOX_E_IPRT_ERROR,
-                      tr("Unable to retrieve drag'n drop pending status (%Rrc)\n"), rc);
+                      tr("Error retrieving drag'n drop pending status (%Rrc)\n"), rc);
 
     LogFlowFunc(("hr=%Rhrc, defaultAction=0x%x\n", hr, defaultAction));
@@ -322 +322 @@
             RT_BZERO(pRecvCtx, sizeof(RECVDATACTX));
 
-            pRecvCtx->mpSource  = this;
-            pRecvCtx->mpResp    = pResp;
-            pRecvCtx->mFormat   = aFormat;
+            pRecvCtx->mpSource = this;
+            pRecvCtx->mpResp   = pResp;
+            pRecvCtx->mFormat  = aFormat;
 
             RecvDataTask *pTask = new RecvDataTask(this, pRecvCtx);
@@ -368 +368 @@
     HRESULT hr = S_OK;
 
+#if 0
     GuestDnDResponse *pResp = GuestDnDInst()->response();
     if (pResp)
@@ -419 +420 @@
     else
         hr = VBOX_E_INVALID_OBJECT_STATE;
+#endif
 
     LogFlowFunc(("Returning hr=%Rhrc\n", hr));
@@ -448 +450 @@
             rc = VERR_INVALID_PARAMETER;
         }
-        else if (cbData < pCtx->mData.size())
-        {
-            AssertMsgFailed(("New size (%RU64) is smaller than current size (%zu)\n", cbTotalSize, pCtx->mData.size()));
+        else if (cbData < pCtx->mData.vecData.size())
+        {
+            AssertMsgFailed(("New size (%RU64) is smaller than current size (%zu)\n", cbTotalSize, pCtx->mData.vecData.size()));
             rc = VERR_INVALID_PARAMETER;
         }
@@ -456 +458 @@
         if (RT_SUCCESS(rc))
         {
-            pCtx->mData.insert(pCtx->mData.begin(), (BYTE *)pvData, (BYTE *)pvData + cbData);
-
-            LogFlowFunc(("mDataSize=%zu\n", pCtx->mData.size()));
+            pCtx->mData.vecData.insert(pCtx->mData.vecData.begin(), (BYTE *)pvData, (BYTE *)pvData + cbData);
+
+            LogFlowFunc(("vecDataSize=%zu, cbData=%RU32, cbTotalSize=%RU64\n", pCtx->mData.vecData.size(), cbData, cbTotalSize));
 
             /* Data transfer complete? */
-            Assert(cbData <= pCtx->mData.size());
-            if (cbData == pCtx->mData.size())
+            Assert(cbData <= pCtx->mData.vecData.size());
+            if (cbData == pCtx->mData.vecData.size())
             {
                 bool fHasURIList = DnDMIMENeedsDropDir(pCtx->mFormat.c_str(), pCtx->mFormat.length());
+                LogFlowFunc(("fHasURIList=%RTbool, cbTotalSize=%RU32\n", fHasURIList, cbTotalSize));
                 if (fHasURIList)
                 {
-                    LogFlowFunc(("Parsing URI data ...\n"));
-
                     /* Try parsing the data as URI list. */
-                    rc = pCtx->mURI.lstURI.RootFromURIData(&pCtx->mData[0], pCtx->mData.size(), 0 /* uFlags */);
+                    rc = pCtx->mURI.lstURI.RootFromURIData(&pCtx->mData.vecData[0], pCtx->mData.vecData.size(), 0 /* uFlags */);
                     if (RT_SUCCESS(rc))
                     {
-                        pCtx->mURI.cbProcessed = 0;
-                        pCtx->mURI.cbToProcess = cbTotalSize;
+                        pCtx->mData.cbProcessed = 0;
+
+                        /* Assign new total size which also includes all paths + file
+                         * data to receive from the guest. */
+                        pCtx->mData.cbToProcess = cbTotalSize;
                     }
                 }
             }
+
+            if (RT_SUCCESS(rc))
+                rc = i_updateProcess(pCtx, cbData);
         }
     }
@@ -502 +509 @@
     {
         rc = RTDirCreateFullPath(pszDir, fMode);
+        if (RT_FAILURE(rc))
+            LogRel2(("DnD: Error creating guest directory \"%s\" on the host, rc=%Rrc\n", pszDir, rc));
+
         RTStrFree(pszDir);
     }
     else
          rc = VERR_NO_MEMORY;
+
+    if (RT_SUCCESS(rc))
+        rc = i_updateProcess(pCtx, cbPath);
 
     LogFlowFuncLeaveRC(rc);
@@ -569 +582 @@
             if (mData.mProtocolVersion >= 2)
                 rc = pCtx->mURI.objURI.SetSize(cbSize);
+        }
+        else
+        {
+            LogRel2(("DnD: Error opening/creating guest file \"%s\" on host, rc=%Rrc\n",
+                     pCtx->mURI.objURI.GetDestPath().c_str(), rc));
+            break;
         }
 
@@ -611 +630 @@
                 rc = VERR_DISK_FULL;
             }
+
+            if (RT_SUCCESS(rc))
+                rc = i_updateProcess(pCtx, cbWritten);
         }
 
@@ -617 +639 @@
             if (pCtx->mURI.objURI.IsComplete())
             {
-                LogRel2(("DnD: File transfer to host complete: %s", pCtx->mURI.objURI.GetDestPath().c_str()));
+                /* Prepare URI object for next use. */
+                pCtx->mURI.objURI.Reset();
+
+                /** @todo Sanitize path. */
+                LogRel2(("DnD: File transfer to host complete: %s\n", pCtx->mURI.objURI.GetDestPath().c_str()));
                 rc = VINF_EOF;
             }
@@ -634 +660 @@
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
-
-    int rc;
 
     GuestDnD *pInst = GuestDnDInst();
@@ -646 +670 @@
     ASMAtomicWriteBool(&pCtx->mIsActive, true);
 
-    /* Create event semaphore. */
-    pCtx->SemEvent = NIL_RTSEMEVENT;
-    rc = RTSemEventCreate(&pCtx->SemEvent);
+    int rc = pCtx->mCallback.Reset();
     if (RT_FAILURE(rc))
         return rc;
 
-    pCtx->mURI.cbToProcess = 0;
-    pCtx->mURI.cbProcessed = 0;
-    pCtx->mURI.cProcessed  = 0;
+    pCtx->mData.vecData.clear();
+    pCtx->mData.cbToProcess = 0;
+    pCtx->mData.cbProcessed = 0;
 
     do
@@ -680 +702 @@
     } while (0);
 
-    if (pCtx->SemEvent != NIL_RTSEMEVENT)
-    {
-        RTSemEventDestroy(pCtx->SemEvent);
-        pCtx->SemEvent = NIL_RTSEMEVENT;
-    }
-
     ASMAtomicWriteBool(&pCtx->mIsActive, false);
 
@@ -709 +725 @@
     {
         rc = pSource->i_receiveData(pTask->getCtx());
-        /* Nothing to do here anymore. */
     }
     else
-         rc = VERR_COM_INVALID_OBJECT_STATE;
+        rc = VERR_COM_INVALID_OBJECT_STATE;
 
     LogFlowFunc(("pSource=%p returning rc=%Rrc\n", (GuestDnDSource *)pSource, rc));
 
-    delete pTask;
+    if (pTask)
+        delete pTask;
     return rc;
 }
@@ -745 +761 @@
      * Register callbacks.
      */
-    /* Guest callbacks. */
+    REGISTER_CALLBACK(DragAndDropSvc::GUEST_DND_GH_EVT_ERROR);
     REGISTER_CALLBACK(DragAndDropSvc::GUEST_DND_GH_SND_DATA);
 
@@ -769 +785 @@
              */
             LogFlowFunc(("Waiting for raw data callback ...\n"));
-            rc = RTSemEventWait(pCtx->SemEvent, RT_INDEFINITE_WAIT);
-            LogFlowFunc(("Raw data callback done\n"));
+            rc = pCtx->mCallback.Wait(RT_INDEFINITE_WAIT);
+            LogFlowFunc(("Raw callback done, rc=%Rrc\n", rc));
         }
 
@@ -778 +794 @@
      * Unregister callbacks.
      */
+    UNREGISTER_CALLBACK(DragAndDropSvc::GUEST_DND_GH_EVT_ERROR);
     UNREGISTER_CALLBACK(DragAndDropSvc::GUEST_DND_GH_SND_DATA);
 
@@ -813 +830 @@
      */
     /* Guest callbacks. */
+    REGISTER_CALLBACK(DragAndDropSvc::GUEST_DND_GH_EVT_ERROR);
     REGISTER_CALLBACK(DragAndDropSvc::GUEST_DND_GH_SND_DATA);
     REGISTER_CALLBACK(DragAndDropSvc::GUEST_DND_GH_SND_DIR);
@@ -828 +846 @@
 
         pCtx->mURI.strDropDir = szDropDir; /** @todo Keep directory handle open? */
-        pResp->setDropDir(szDropDir);
 
         /*
@@ -849 +866 @@
              */
             LogFlowFunc(("Waiting for URI callback ...\n"));
-            rc = RTSemEventWait(pCtx->SemEvent, RT_INDEFINITE_WAIT);
+            rc = pCtx->mCallback.Wait(RT_INDEFINITE_WAIT);
             LogFlowFunc(("URI callback done, rc=%Rrc\n", rc));
         }
@@ -858 +875 @@
      * Unregister callbacks.
      */
+    UNREGISTER_CALLBACK(DragAndDropSvc::GUEST_DND_GH_EVT_ERROR);
     UNREGISTER_CALLBACK(DragAndDropSvc::GUEST_DND_GH_SND_DATA);
     UNREGISTER_CALLBACK(DragAndDropSvc::GUEST_DND_GH_SND_DIR);
@@ -898 +916 @@
 
     int rc = VINF_SUCCESS;
+    bool fNotify = false;
 
     switch (uMsg)
@@ -919 +938 @@
             AssertReturn(DragAndDropSvc::CB_MAGIC_DND_GH_EVT_ERROR == pCBData->hdr.u32Magic, VERR_INVALID_PARAMETER);
 
-            /* Cleanup. */
             pCtx->mpResp->reset();
             rc = pCtx->mpResp->setProgress(100, DragAndDropSvc::DND_PROGRESS_ERROR, pCBData->rc);
+            if (RT_SUCCESS(rc))
+                rc = pCBData->rc;
             break;
         }
@@ -931 +951 @@
 
     if (RT_FAILURE(rc))
-    {
-        if (pCtx->SemEvent != NIL_RTSEMEVENT)
-        {
-            LogFlowFunc(("Signalling ...\n"));
-            int rc2 = RTSemEventSignal(pCtx->SemEvent);
-            AssertRC(rc2);
-        }
+        fNotify = true;
+
+    if (fNotify)
+    {
+        int rc2 = pCtx->mCallback.Notify(rc);
+        AssertRC(rc2);
     }
 
@@ -956 +975 @@
 
     int rc = VINF_SUCCESS;
+    bool fNotify = false;
 
     switch (uMsg)
@@ -1015 +1035 @@
             else /* Protocol v2 and up. */
                 rc = pThis->i_onReceiveFileData(pCtx, pCBData->pvData, pCBData->cbData);
-
-            /* Current file done? */
-            if (rc == VINF_EOF)
-            {
-                /* Remove it from the list. */
-                pCtx->mURI.lstURI.RemoveFirst();
-
-                if (pCtx->mURI.lstURI.IsEmpty()) /* Current file processed? Check if there's more. */
-                {
-                    /* Let waiters know. */
-                    if (pCtx->SemEvent != NIL_RTSEMEVENT)
-                    {
-                        LogFlowFunc(("Signalling ...\n"));
-                        int rc2 = RTSemEventSignal(pCtx->SemEvent);
-                        AssertRC(rc2);
-                    }
-                }
-            }
             break;
         }
@@ -1042 +1044 @@
             AssertReturn(DragAndDropSvc::CB_MAGIC_DND_GH_EVT_ERROR == pCBData->hdr.u32Magic, VERR_INVALID_PARAMETER);
 
-            /* Cleanup. */
             pCtx->mpResp->reset();
             rc = pCtx->mpResp->setProgress(100, DragAndDropSvc::DND_PROGRESS_ERROR, pCBData->rc);
+            if (RT_SUCCESS(rc))
+                rc = pCBData->rc;
             break;
         }
@@ -1054 +1057 @@
 
     if (RT_FAILURE(rc))
-    {
-        if (pCtx->SemEvent != NIL_RTSEMEVENT)
-        {
-            LogFlowFunc(("Signalling ...\n"));
-            int rc2 = RTSemEventSignal(pCtx->SemEvent);
-            AssertRC(rc2);
-        }
+        fNotify = true;
+
+    /* All URI data processed? */
+    if (pCtx->mData.cbProcessed >= pCtx->mData.cbToProcess)
+    {
+        Assert(pCtx->mData.cbProcessed == pCtx->mData.cbToProcess);
+        fNotify = true;
+    }
+
+    LogFlowFunc(("cbProcessed=%RU64, cbToProcess=%RU64, fNotify=%RTbool\n",
+                 pCtx->mData.cbProcessed, pCtx->mData.cbToProcess, fNotify));
+
+    if (fNotify)
+    {
+        int rc2 = pCtx->mCallback.Notify(rc);
+        AssertRC(rc2);
     }
 
@@ -1067 +1079 @@
 }
 
+int GuestDnDSource::i_updateProcess(PRECVDATACTX pCtx, uint32_t cbDataAdd)
+{
+    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+
+    pCtx->mData.cbProcessed += cbDataAdd;
+    Assert(pCtx->mData.cbProcessed <= pCtx->mData.cbToProcess);
+
+    int64_t cbTotal  = pCtx->mData.cbToProcess;
+    uint8_t uPercent = pCtx->mData.cbProcessed * 100 / (cbTotal ? cbTotal : 1);
+
+    int rc = pCtx->mpResp->setProgress(uPercent,
+                                         uPercent >= 100
+                                       ? DragAndDropSvc::DND_PROGRESS_COMPLETE
+                                       : DragAndDropSvc::DND_PROGRESS_RUNNING);
+    return rc;
+}
+

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

@@ -499 +499 @@
     }
     else
-         rc = VERR_COM_INVALID_OBJECT_STATE;
+        rc = VERR_COM_INVALID_OBJECT_STATE;
 
     LogFlowFunc(("pTarget=%p returning rc=%Rrc\n", (GuestDnDTarget *)pTarget, rc));
 
-    delete pTask;
+    if (pTask)
+        delete pTask;
     return rc;
 }
@@ -544 +545 @@
             RT_BZERO(pSendCtx, sizeof(SENDDATACTX));
 
-            pSendCtx->mpTarget  = this;
-            pSendCtx->mpResp    = pResp;
-            pSendCtx->mScreenID = aScreenId;
-            pSendCtx->mFormat   = aFormat;
-            pSendCtx->mData     = aData;
+            pSendCtx->mpTarget      = this;
+            pSendCtx->mpResp        = pResp;
+            pSendCtx->mScreenID     = aScreenId;
+            pSendCtx->mFormat       = aFormat;
+            pSendCtx->mData.vecData = aData;
 
             SendDataTask *pTask = new SendDataTask(this, pSendCtx);
@@ -628 +629 @@
             GuestDnDMsg Msg;
 
-            size_t cbDataTotal = pCtx->mData.size();
+            size_t cbDataTotal = pCtx->mData.vecData.size();
             DATA_IS_VALID_BREAK(cbDataTotal);
 
@@ -636 +637 @@
             Msg.setNextPointer((void *)pCtx->mFormat.c_str(), (uint32_t)pCtx->mFormat.length() + 1);
             Msg.setNextUInt32((uint32_t)pCtx->mFormat.length() + 1);
-            Msg.setNextPointer((void*)&pCtx->mData.front(), (uint32_t)cbDataTotal);
+            Msg.setNextPointer((void*)&pCtx->mData.vecData.front(), (uint32_t)cbDataTotal);
             Msg.setNextUInt32(cbDataTotal);
 
@@ -696 +697 @@
         LogFlowFunc(("Opening \"%s\" ...\n", strPathSrc.c_str()));
         rc = aFile.OpenEx(strPathSrc, DnDURIObject::File, DnDURIObject::Source,
-                          RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE, 0 /* fFlags */);           
+                          RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE, 0 /* fFlags */);
     }
 
     bool fSendFileData = false;
-    if (RT_SUCCESS(rc)) 
+    if (RT_SUCCESS(rc))
     {
         if (mData.mProtocolVersion >= 2)
         {
-            if (!fOpen) 
+            if (!fOpen)
             {
                 /*
@@ -787 +788 @@
     if (RT_SUCCESS(rc))
     {
-        pCtx->mURI.cbProcessed += cbRead;
+        pCtx->mData.cbProcessed += cbRead;
 
         if (mData.mProtocolVersion <= 1)
@@ -824 +825 @@
 
     int rc = VINF_SUCCESS;
+    bool fNotify = false;
 
     switch (uMsg)
@@ -919 +921 @@
     }
 
-    if (RT_FAILURE(rc))
-    {
-        if (pCtx->mURI.SemEvent != NIL_RTSEMEVENT)
-        {
-            LogFlowFunc(("Signalling ...\n"));
-            int rc2 = RTSemEventSignal(pCtx->mURI.SemEvent);
-            AssertRC(rc2);
-        }
+    if (fNotify)
+    {
+        int rc2 = pCtx->mCallback.Notify(rc);
+        AssertRC(rc2);
     }
 
@@ -957 +955 @@
         return rc;
 
+    rc = pCtx->mCallback.Reset();
+    if (RT_FAILURE(rc))
+        return rc;
+
 #define UNREGISTER_CALLBACK(x) \
     rc = pCtx->mpResp->setCallback(x, NULL); \
@@ -966 +968 @@
     /* Generic callbacks. */
     REGISTER_CALLBACK(DragAndDropSvc::GUEST_DND_GET_NEXT_HOST_MSG);
+    REGISTER_CALLBACK(DragAndDropSvc::GUEST_DND_GH_EVT_ERROR);
     /* Host callbacks. */
     REGISTER_CALLBACK(DragAndDropSvc::HOST_DND_HG_SND_DIR);
@@ -980 +983 @@
         pCtx->mURI.cbScratchBuf = m_cbBlockSize;
 
-        /* Create event semaphore. */
-        pCtx->mURI.SemEvent = NIL_RTSEMEVENT;
-        rc = RTSemEventCreate(&pCtx->mURI.SemEvent);
-        if (RT_FAILURE(rc))
-            break;
-
         /*
          * Extract URI list from byte data.
@@ -991 +988 @@
         DnDURIList &lstURI = pCtx->mURI.lstURI; /* Use the URI list from the context. */
 
-        const char *pszList = (const char *)&pCtx->mData.front();
+        const char *pszList = (const char *)&pCtx->mData.vecData.front();
         URI_DATA_IS_VALID_BREAK(pszList);
 
-        uint32_t cbList = pCtx->mData.size();
+        uint32_t cbList = pCtx->mData.vecData.size();
         URI_DATA_IS_VALID_BREAK(cbList);
 
@@ -1007 +1004 @@
             break;
 
-        pCtx->mURI.cbProcessed = 0;
-        pCtx->mURI.cProcessed  = 0;
-        pCtx->mURI.cbToProcess = lstURI.TotalBytes();
+        pCtx->mData.cbProcessed = 0;
+        pCtx->mData.cbToProcess = lstURI.TotalBytes();
 
         /*
@@ -1037 +1033 @@
              */
             LogFlowFunc(("Waiting for URI callback ...\n"));
-            rc = RTSemEventWait(pCtx->mURI.SemEvent, RT_INDEFINITE_WAIT);
-            LogFlowFunc(("URI callback done\n"));
+            rc = pCtx->mCallback.Wait(RT_INDEFINITE_WAIT);
+            LogFlowFunc(("URI callback done, rc=%Rrc\n", rc));
         }
 
     } while (0);
-
-     if (pCtx->mURI.SemEvent != NIL_RTSEMEVENT)
-     {
-         RTSemEventDestroy(pCtx->mURI.SemEvent);
-         pCtx->mURI.SemEvent = NIL_RTSEMEVENT;
-     }
 
     /*
@@ -1054 +1044 @@
     /* Guest callbacks. */
     UNREGISTER_CALLBACK(DragAndDropSvc::GUEST_DND_GET_NEXT_HOST_MSG);
+    UNREGISTER_CALLBACK(DragAndDropSvc::GUEST_DND_GH_EVT_ERROR);
     /* Host callbacks. */
     UNREGISTER_CALLBACK(DragAndDropSvc::HOST_DND_HG_SND_DIR);
@@ -1081 +1072 @@
     int rc;
 
-    uint64_t cbTotal = pCtx->mURI.cbToProcess;
-    uint8_t uPercent = pCtx->mURI.cbProcessed * 100 / (cbTotal ? cbTotal : 1);
-
-    LogFlowFunc(("%RU64 / %RU64 -- %RU8%%\n", pCtx->mURI.cbProcessed, cbTotal, uPercent));
+    uint64_t cbTotal = pCtx->mData.cbToProcess;
+    uint8_t uPercent = pCtx->mData.cbProcessed * 100 / (cbTotal ? cbTotal : 1);
+
+    LogFlowFunc(("%RU64 / %RU64 -- %RU8%%\n", pCtx->mData.cbProcessed, cbTotal, uPercent));
 
     bool fComplete = (uPercent >= 100) || lstURI.IsEmpty();