Changeset 4711 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

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

Author:

vboxsync

Message:

Fixed a shared clipboard problem on Windows.

File:

• trunk/src/VBox/HostServices/SharedClipboard/win32.cpp (modified) (11 diffs)

trunk/src/VBox/HostServices/SharedClipboard/win32.cpp

@@ -21 +21 @@
 #include <iprt/alloc.h>
 #include <iprt/string.h>
+#include <iprt/asm.h>
 #include <iprt/assert.h>
 #include <iprt/thread.h>
@@ -43 +44 @@
     VBOXCLIPBOARDCLIENTDATA *pClient;
     
-    bool fAnnouncing;
+    volatile uint32_t u32Announcing;
 };
 
@@ -224 +225 @@
             Log(("WM_DRAWCLIPBOARD next %p\n", pCtx->hwndNextInChain));
 
-            if (!pCtx->fAnnouncing)
-            {
+            if (ASMAtomicCmpXchgU32 (&pCtx->u32Announcing, 0, 1) == false)
+            {
+                /* Could not do 1->0 transition. That means u32Announcing is 0. */
                 vboxClipboardChanged (pCtx);
             }
@@ -381 +383 @@
             Log(("WM_USER u32Formats = %02X\n", u32Formats));
             
-            pCtx->fAnnouncing = true;
-
             if (OpenClipboard (hwnd))
             {
@@ -389 +389 @@
                 Log(("WM_USER emptied clipboard\n"));
             
-                HANDLE hClip;
+                HANDLE hClip = NULL;
 
                 if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
                 {
                     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);
+                    }
                 }
 
@@ -400 +405 @@
                 {
                     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);
+                    }
                 }
 
@@ -409 +419 @@
                     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);
+                        }
                     }
                 }
@@ -415 +429 @@
                 CloseClipboard();
 
-                dprintf(("window proc WM_USER: hClip %p\n", hClip));
+                dprintf(("window proc WM_USER: hClip %p, err %d\n", hClip, GetLastError ()));
             }
             else
@@ -421 +435 @@
                 dprintf(("window proc WM_USER: failed to open clipboard\n"));
             }
-            
-            pCtx->fAnnouncing = false;
-            
         } break;
 
@@ -525 +536 @@
     g_ctx.hRenderEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
     
+    g_ctx.u32Announcing = 0;
+    
     rc = RTThreadCreate (&g_ctx.thread, VBoxClipboardThread, NULL, 65536, 
                          RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "SHCLIP");
@@ -605 +618 @@
     if (OpenClipboard (pClient->pCtx->hwnd))
     {
+        dprintf(("Clipboard opened.\n"));
+        
         if (u32Format & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
         {