Changeset 90054 in vbox for trunk

Timestamp:

Jul 6, 2021 10:55:23 AM (4 years ago)

Author:

vboxsync

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

145548

Message:

VBoxSharedClipboard/win: Replaced SharedClipboardWinAnnounceFormats with SharedClipboardWinClearAndAnnounceFormats that does all the necessary work. Documented hWndClipboardOwnerUs more accurately. bugref:9998

Location:

trunk

Files:

• include/VBox/GuestHost/SharedClipboard-win.h (modified) (2 diffs)
• src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (1 diff)
• src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp (modified) (3 diffs)
• src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp (modified) (1 diff)

trunk/include/VBox/GuestHost/SharedClipboard-win.h

@@ -111 +111 @@
     /** Window handle which is next to us in the clipboard chain. */
     HWND               hWndNextInChain;
-    /** Window handle of the clipboard owner *if* we are the owner. */
+    /** Window handle of the clipboard owner *if* we are the owner.
+     * @todo r=bird: Ignore the misleading statement above.  This is only set to
+     * NULL by the initialization code and then it's set to the clipboard owner
+     * after we announce data to the clipboard.  So, essentially this will be our
+     * windows handle or NULL.  End of story. */
     HWND               hWndClipboardOwnerUs;
     /** Structure for maintaining the new clipboard API. */
@@ -152 +156 @@
 int SharedClipboardWinHandleWMTimer(PSHCLWINCTX pWinCtx);
 
-int SharedClipboardWinAnnounceFormats(PSHCLWINCTX pWinCtx, SHCLFORMATS fFormats);
+int SharedClipboardWinClearAndAnnounceFormats(PSHCLWINCTX pWinCtx, SHCLFORMATS fFormats, HWND hWnd);
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
 int SharedClipboardWinTransferCreate(PSHCLWINCTX pWinCtx, PSHCLTRANSFER pTransfer);

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

@@ -519 +519 @@
                 {
 #endif
-                    int rc = SharedClipboardWinOpen(hwnd);
-                    if (RT_SUCCESS(rc))
-                    {
-                        SharedClipboardWinClear();
-
-                        rc = SharedClipboardWinAnnounceFormats(pWinCtx, fFormats);
-                    }
-
-                    SharedClipboardWinClose();
-
+                    SharedClipboardWinClearAndAnnounceFormats(pWinCtx, fFormats, hwnd);
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
                 }

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

@@ -819 +819 @@
  * @param   fFormats            Clipboard format(s) to announce.
  */
-int SharedClipboardWinAnnounceFormats(PSHCLWINCTX pWinCtx, SHCLFORMATS fFormats)
+static int sharedClipboardWinAnnounceFormats(PSHCLWINCTX pWinCtx, SHCLFORMATS fFormats)
 {
     LogFunc(("fFormats=0x%x\n", fFormats));
@@ -893 +893 @@
 }
 
+/**
+ * Opens the clipboard, clears it, announces @a fFormats and closes it.
+ *
+ * The actual rendering (setting) of the clipboard data will be done later with
+ * a separate WM_RENDERFORMAT message.
+ *
+ * @returns VBox status code. VERR_NOT_SUPPORTED if the format is not supported / handled.
+ * @param   pWinCtx     Windows context to use.
+ * @param   fFormats    Clipboard format(s) to announce.
+ * @param   hWnd        The window handle to use as owner.
+ */
+int SharedClipboardWinClearAndAnnounceFormats(PSHCLWINCTX pWinCtx, SHCLFORMATS fFormats, HWND hWnd)
+{
+    int rc = SharedClipboardWinOpen(hWnd);
+    if (RT_SUCCESS(rc))
+    {
+        SharedClipboardWinClear();
+
+        rc = sharedClipboardWinAnnounceFormats(pWinCtx, fFormats);
+        Assert(pWinCtx->hWndClipboardOwnerUs == hWnd || pWinCtx->hWndClipboardOwnerUs == NULL);
+
+        SharedClipboardWinClose();
+    }
+    return rc;
+}
+
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+
 /**
  * Creates an Shared Clipboard transfer by announcing transfer data  (via IDataObject) to Windows.
@@ -1208 +1235 @@
     return rc;
 }
+
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
 

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp

@@ -383 +383 @@
             {
 #endif
-                int rc = SharedClipboardWinOpen(hWnd);
-                if (RT_SUCCESS(rc))
-                {
-                    SharedClipboardWinClear();
-
-                    rc = SharedClipboardWinAnnounceFormats(pWinCtx, fFormats);
-
-                    SharedClipboardWinClose();
-                }
-
+                int rc = SharedClipboardWinClearAndAnnounceFormats(pWinCtx, fFormats, hWnd);
                 if (RT_FAILURE(rc))
                     LogRel(("Shared Clipboard: Reporting clipboard formats %#x to Windows host failed with %Rrc\n", fFormats, rc));