commit b3569e7015ed486bbbd01db8aa9a5ccad6d58364
author Dmitry Timoshkov <dmitry@codeweavers.com> Fri Jun 25 02:55:37 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Jun 25 02:55:37 2004 +0000
tree e9d8e5cce03f10f55c83d18ff8e42af75ac52842
parent 0377462460c9548043faedafa4a91bf51682fa41

Add a test case for clipboard functionality and fix some bugs revealed
by it.

server/clipboard.c

diff --git a/server/clipboard.c b/server/clipboard.c
index 7d54e57..5b9d6b4 100644
--- a/server/clipboard.c
+++ b/server/clipboard.c
@@ -80,26 +80,22 @@
 
 static int set_clipboard_owner(user_handle_t win, int clear)
 {
-    if (cbthread == current)
-    {
-        if (!clear)
-        {
-            cbowner = current;
-            owner = win;
-        }
-        else
-        {
-            cbowner = 0;
-            owner = 0;
-        }
-        seqno++;
-        return 1;
-    }
-    else
+    if (cbowner && cbowner != current)
     {
         set_error(STATUS_WAS_LOCKED);
         return 0;
     }
+    else if (!clear)
+    {
+        owner = win;
+        cbowner = current;
+    }
+    else
+    {
+        owner = 0;
+        cbowner = NULL;
+    }
+    return 1;
 }
 
 
@@ -124,11 +120,24 @@
 
     if (req->flags & SET_CB_OPEN)
     {
+        if (cbthread)
+        {
+            /* clipboard already opened */
+            set_error(STATUS_WAS_LOCKED);
+            return;
+        }
+
         if (!set_clipboard_window(req->clipboard, 0))
             return;
     }
     else if (req->flags & SET_CB_CLOSE)
     {
+        if (cbthread != current)
+        {
+            set_win32_error(ERROR_CLIPBOARD_NOT_OPEN);
+            return;
+        }
+
         if (!set_clipboard_window(0, 1))
             return;
     }