Changeset 81025 in vbox for trunk/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp

Timestamp:

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

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Update.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp (modified) (3 diffs)

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);