Skip to content

W
wine-winehq
Commit 4e10f0e0 authored by Ulrich Czekalla's avatar Ulrich Czekalla Committed by Alexandre Julliard
Browse files
Options

Fix clipboard regression.

parent 683ea2f2
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 14 deletions
windows/clipboard.c
View file @ 4e10f0e0
...@@ -557,15 +557,10 @@ HANDLE16 WINAPI SetClipboardData16(UINT16 wFormat, HANDLE16 hData) ...@@ -557,15 +557,10 @@ HANDLE16 WINAPI SetClipboardData16(UINT16 wFormat, HANDLE16 hData)
TRACE("(%04X, %04x) !\n", wFormat, hData); 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 /* If it's not owned, data can only be set if the format doesn't exists
and its rendering is not delayed */ 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"); WARN("Clipboard not owned by calling task. Operation failed.\n");
return 0; return 0;
...@@ -592,15 +587,10 @@ HANDLE WINAPI SetClipboardData(UINT wFormat, HANDLE hData) ...@@ -592,15 +587,10 @@ HANDLE WINAPI SetClipboardData(UINT wFormat, HANDLE hData)
TRACE("(%04X, %p) !\n", wFormat, hData); 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 /* If it's not owned, data can only be set if the format isn't
available and its rendering is not delayed */ 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"); WARN("Clipboard not owned by calling task. Operation failed.\n");
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment