Changeset 80965 in vbox for trunk/src

Timestamp:

Sep 24, 2019 9:49:34 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Use take critical section in WM_CLIPBOARDUPDATE in VBoxTray.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

@@ -433 +433 @@
     switch (msg)
     {
-       case WM_CLIPBOARDUPDATE:
-       {
-           const HWND hWndClipboardOwner = GetClipboardOwner();
-
-           LogFunc(("WM_CLIPBOARDUPDATE: hWndOldClipboardOwner=%p, hWndNewClipboardOwner=%p\n",
-                    pWinCtx->hWndClipboardOwnerUs, hWndClipboardOwner));
-
-           if (pWinCtx->hWndClipboardOwnerUs != hWndClipboardOwner)
-           {
-               /* Clipboard was updated by another application.
-                * Report available formats to the host. */
-               SHCLFORMATDATA Formats;
-               int rc = SharedClipboardWinGetFormats(&pCtx->Win, &Formats);
-               if (RT_SUCCESS(rc))
-               {
-                   LogFunc(("WM_CLIPBOARDUPDATE: Reporting formats 0x%x\n", Formats.uFormats));
-                   rc = VbglR3ClipboardFormatsSend(&pCtx->CmdCtx, &Formats);
-               }
-           }
-
-           break;
-       }
+        case WM_CLIPBOARDUPDATE:
+        {
+            LogFunc(("WM_CLIPBOARDUPDATE: Waiting ...\n"));
+
+            int rc = RTCritSectEnter(&pWinCtx->CritSect);
+            if (RT_SUCCESS(rc))
+            {
+                const HWND hWndClipboardOwner = GetClipboardOwner();
+
+                LogFunc(("WM_CLIPBOARDUPDATE: hWndOldClipboardOwner=%p, hWndNewClipboardOwner=%p\n",
+                         pWinCtx->hWndClipboardOwnerUs, hWndClipboardOwner));
+
+                if (pWinCtx->hWndClipboardOwnerUs != hWndClipboardOwner)
+                {
+                    int rc2 = RTCritSectLeave(&pWinCtx->CritSect);
+                    AssertRC(rc2);
+
+                    /* Clipboard was updated by another application.
+                     * Report available formats to the host. */
+                    SHCLFORMATDATA Formats;
+                    int rc = SharedClipboardWinGetFormats(&pCtx->Win, &Formats);
+                    if (RT_SUCCESS(rc))
+                    {
+                        LogFunc(("WM_CLIPBOARDUPDATE: Reporting formats 0x%x\n", Formats.uFormats));
+                        rc = VbglR3ClipboardFormatsSend(&pCtx->CmdCtx, &Formats);
+                    }
+                }
+                else
+                {
+                    int rc2 = RTCritSectLeave(&pWinCtx->CritSect);
+                    AssertRC(rc2);
+                }
+            }
+
+            if (RT_FAILURE(rc))
+                LogRel(("Shared Clipboard: WM_CLIPBOARDUPDATE failed with %Rrc\n", rc));
+
+            break;
+        }
 
        case WM_CHANGECBCHAIN: