Changeset 4711 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Sep 11, 2007 1:49:44 PM (18 years ago)

Author:

vboxsync

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

24381

Message:

Fixed a shared clipboard problem on Windows.

File:

• trunk/src/VBox/Additions/WINNT/VBoxService/VBoxClipboard.cpp (modified) (10 diffs)

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

@@ -20 +20 @@
 #include <VBox/HostServices/VBoxClipboardSvc.h>
 #include "helpers.h"
+#include <iprt/asm.h>
 
 typedef struct _VBOXCLIPBOARDCONTEXT
@@ -38 +39 @@
 //    uint64_t u64LastSentCRC64;
     
-    bool     fAnnouncing;
+    volatile uint32_t u32Announcing;
 
 } VBOXCLIPBOARDCONTEXT;
@@ -335 +336 @@
             dprintf (("vboxClipboardProcessMsg: WM_DRAWCLIPBOARD, hwnd %p\n", pCtx->hwnd));
 
-            if (!pCtx->fAnnouncing)
-            {
+            if (ASMAtomicCmpXchgU32 (&pCtx->u32Announcing, 0, 1) == false)
+            {
+                /* Could not do 1->0 transition. That means u32Announcing is 0. */
                 vboxClipboardChanged (pCtx);
             }
@@ -356 +358 @@
             UINT format = (UINT)wParam;
 
+            dprintf (("vboxClipboardProcessMsg: WM_RENDERFORMAT, format %x\n", format));
+            
             switch (format)
             {
@@ -518 +522 @@
             uint32_t u32Formats = (uint32_t)lParam;
             
-            /* Prevent the WM_DRAWCLIPBOARD processing. */
-            pCtx->fAnnouncing = true;
-
             if (OpenClipboard (hwnd))
             {
@@ -530 +531 @@
                 {
                     dprintf(("window proc WM_USER: VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT\n"));
-                    hClip = SetClipboardData (CF_UNICODETEXT, NULL);
+                    
+                    /* Prevent the WM_DRAWCLIPBOARD processing. Will be reset in WM_DRAWCLIPBOARD. */
+                    if (ASMAtomicCmpXchgU32 (&pCtx->u32Announcing, 1, 0) == true)
+                    {
+                        hClip = SetClipboardData (CF_UNICODETEXT, NULL);
+                    }
                 }
 
@@ -536 +542 @@
                 {
                     dprintf(("window proc WM_USER: VBOX_SHARED_CLIPBOARD_FMT_BITMAP\n"));
-                    hClip = SetClipboardData (CF_DIB, NULL);
+                    
+                    /* Prevent the WM_DRAWCLIPBOARD processing. Will be reset in WM_DRAWCLIPBOARD. */
+                    if (ASMAtomicCmpXchgU32 (&pCtx->u32Announcing, 1, 0) == true)
+                    {
+                        hClip = SetClipboardData (CF_DIB, NULL);
+                    }
                 }
 
@@ -545 +556 @@
                     if (format != 0)
                     {
-                        hClip = SetClipboardData (format, NULL);
+                        /* Prevent the WM_DRAWCLIPBOARD processing. Will be reset in WM_DRAWCLIPBOARD. */
+                        if (ASMAtomicCmpXchgU32 (&pCtx->u32Announcing, 1, 0) == true)
+                        {
+                            hClip = SetClipboardData (format, NULL);
+                        }
                     }
                 }
@@ -551 +566 @@
                 CloseClipboard();
 
-                dprintf(("window proc WM_USER: hClip %p\n", hClip));
+                dprintf(("window proc WM_USER: hClip %p, err %d\n", hClip, GetLastError ()));
             }
             else
@@ -557 +572 @@
                 dprintf(("window proc WM_USER: failed to open clipboard\n"));
             }
-            
-            pCtx->fAnnouncing = false;
         } break;