Changeset 5558 in vbox

Timestamp:

Oct 30, 2007 12:57:20 PM (17 years ago)

Author:

vboxsync

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

25823

Message:

Windows host/guest clipboard fix.

Location:

trunk/src/VBox

Files:

• Additions/WINNT/VBoxService/VBoxClipboard.cpp (modified) (5 diffs)
• HostServices/SharedClipboard/win32.cpp (modified) (6 diffs)

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

@@ -39 +39 @@
 //    uint64_t u64LastSentCRC64;
     
-    volatile uint32_t u32Announcing;
-
 } VBOXCLIPBOARDCONTEXT;
 
@@ -336 +334 @@
             dprintf (("vboxClipboardProcessMsg: WM_DRAWCLIPBOARD, hwnd %p\n", pCtx->hwnd));
 
-            if (ASMAtomicCmpXchgU32 (&pCtx->u32Announcing, 0, 1) == false)
-            {
-                /* Could not do 1->0 transition. That means u32Announcing is 0. */
+            if (GetClipboardOwner () != hwnd)
+            {
+                /* Clipboard was updated by another application. */
                 vboxClipboardChanged (pCtx);
             }
@@ -532 +530 @@
                     dprintf(("window proc WM_USER: VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT\n"));
                     
-                    /* Prevent the WM_DRAWCLIPBOARD processing. Will be reset in WM_DRAWCLIPBOARD. */
-                    if (ASMAtomicCmpXchgU32 (&pCtx->u32Announcing, 1, 0) == true)
-                    {
-                        hClip = SetClipboardData (CF_UNICODETEXT, NULL);
-                    }
+                    hClip = SetClipboardData (CF_UNICODETEXT, NULL);
                 }
 
@@ -543 +537 @@
                     dprintf(("window proc WM_USER: VBOX_SHARED_CLIPBOARD_FMT_BITMAP\n"));
                     
-                    /* Prevent the WM_DRAWCLIPBOARD processing. Will be reset in WM_DRAWCLIPBOARD. */
-                    if (ASMAtomicCmpXchgU32 (&pCtx->u32Announcing, 1, 0) == true)
-                    {
-                        hClip = SetClipboardData (CF_DIB, NULL);
-                    }
+                    hClip = SetClipboardData (CF_DIB, NULL);
                 }
 
@@ -556 +546 @@
                     if (format != 0)
                     {
-                        /* Prevent the WM_DRAWCLIPBOARD processing. Will be reset in WM_DRAWCLIPBOARD. */
-                        if (ASMAtomicCmpXchgU32 (&pCtx->u32Announcing, 1, 0) == true)
-                        {
-                            hClip = SetClipboardData (format, NULL);
-                        }
+                        hClip = SetClipboardData (format, NULL);
                     }
                 }

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

@@ -43 +43 @@
     
     VBOXCLIPBOARDCLIENTDATA *pClient;
-    
-    volatile uint32_t u32Announcing;
 };
 
@@ -225 +223 @@
             Log(("WM_DRAWCLIPBOARD next %p\n", pCtx->hwndNextInChain));
 
-            if (ASMAtomicCmpXchgU32 (&pCtx->u32Announcing, 0, 1) == false)
-            {
-                /* Could not do 1->0 transition. That means u32Announcing is 0. */
+            if (GetClipboardOwner () != hwnd)
+            {
+                /* Clipboard was updated by another application. */
                 vboxClipboardChanged (pCtx);
             }
@@ -395 +393 @@
                     dprintf(("window proc WM_USER: VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT\n"));
                     
-                    /* Prevent the WM_DRAWCLIPBOARD processing. Will be reset in WM_DRAWCLIPBOARD. */
-                    if (ASMAtomicCmpXchgU32 (&pCtx->u32Announcing, 1, 0) == true)
-                    {
-                        hClip = SetClipboardData (CF_UNICODETEXT, NULL);
-                    }
+                    hClip = SetClipboardData (CF_UNICODETEXT, NULL);
                 }
 
@@ -406 +400 @@
                     dprintf(("window proc WM_USER: VBOX_SHARED_CLIPBOARD_FMT_BITMAP\n"));
                     
-                    /* Prevent the WM_DRAWCLIPBOARD processing. Will be reset in WM_DRAWCLIPBOARD. */
-                    if (ASMAtomicCmpXchgU32 (&pCtx->u32Announcing, 1, 0) == true)
-                    {
-                        hClip = SetClipboardData (CF_DIB, NULL);
-                    }
+                    hClip = SetClipboardData (CF_DIB, NULL);
                 }
 
@@ -419 +409 @@
                     if (format != 0)
                     {
-                        /* Prevent the WM_DRAWCLIPBOARD processing. Will be reset in WM_DRAWCLIPBOARD. */
-                        if (ASMAtomicCmpXchgU32 (&pCtx->u32Announcing, 1, 0) == true)
-                        {
-                            hClip = SetClipboardData (format, NULL);
-                        }
+                        hClip = SetClipboardData (format, NULL);
                     }
                 }
@@ -536 +522 @@
     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");