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

Timestamp:

Jul 23, 2020 8:12:42 AM (5 years ago)

Author:

vboxsync

Message:

DnD/Main: More fixes.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDnDPrivate.cpp (modified) (4 diffs)
• GuestDnDTargetImpl.cpp (modified) (13 diffs)

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

@@ -273 +273 @@
 }
 
-int GuestDnDResponse::setProgress(unsigned uPercentage,
-                                  uint32_t uStatus,
+int GuestDnDResponse::setProgress(unsigned uPercentage, uint32_t uStatus,
                                   int rcOp /* = VINF_SUCCESS */, const Utf8Str &strMsg /* = "" */)
 {
-    RT_NOREF(rcOp);
-    LogFlowFunc(("uStatus=%RU32, uPercentage=%RU32, rcOp=%Rrc, strMsg=%s\n",
-                 uStatus, uPercentage, rcOp, strMsg.c_str()));
+    LogFlowFunc(("uPercentage=%u, uStatus=%RU32, , rcOp=%Rrc, strMsg=%s\n",
+                 uPercentage, uStatus, rcOp, strMsg.c_str()));
+
+    HRESULT hr = S_OK;
+
+    BOOL fCompleted = FALSE;
+    BOOL fCanceled  = FALSE;
 
     int rc = VINF_SUCCESS;
+
     if (!m_pProgress.isNull())
     {
-        BOOL fCompleted;
-        HRESULT hr = m_pProgress->COMGETTER(Completed)(&fCompleted);
+        hr = m_pProgress->COMGETTER(Completed)(&fCompleted);
         AssertComRC(hr);
 
-        BOOL fCanceled;
         hr = m_pProgress->COMGETTER(Canceled)(&fCanceled);
         AssertComRC(hr);
 
-        LogFlowFunc(("Current: fCompleted=%RTbool, fCanceled=%RTbool\n", fCompleted, fCanceled));
-
-        if (!fCompleted)
-        {
-            switch (uStatus)
+        LogFlowFunc(("Progress fCompleted=%RTbool, fCanceled=%RTbool\n", fCompleted, fCanceled));
+    }
+
+    switch (uStatus)
+    {
+        case DragAndDropSvc::DND_PROGRESS_ERROR:
+        {
+            LogRel(("DnD: Guest reported error %Rrc\n", rcOp));
+
+            if (   !m_pProgress.isNull()
+                && !fCompleted)
+                hr = m_pProgress->i_notifyComplete(VBOX_E_IPRT_ERROR,
+                                                   COM_IIDOF(IGuest),
+                                                   m_pParent->getComponentName(), strMsg.c_str());
+            reset();
+            break;
+        }
+
+        case DragAndDropSvc::DND_PROGRESS_CANCELLED:
+        {
+            LogRel2(("DnD: Guest cancelled operation\n"));
+
+            if (   !m_pProgress.isNull()
+                && !fCompleted)
             {
-                case DragAndDropSvc::DND_PROGRESS_ERROR:
+                hr = m_pProgress->Cancel();
+                AssertComRC(hr);
+                hr = m_pProgress->i_notifyComplete(S_OK);
+                AssertComRC(hr);
+            }
+
+            reset();
+            break;
+        }
+
+        case DragAndDropSvc::DND_PROGRESS_RUNNING:
+            RT_FALL_THROUGH();
+        case DragAndDropSvc::DND_PROGRESS_COMPLETE:
+        {
+            LogRel2(("DnD: Guest reporting running/completion status with %u%%\n", uPercentage));
+
+            if (   !m_pProgress.isNull()
+                && !fCompleted)
+            {
+                hr = m_pProgress->SetCurrentOperationProgress(uPercentage);
+                AssertComRC(hr);
+                if (   uStatus     == DragAndDropSvc::DND_PROGRESS_COMPLETE
+                    || uPercentage >= 100)
                 {
-                    hr = m_pProgress->i_notifyComplete(VBOX_E_IPRT_ERROR,
-                                                       COM_IIDOF(IGuest),
-                                                       m_pParent->getComponentName(), strMsg.c_str());
-                    reset();
-                    break;
-                }
-
-                case DragAndDropSvc::DND_PROGRESS_CANCELLED:
-                {
-                    hr = m_pProgress->Cancel();
-                    AssertComRC(hr);
                     hr = m_pProgress->i_notifyComplete(S_OK);
                     AssertComRC(hr);
-
-                    reset();
-                    break;
                 }
-
-                case DragAndDropSvc::DND_PROGRESS_RUNNING:
-                case DragAndDropSvc::DND_PROGRESS_COMPLETE:
-                {
-                    if (!fCanceled)
-                    {
-                        hr = m_pProgress->SetCurrentOperationProgress(uPercentage);
-                        AssertComRC(hr);
-                        if (   uStatus     == DragAndDropSvc::DND_PROGRESS_COMPLETE
-                            || uPercentage >= 100)
-                        {
-                            hr = m_pProgress->i_notifyComplete(S_OK);
-                            AssertComRC(hr);
-                        }
-                    }
-                    break;
-                }
-
-                default:
-                    break;
             }
-        }
-
+            break;
+        }
+
+        default:
+            break;
+    }
+
+    if (!m_pProgress.isNull())
+    {
         hr = m_pProgress->COMGETTER(Completed)(&fCompleted);
         AssertComRC(hr);
@@ -345 +361 @@
         AssertComRC(hr);
 
-        LogFlowFunc(("New: fCompleted=%RTbool, fCanceled=%RTbool\n", fCompleted, fCanceled));
+        LogFlowFunc(("Progress fCompleted=%RTbool, fCanceled=%RTbool\n", fCompleted, fCanceled));
     }
 
@@ -942 +958 @@
                  pData->cbExtra, pData->cbProcessed, pData->getRemaining(), cbDataAdd));
 
-    if (!pResp)
+    if (   !pResp
+        || !cbDataAdd) /* Only update if something really changes. */
         return VINF_SUCCESS;
 
@@ -948 +965 @@
         pData->addProcessed(cbDataAdd);
 
-    int rc = pResp->setProgress(pData->getPercentComplete(),
+    const uint8_t uPercent = pData->getPercentComplete();
+
+    LogRel2(("DnD: Transfer %RU8%% complete\n", uPercent));
+
+    int rc = pResp->setProgress(uPercent,
                                   pData->isComplete()
                                 ? DND_PROGRESS_COMPLETE

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

@@ -648 +648 @@
         pSendCtx->pResp     = pResp;
         pSendCtx->uScreenID = aScreenId;
-        pSendCtx->strFmtReq = aFormat;
-
+
+        pSendCtx->Meta.strFmt = aFormat;
         pSendCtx->Meta.add(aData);
 
@@ -820 +820 @@
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
 
-    /** @todo Add support for multiple HOST_DND_HG_SND_DATA messages in case of more than 64K data! */
-    if (pCtx->Meta.cbData > _64K)
-        return VERR_NOT_IMPLEMENTED;
-
-    const uint32_t cbFmt = (uint32_t)pCtx->Meta.strFmt.length() + 1; /* Include terminator. */
-
-    LogFlowFunc(("cbFmt=%RU32, cbMeta=%RU32\n", cbFmt, pCtx->Meta.cbData));
-
-    GuestDnDMsg Msg;
-    Msg.setType(HOST_DND_HG_SND_DATA);
-    if (m_DataBase.uProtocolVersion < 3)
-    {
-        Msg.setNextUInt32(pCtx->uScreenID);                                 /* uScreenId */
-        Msg.setNextPointer(pCtx->Meta.strFmt.mutableRaw(), cbFmt);          /* pvFormat */
-        Msg.setNextUInt32(cbFmt);                                           /* cbFormat */
-        Msg.setNextPointer(pCtx->Meta.pvData, (uint32_t)pCtx->Meta.cbData); /* pvData */
-        /* Fill in the current data block size to send.
-         * Note: Only supports uint32_t. */
-        Msg.setNextUInt32((uint32_t)pCtx->Meta.cbData);                     /* cbData */
-    }
-    else
-    {
-        Msg.setNextUInt32(0); /** @todo ContextID not used yet. */
-        Msg.setNextPointer(pCtx->Meta.pvData, (uint32_t)pCtx->Meta.cbData); /* pvData */
-        Msg.setNextUInt32((uint32_t)pCtx->Meta.cbData);                     /* cbData */
-        Msg.setNextPointer(NULL, 0);                                        /** @todo pvChecksum; not used yet. */
-        Msg.setNextUInt32(0);                                               /** @todo cbChecksum; not used yet. */
-    }
-
-    int rc = GUESTDNDINST()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
+    uint8_t *pvData = (uint8_t *)pCtx->Meta.pvData;
+    size_t   cbData = pCtx->Meta.cbData;
+
+    int rc = VINF_SUCCESS;
+
+    const size_t  cbFmt   = pCtx->Meta.strFmt.length() + 1; /* Include terminator. */
+    const char   *pcszFmt = pCtx->Meta.strFmt.c_str();
+
+    LogFlowFunc(("uProto=%u, szFmt=%s, cbFmt=%RU32, cbData=%zu\n", m_DataBase.uProtocolVersion, pcszFmt, cbFmt, cbData));
+
+    LogRel2(("DnD: Sending meta data to guest as '%s' (%zu bytes)\n", pcszFmt, cbData));
+
+#ifdef DEBUG
+    RTCList<RTCString> lstFilesURI = RTCString((char *)pvData, cbData).split("\r\n");
+    LogFlowFunc(("lstFilesURI=%zu\n", lstFilesURI.size()));
+    for (size_t i = 0; i < lstFilesURI.size(); i++)
+        LogFlowFunc(("\t%s\n", lstFilesURI.at(i).c_str()));
+#endif
+
+    uint8_t *pvChunk = pvData;
+    size_t   cbChunk = RT_MIN(mData.mcbBlockSize, cbData);
+    while (cbData)
+    {
+        GuestDnDMsg Msg;
+        Msg.setType(HOST_DND_HG_SND_DATA);
+
+        if (m_DataBase.uProtocolVersion < 3)
+        {
+            Msg.setNextUInt32(pCtx->uScreenID);                                 /* uScreenId */
+            Msg.setNextPointer(unconst(pcszFmt), (uint32_t)cbFmt);              /* pvFormat */
+            Msg.setNextUInt32((uint32_t)cbFmt);                                 /* cbFormat */
+            Msg.setNextPointer(pvChunk, (uint32_t)cbChunk);                     /* pvData */
+            /* Fill in the current data block size to send.
+             * Note: Only supports uint32_t. */
+            Msg.setNextUInt32((uint32_t)cbChunk);                               /* cbData */
+        }
+        else
+        {
+            Msg.setNextUInt32(0); /** @todo ContextID not used yet. */
+            Msg.setNextPointer(pvChunk, (uint32_t)cbChunk);                     /* pvData */
+            Msg.setNextUInt32((uint32_t)cbChunk);                               /* cbData */
+            Msg.setNextPointer(NULL, 0);                                        /** @todo pvChecksum; not used yet. */
+            Msg.setNextUInt32(0);                                               /** @todo cbChecksum; not used yet. */
+        }
+
+        rc = GUESTDNDINST()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
+        if (RT_FAILURE(rc))
+            break;
+
+        pvChunk += cbChunk;
+        AssertBreakStmt(cbData >= cbChunk, VERR_BUFFER_UNDERFLOW);
+        cbData  -= cbChunk;
+    }
+
     if (RT_SUCCESS(rc))
     {
-        rc = updateProgress(pCtx, pCtx->pResp, pCtx->Meta.cbData);
+        rc = updateProgress(pCtx, pCtx->pResp, (uint32_t)pCtx->Meta.cbData);
         AssertRC(rc);
     }
@@ -875 +899 @@
     GuestDnDMsg Msg;
     Msg.setType(HOST_DND_HG_SND_DATA_HDR);
+
+    LogRel2(("DnD: Sending meta data header to guest (%RU64 bytes total data, %RU32 bytes meta data, %RU64 objects)\n",
+             pCtx->getTotal(), pCtx->Meta.cbData, pCtx->Transfer.cObjToProcess));
 
     Msg.setNextUInt32(0);                                                /** @todo uContext; not used yet. */
@@ -976 +1003 @@
                 pMsg->setNextUInt64(cbSize);                         /* uSize */
 
-                LogRel2(("DnD: Transferring host file '%s' to guest (%zu bytes, mode %#x)\n",
-                         pcszSrcPath, cbSize, fMode));
+                LogRel2(("DnD: Transferring host file '%s' to guest (as '%s', %zu bytes, mode %#x)\n",
+                         pcszSrcPath, pcszDstPath, cbSize, fMode));
 
                 /** @todo Set progress object title to current file being transferred? */
@@ -1051 +1078 @@
     if (RT_SUCCESS(rc))
     {
-        pCtx->addProcessed(cbRead);
-
         LogFlowFunc(("cbBufe=%zu, cbRead=%RU32\n", cbBuf, cbRead));
 
@@ -1074 +1099 @@
         }
 
+        int rc2 = updateProgress(pCtx, pCtx->pResp, (uint32_t)cbRead);
+        AssertRC(rc2);
+
+        /* DnDTransferObjectRead() will return VINF_EOF if reading is complete. */
+        if (rc == VINF_EOF)
+            rc = VINF_SUCCESS;
+
         if (DnDTransferObjectIsComplete(pObj)) /* Done reading? */
-        {
             LogRel2(("DnD: Transferring host file '%s' to guest complete\n", pcszSrcPath));
-
-            /* DnDTransferObjectRead() returns VINF_EOF when finished reading the entire file,
-             * but we don't want this here -- so just set VINF_SUCCESS. */
-            rc = VINF_SUCCESS;
-        }
     }
     else
@@ -1099 +1125 @@
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
 
-    LogFlowFunc(("pThis=%p, uMsg=%RU32\n", pThis, uMsg));
+    /* At the moment we only have one transfer list per transfer. */
+    PDNDTRANSFERLIST pList = &pCtx->Transfer.List;
+
+    LogFlowFunc(("pThis=%p, pList=%p, uMsg=%RU32\n", pThis, pList, uMsg));
 
     int  rc      = VINF_SUCCESS;
@@ -1126 +1155 @@
                 GuestDnDMsg *pMsg = new GuestDnDMsg();
 
-                rc = pThis->i_sendTransferDataLoop(pCtx, pMsg);
+                rc = pThis->i_sendTransferListObject(pCtx, pList, pMsg);
                 if (rc == VINF_EOF) /* Transfer complete? */
                 {
@@ -1171 +1200 @@
 
             rc = pCtx->pResp->setProgress(100, DND_PROGRESS_ERROR, pCBData->rc,
-                                           GuestDnDTarget::i_guestErrorToString(pCBData->rc));
+                                          GuestDnDTarget::i_guestErrorToString(pCBData->rc));
             if (RT_SUCCESS(rc))
             {
@@ -1354 +1383 @@
          * Extract transfer list from current meta data.
          */
-        rc = DnDTransferListAppendPathsFromBuffer(&pCtx->Transfer.List, DNDTRANSFERLISTFMT_NATIVE,
-                                                  (const char *)pCtx->Meta.pvData, pCtx->Meta.cbData, "\n", DNDTRANSFERLIST_FLAGS_NONE);
+        rc = DnDTransferListAppendPathsFromBuffer(&pCtx->Transfer.List, DNDTRANSFERLISTFMT_URI,
+                                                  (const char *)pCtx->Meta.pvData, pCtx->Meta.cbData, DND_PATH_SEPARATOR,
+                                                  DNDTRANSFERLIST_FLAGS_RECURSIVE);
         if (RT_FAILURE(rc))
             break;
@@ -1362 +1392 @@
          * Update internal state to reflect everything we need to work with it.
          */
-        pCtx->cbExtra = DnDTransferListObjTotalBytes(&pCtx->Transfer.List);
+        pCtx->cbExtra               = DnDTransferListObjTotalBytes(&pCtx->Transfer.List);
+        /* cbExtra can be 0, if all files are of 0 bytes size. */
+        pCtx->Transfer.cObjToProcess = DnDTransferListObjCount(&pCtx->Transfer.List);
+        AssertBreakStmt(pCtx->Transfer.cObjToProcess, rc = VERR_INVALID_PARAMETER);
+
+        /* Update the meta data to have the current root transfer entries in the right shape. */
+        if (DnDMIMEHasFileURLs(pCtx->Meta.strFmt.c_str(), RTSTR_MAX))
+        {
+            /* Save original format we're still going to use after updating the actual meta data. */
+            Utf8Str strFmt = pCtx->Meta.strFmt;
+
+            /* Reset stale data. */
+            pCtx->Meta.reset();
+
+            void  *pvData;
+            size_t cbData;
+#ifdef DEBUG
+            rc = DnDTransferListGetRootsEx(&pCtx->Transfer.List, DNDTRANSFERLISTFMT_URI, "" /* pcszPathBase */,
+                                           "\n" /* pcszSeparator */, (char **)&pvData, &cbData);
+            AssertRCReturn(rc, rc);
+            LogFlowFunc(("URI data:\n%s", (char *)pvData));
+            RTMemFree(pvData);
+            cbData = 0;
+#endif
+            rc = DnDTransferListGetRoots(&pCtx->Transfer.List, DNDTRANSFERLISTFMT_URI,
+                                         (char **)&pvData, &cbData);
+            AssertRCReturn(rc, rc);
+
+            /* pCtx->Meta now owns the allocated data. */
+            pCtx->Meta.strFmt      = strFmt;
+            pCtx->Meta.pvData      = pvData;
+            pCtx->Meta.cbData      = cbData;
+            pCtx->Meta.cbAllocated = cbData;
+        }
 
         /*
@@ -1444 +1507 @@
 }
 
-int GuestDnDTarget::i_sendTransferDataLoop(GuestDnDSendCtx *pCtx, GuestDnDMsg *pMsg)
+/**
+ * Sends the next object of a transfer list to the guest.
+ *
+ * @returns VBox status code. VINF_EOF if the transfer list is complete.
+ * @param   pCtx                Send context to use.
+ * @param   pList               Transfer list to use.
+ * @param   pMsg                Message to store send data into.
+ */
+int GuestDnDTarget::i_sendTransferListObject(GuestDnDSendCtx *pCtx, PDNDTRANSFERLIST pList, GuestDnDMsg *pMsg)
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+    AssertPtrReturn(pList, VERR_INVALID_POINTER);
     AssertPtrReturn(pMsg, VERR_INVALID_POINTER);
 
     int rc = updateProgress(pCtx, pCtx->pResp);
-    AssertRC(rc);
-
-    if (   pCtx->isComplete()
-        && pCtx->Transfer.isComplete())
-    {
+    AssertRCReturn(rc, rc);
+
+    if (pCtx->isComplete())
+    {
+        Assert(pCtx->Transfer.isComplete());
         return VINF_EOF;
     }
 
-    PDNDTRANSFEROBJECT pObj = DnDTransferListObjGetFirst(&pCtx->Transfer.List);
-    if (!pObj)
-        return VERR_WRONG_ORDER;
+    PDNDTRANSFEROBJECT pObj = DnDTransferListObjGetFirst(pList);
+    AssertPtrReturn(pObj, VERR_WRONG_ORDER);
 
     switch (DnDTransferObjectGetType(pObj))
@@ -1477 +1548 @@
     }
 
-    if (   DnDTransferObjectIsComplete(pObj)
-        || RT_FAILURE(rc))
-        DnDTransferListObjRemoveFirst(&pCtx->Transfer.List);
+    if (   RT_SUCCESS(rc)
+        && DnDTransferObjectIsComplete(pObj))
+    {
+        DnDTransferListObjRemove(pList, pObj);
+        pObj = NULL;
+
+        AssertReturn(pCtx->Transfer.cObjProcessed + 1 <= pCtx->Transfer.cObjToProcess, VERR_WRONG_ORDER);
+        pCtx->Transfer.cObjProcessed++;
+
+        pCtx->Transfer.fObjState = DND_OBJ_STATE_NONE;
+    }
 
     LogFlowFuncLeaveRC(rc);