Fix clipboard regression

Ulrich Czekalla ulrich at codeweavers.com
Mon May 10 10:12:08 CDT 2004


ChangeLog:
    Ulrich Czekalla <ulrich at codeweavers.com>
    Fix clipboard regression
-------------- next part --------------
Index: windows/clipboard.c
===================================================================
RCS file: /home/wine/wine/windows/clipboard.c,v
retrieving revision 1.60
diff -u -w -r1.60 clipboard.c
--- windows/clipboard.c	6 May 2004 23:40:30 -0000	1.60
+++ windows/clipboard.c	10 May 2004 15:10:25 -0000
@@ -557,15 +557,10 @@
 
     TRACE("(%04X, %04x) !\n", wFormat, hData);
 
-    if (!CLIPBOARD_GetClipboardInfo(&cbinfo) || !(cbinfo.flags & CB_OPEN))
-    {
-        WARN("Clipboard not opened by calling task. Operation failed.\n");
-        return 0;
-    }
-
     /* If it's not owned, data can only be set if the format doesn't exists
        and its rendering is not delayed */
-    if (!(cbinfo.flags & CB_OWNER) && !hData)
+    if (!CLIPBOARD_GetClipboardInfo(&cbinfo) ||
+        (!(cbinfo.flags & CB_OWNER) && !hData))
     {
         WARN("Clipboard not owned by calling task. Operation failed.\n");
         return 0;
@@ -592,15 +587,10 @@
 
     TRACE("(%04X, %p) !\n", wFormat, hData);
 
-    if (!CLIPBOARD_GetClipboardInfo(&cbinfo) || !(cbinfo.flags & CB_OPEN))
-    {
-        WARN("Clipboard not opened by calling task. Operation failed.\n");
-        return 0;
-    }
-
     /* If it's not owned, data can only be set if the format isn't
        available and its rendering is not delayed */
-    if (!(cbinfo.flags & CB_OWNER) && !hData)
+    if (!CLIPBOARD_GetClipboardInfo(&cbinfo) ||
+       (!(cbinfo.flags & CB_OWNER) && !hData))
     {
         WARN("Clipboard not owned by calling task. Operation failed.\n");
         return 0;


More information about the wine-patches mailing list