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

Timestamp:

Apr 30, 2015 12:28:26 PM (10 years ago)

Author:

vboxsync

Message:

DnD: Update.

File:

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

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

@@ -496 +496 @@
     else
         rc = VERR_COM_INVALID_OBJECT_STATE;
+
+    ASMAtomicWriteBool(&pTarget->mDataBase.mfTransferIsPending, false);
 
     LogFlowFunc(("pTarget=%p returning rc=%Rrc\n", (GuestDnDTarget *)pTarget, rc));
@@ -521 +523 @@
 #else /* VBOX_WITH_DRAG_AND_DROP */
 
-    /** @todo Add input validation. */
-    /** @todo Check if another sendData() call currently is being processed. */
-
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    /* Note: At the moment we only support one response at a time. */
+    /* Input validation. */
+    if (RT_UNLIKELY((aFormat.c_str()) == NULL || *(aFormat.c_str()) == '\0'))
+        return setError(E_INVALIDARG, tr("No data format specified"));
+    if (RT_UNLIKELY(!aData.size()))
+        return setError(E_INVALIDARG, tr("No data to send specified"));
+
+    /* Note: At the moment we only support one transfer at a time. */
+    if (ASMAtomicReadBool(&mDataBase.mfTransferIsPending))
+        return setError(E_INVALIDARG, tr("Another send operation already is in progress"));
+
+    ASMAtomicWriteBool(&mDataBase.mfTransferIsPending, true);
+
+    /* Dito. */
     GuestDnDResponse *pResp = GuestDnDInst()->response();
     AssertPtr(pResp);
@@ -549 +560 @@
         AssertReturn(pTask->isOk(), pTask->getRC());
 
-        RTTHREAD sendThread;
-        int rc = RTThreadCreate(&sendThread, GuestDnDTarget::i_sendDataThread,
+        int rc = RTThreadCreate(NULL, GuestDnDTarget::i_sendDataThread,
                                 (void *)pTask, 0, RTTHREADTYPE_MAIN_WORKER, 0, "dndTgtSndData");
         if (RT_SUCCESS(rc))
@@ -569 +579 @@
         hr = setError(E_OUTOFMEMORY);
     }
+
+    /* Note: mDataBase.mfTransferIsPending will be set to false again by i_sendDataThread. */
 
     LogFlowFunc(("Returning hr=%Rhrc\n", hr));
@@ -608 +620 @@
 
     ASMAtomicWriteBool(&pCtx->mIsActive, true);
+
+    /* Clear all remaining outgoing messages. */
+    mDataBase.mListOutgoing.clear();
 
     do
@@ -694 +709 @@
         rc = aFile.OpenEx(strPathSrc, DnDURIObject::File, DnDURIObject::Source,
                           RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE, 0 /* fFlags */);
+        if (RT_FAILURE(rc))
+            LogRel2(("DnD: Error opening host file \"%s\", rc=%Rrc\n", strPathSrc.c_str(), rc));
     }
 
@@ -718 +735 @@
 
                 LogFlowFunc(("Sending file header ...\n"));
+                LogRel2(("DnD: Transferring host file to guest: %s (%RU64 bytes, mode 0x%x)\n",
+                         strPathSrc.c_str(), aFile.GetSize(), aFile.GetMode()));
             }
             else
@@ -800 +819 @@
         if (aFile.IsComplete()) /* Done reading? */
         {
+            LogRel2(("DnD: File transfer to guest complete: %s\n", aFile.GetSourcePath().c_str()));
             LogFlowFunc(("File \"%s\" complete\n", aFile.GetSourcePath().c_str()));
             rc = VINF_EOF;
@@ -821 +841 @@
 
     int rc = VINF_SUCCESS;
-    bool fNotify = false;
 
     switch (uMsg)
@@ -849 +868 @@
 
                 if (RT_FAILURE(rc))
-                {
-                    if (rc == VERR_NO_DATA) /* All URI objects processed? */
-                    {
-                        /* Unregister this callback. */
-                        AssertPtr(pCtx->mpResp);
-                        int rc2 = pCtx->mpResp->setCallback(uMsg, NULL /* PFNGUESTDNDCALLBACK */);
-                        if (RT_FAILURE(rc2))
-                            LogFlowFunc(("Error: Unable to unregister callback for message %RU32, rc=%Rrc\n", uMsg, rc2));
-                    }
-
                     delete pMsg;
-                }
             }
             catch(std::bad_alloc & /*e*/)
@@ -866 +874 @@
                 rc = VERR_NO_MEMORY;
             }
+            break;
+        }
+        case DragAndDropSvc::GUEST_DND_GH_EVT_ERROR:
+        {
+            DragAndDropSvc::PVBOXDNDCBEVTERRORDATA pCBData = reinterpret_cast<DragAndDropSvc::PVBOXDNDCBEVTERRORDATA>(pvParms);
+            AssertPtr(pCBData);
+            AssertReturn(sizeof(DragAndDropSvc::VBOXDNDCBEVTERRORDATA) == cbParms, VERR_INVALID_PARAMETER);
+            AssertReturn(DragAndDropSvc::CB_MAGIC_DND_GH_EVT_ERROR == pCBData->hdr.u32Magic, VERR_INVALID_PARAMETER);
+
+            pCtx->mpResp->reset();
+            rc = pCtx->mpResp->setProgress(100, DragAndDropSvc::DND_PROGRESS_ERROR, pCBData->rc);
+            if (RT_SUCCESS(rc))
+                rc = pCBData->rc;
             break;
         }
@@ -917 +938 @@
     }
 
-    if (fNotify)
-    {
-        int rc2 = pCtx->mCallback.Notify(rc);
+    if (RT_FAILURE(rc))
+    {
+        switch (rc)
+        {
+            case VERR_NO_DATA:
+                LogRel2(("DnD: Transfer complete\n"));
+                break;
+
+            case VERR_CANCELLED:
+                LogRel2(("DnD: Transfer canceled\n"));
+                break;
+
+            default:
+                LogRel(("DnD: Error %Rrc occurred, aborting transfer\n", rc));
+                break;
+        }
+
+        /* Unregister this callback. */
+        AssertPtr(pCtx->mpResp);
+        int rc2 = pCtx->mpResp->setCallback(uMsg, NULL /* PFNGUESTDNDCALLBACK */);
+        AssertRC(rc2);
+
+        /* Notify waiters. */
+        rc2 = pCtx->mCallback.Notify(rc);
         AssertRC(rc2);
     }