Changeset 81025 in vbox for trunk/src/VBox/GuestHost/SharedClipboard

Timestamp:

Sep 26, 2019 4:13:25 PM (5 years ago)

Author:

vboxsync

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

133628

Message:

Shared Clipboard/Transfers: Update.

Location:

trunk/src/VBox/GuestHost/SharedClipboard

Files:

• ClipboardDataObjectImpl-win.cpp (modified) (3 diffs)
• clipboard-common.cpp (modified) (1 diff)
• clipboard-transfers.cpp (modified) (4 diffs)
• clipboard-win.cpp (modified) (3 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp

@@ -367 +367 @@
                 if (ASMAtomicReadBool(&pTransfer->Thread.fStop))
                 {
-                    LogRel2(("Shared Clipboard: Stopping transfer calculating ...\n"));
+                    LogRel2(("Shared Clipboard: Stopping transfer calculation ...\n"));
                     break;
                 }
@@ -378 +378 @@
             pRootList = NULL;
 
-            if (RT_SUCCESS(rc))
+            if (   RT_SUCCESS(rc)
+                && !ASMAtomicReadBool(&pTransfer->Thread.fStop))
             {
                 LogRel2(("Shared Clipboard: Transfer calculation complete (%zu root entries)\n", pThis->m_lstEntries.size()));
@@ -402 +403 @@
                    LogRel(("Shared Clipboard: No transfer root entries found -- should not happen, please file a bug report\n"));
             }
-            else
+            else if (RT_FAILURE(rc))
                 LogRel(("Shared Clipboard: Transfer failed with %Rrc\n", rc));
         }

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp

@@ -890 +890 @@
         RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_MSG_PEEK_WAIT);
         RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_MSG_GET);
-        RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_STATUS);
         RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_REPLY);
         RT_CASE_RET_STR(VBOX_SHCL_GUEST_FN_ROOT_LIST_HDR_READ);

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp

@@ -1178 +1178 @@
         if (pTransfer->Callbacks.pfnTransferInitialize)
         {
-            SHCLTRANSFERCALLBACKDATA Data = { pTransfer, pTransfer->Callbacks.pvUser };
+            SHCLTRANSFERCALLBACKDATA Data = { pTransfer, pTransfer->Callbacks.pvUser, pTransfer->Callbacks.cbUser };
             rc = pTransfer->Callbacks.pfnTransferInitialize(&Data);
         }
@@ -2285 +2285 @@
     if (pTransfer->Callbacks.pfnTransferStart)
     {
-        SHCLTRANSFERCALLBACKDATA Data = { pTransfer, pTransfer->Callbacks.pvUser };
+        SHCLTRANSFERCALLBACKDATA Data = { pTransfer, pTransfer->Callbacks.pvUser, pTransfer->Callbacks.cbUser };
         rc = pTransfer->Callbacks.pfnTransferStart(&Data);
     }
@@ -2326 +2326 @@
 
     pTransfer->Callbacks.pvUser = pCallbacks->pvUser;
+    pTransfer->Callbacks.cbUser = pCallbacks->cbUser;
 }
 
@@ -2638 +2639 @@
     AssertPtrReturnVoid(pTransferCtx);
 
-    LogFlowFunc(("pTransferCtx=%p, cTransfers=%RU32, cRunning=%RU32\n",
+    LogFlowFunc(("pTransferCtx=%p, cTransfers=%RU16 cRunning=%RU16\n",
                  pTransferCtx, pTransferCtx->cTransfers, pTransferCtx->cRunning));
 
-    /* Remove all transfers which are not in a running state (e.g. only announced). */
-    PSHCLTRANSFER pTransfer, pTransferNext;
-    RTListForEachSafe(&pTransferCtx->List, pTransfer, pTransferNext, SHCLTRANSFER, Node)
-    {
-        if (SharedClipboardTransferGetStatus(pTransfer) != SHCLTRANSFERSTATUS_STARTED)
-        {
-            SharedClipboardTransferDestroy(pTransfer);
-            RTListNodeRemove(&pTransfer->Node);
-
-            RTMemFree(pTransfer);
-            pTransfer = NULL;
-
-            Assert(pTransferCtx->cTransfers);
-            pTransferCtx->cTransfers--;
+    if (!RTListIsEmpty(&pTransferCtx->List))
+    {
+        /* Remove all transfers which are not in a running state (e.g. only announced). */
+        PSHCLTRANSFER pTransfer, pTransferNext;
+        RTListForEachSafe(&pTransferCtx->List, pTransfer, pTransferNext, SHCLTRANSFER, Node)
+        {
+            if (SharedClipboardTransferGetStatus(pTransfer) != SHCLTRANSFERSTATUS_STARTED)
+            {
+                SharedClipboardTransferDestroy(pTransfer);
+                RTListNodeRemove(&pTransfer->Node);
+
+                RTMemFree(pTransfer);
+                pTransfer = NULL;
+
+                Assert(pTransferCtx->cTransfers);
+                pTransferCtx->cTransfers--;
+            }
         }
     }

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp

@@ -181 +181 @@
     if (!pWinCtx)
         return;
+
+    LogFlowFuncEnter();
 
     if (RTCritSectIsInitialized(&pWinCtx->CritSect))
@@ -894 +896 @@
     AssertPtrReturn(pTransfer, VERR_INVALID_POINTER);
 
-    LogFlowFuncEnter();
-
-    int rc;
+    LogFlowFunc(("pWinCtx=%p\n", pWinCtx));
 
     AssertReturn(pTransfer->pvUser == NULL, VERR_WRONG_ORDER);
 
-    SharedClipboardWinTransferCtx *pWinURITransferCtx = new SharedClipboardWinTransferCtx();
-    if (pWinURITransferCtx)
-    {
-        pTransfer->pvUser = pWinURITransferCtx;
-        pTransfer->cbUser = sizeof(SharedClipboardWinTransferCtx);
-
-        pWinURITransferCtx->pDataObj = new SharedClipboardWinDataObject(pTransfer);
-        if (pWinURITransferCtx->pDataObj)
-        {
-            rc = pWinURITransferCtx->pDataObj->Init();
-            if (RT_SUCCESS(rc))
+    /* Make sure to enter the critical section before setting the clipboard data, as otherwise WM_CLIPBOARDUPDATE
+     * might get called *before* we had the opportunity to set pWinCtx->hWndClipboardOwnerUs below. */
+    int rc = RTCritSectEnter(&pWinCtx->CritSect);
+    if (RT_SUCCESS(rc))
+    {
+        SharedClipboardWinTransferCtx *pWinURITransferCtx = new SharedClipboardWinTransferCtx();
+        if (pWinURITransferCtx)
+        {
+            pTransfer->pvUser = pWinURITransferCtx;
+            pTransfer->cbUser = sizeof(SharedClipboardWinTransferCtx);
+
+            pWinURITransferCtx->pDataObj = new SharedClipboardWinDataObject(pTransfer);
+            if (pWinURITransferCtx->pDataObj)
             {
-                SharedClipboardWinClose();
-                /* Note: Clipboard must be closed first before calling OleSetClipboard(). */
-
-                /** @todo There is a potential race between SharedClipboardWinClose() and OleSetClipboard(),
-                 *        where another application could own the clipboard (open), and thus the call to
-                 *        OleSetClipboard() will fail. Needs (better) fixing. */
-                HRESULT hr = S_OK;
-
-                for (unsigned uTries = 0; uTries < 3; uTries++)
+                rc = pWinURITransferCtx->pDataObj->Init();
+                if (RT_SUCCESS(rc))
                 {
-                    /* Make sure to enter the critical section before setting the clipboard data, as otherwise WM_CLIPBOARDUPDATE
-                     * might get called *before* we had the opportunity to set pWinCtx->hWndClipboardOwnerUs below. */
-                    rc = RTCritSectEnter(&pWinCtx->CritSect);
-                    if (RT_SUCCESS(rc))
+                    SharedClipboardWinClose();
+                    /* Note: Clipboard must be closed first before calling OleSetClipboard(). */
+
+                    /** @todo There is a potential race between SharedClipboardWinClose() and OleSetClipboard(),
+                     *        where another application could own the clipboard (open), and thus the call to
+                     *        OleSetClipboard() will fail. Needs (better) fixing. */
+                    HRESULT hr = S_OK;
+
+                    for (unsigned uTries = 0; uTries < 3; uTries++)
                     {
                         hr = OleSetClipboard(pWinURITransferCtx->pDataObj);
@@ -939 +939 @@
                             pWinCtx->hWndClipboardOwnerUs = GetClipboardOwner();
 
-                            rc = RTCritSectLeave(&pWinCtx->CritSect);
-                            AssertRC(rc);
+                            LogFlowFunc(("hWndClipboardOwnerUs=%p\n", pWinCtx->hWndClipboardOwnerUs));
                             break;
                         }
+
+                        LogFlowFunc(("Failed with %Rhrc (try %u/3)\n", hr, uTries + 1));
+                        RTThreadSleep(500); /* Wait a bit. */
                     }
 
-                    rc = RTCritSectLeave(&pWinCtx->CritSect);
-                    AssertRCBreak(rc);
-
-                    LogFlowFunc(("Failed with %Rhrc (try %u/3)\n", hr, uTries + 1));
-                    RTThreadSleep(500); /* Wait a bit. */
-                }
-
-                if (FAILED(hr))
-                {
-                    rc = VERR_ACCESS_DENIED; /** @todo Fudge; fix this. */
-                    LogRel(("Shared Clipboard: Failed with %Rhrc when setting data object to clipboard\n", hr));
+                    if (FAILED(hr))
+                    {
+                        rc = VERR_ACCESS_DENIED; /** @todo Fudge; fix this. */
+                        LogRel(("Shared Clipboard: Failed with %Rhrc when setting data object to clipboard\n", hr));
+                    }
                 }
             }
+            else
+                rc = VERR_NO_MEMORY;
         }
         else
             rc = VERR_NO_MEMORY;
-    }
-    else
-        rc = VERR_NO_MEMORY;
+
+        int rc2 = RTCritSectLeave(&pWinCtx->CritSect);
+        AssertRC(rc2);
+    }
 
     LogFlowFuncLeaveRC(rc);