commit 18fe91d8d2a0b06911edf3c4b9e109b959fd71f1
author Ulrich Czekalla <ulrich@codeweavers.com> Tue Mar 01 10:43:58 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Mar 01 10:43:58 2005 +0000
tree 5ac655e0847e1eef8e8eb47f15b0be60f40d9646
parent 4cf9dd3d473cd721c8af6512f3d1698b77fbde8b

If unexpected condition occurs just report an error.

dlls/x11drv/clipboard.c

diff --git a/dlls/x11drv/clipboard.c b/dlls/x11drv/clipboard.c
index 8532f28..cb0d96b 100644
--- a/dlls/x11drv/clipboard.c
+++ b/dlls/x11drv/clipboard.c
@@ -1610,26 +1610,7 @@
     {
         ERR("Received request to cache selection but process is owner=(%08x)\n", 
             (unsigned) selectionWindow);
-
-        selectionAcquired  = S_NOSELECTION;
-
-        wine_tsx11_lock();
-        if (XGetSelectionOwner(display,XA_PRIMARY) == selectionWindow)
-	    selectionAcquired |= S_PRIMARY;
-
-        if (XGetSelectionOwner(display,x11drv_atom(CLIPBOARD)) == selectionWindow)
-	    selectionAcquired |= S_CLIPBOARD;
-        wine_tsx11_unlock();
-
-        if (!(selectionAcquired == (S_PRIMARY | S_CLIPBOARD)))
-        {
-            WARN("Lost selection but process didn't process SelectClear\n");
-            selectionWindow = None;
-        }
-	else
-	{
-            return -1; /* Prevent self request */
-	}
+        return -1; /* Prevent self request */
     }
 
     if (lpcbinfo->flags & CB_OWNER)
@@ -2175,23 +2156,7 @@
     }
     else
     {
-        WARN("Received request to acquire selection but process is already owner=(%08x)\n", (unsigned) selectionWindow);
-
-        selectionAcquired  = S_NOSELECTION;
-
-        wine_tsx11_lock();
-        if (XGetSelectionOwner(display,XA_PRIMARY) == selectionWindow)
-	    selectionAcquired |= S_PRIMARY;
-
-        if (XGetSelectionOwner(display,x11drv_atom(CLIPBOARD)) == selectionWindow)
-	    selectionAcquired |= S_CLIPBOARD;
-        wine_tsx11_unlock();
-
-        if (!(selectionAcquired == (S_PRIMARY | S_CLIPBOARD)))
-	{
-            WARN("Lost selection but process didn't process SelectClear\n");
-            selectionWindow = None;
-	}
+        ERR("Received request to acquire selection but process is already owner=(%08x)\n", (unsigned) selectionWindow);
     }
 }