Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
99d5b75c
Commit
99d5b75c
authored
Aug 23, 2016
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winex11: Don't disallow replacing unowned formats.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d9df9770
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
20 deletions
+2
-20
clipboard.c
dlls/user32/tests/clipboard.c
+0
-1
clipboard.c
dlls/winex11.drv/clipboard.c
+2
-19
No files found.
dlls/user32/tests/clipboard.c
View file @
99d5b75c
...
...
@@ -93,7 +93,6 @@ static void set_clipboard_data_process( int arg )
todo_wine_if
(
arg
==
1
||
arg
==
3
)
ok
(
IsClipboardFormatAvailable
(
CF_WAVE
),
"process %u: CF_WAVE not available
\n
"
,
arg
);
ret
=
SetClipboardData
(
CF_WAVE
,
GlobalAlloc
(
GMEM_DDESHARE
|
GMEM_ZEROINIT
,
100
));
todo_wine_if
(
arg
==
2
||
arg
==
4
)
ok
(
ret
!=
0
,
"process %u: SetClipboardData failed err %u
\n
"
,
arg
,
GetLastError
()
);
}
else
...
...
dlls/winex11.drv/clipboard.c
View file @
99d5b75c
...
...
@@ -3013,26 +3013,9 @@ void CDECL X11DRV_EmptyClipboard(void)
*/
BOOL
CDECL
X11DRV_SetClipboardData
(
UINT
wFormat
,
HANDLE
hData
,
BOOL
owner
)
{
DWORD
flags
=
0
;
BOOL
bResult
=
TRUE
;
if
(
!
owner
)
X11DRV_CLIPBOARD_UpdateCache
();
/* If it's not owned, data can only be set if the format data is not already owned */
if
(
!
owner
)
{
LPWINE_CLIPDATA
lpRender
;
X11DRV_CLIPBOARD_UpdateCache
();
if
(((
lpRender
=
X11DRV_CLIPBOARD_LookupData
(
wFormat
))
&&
!
(
lpRender
->
wFlags
&
CF_FLAG_UNOWNED
)))
bResult
=
FALSE
;
else
flags
=
CF_FLAG_UNOWNED
;
}
bResult
&=
X11DRV_CLIPBOARD_InsertClipboardData
(
wFormat
,
hData
,
flags
,
NULL
,
TRUE
);
return
bResult
;
return
X11DRV_CLIPBOARD_InsertClipboardData
(
wFormat
,
hData
,
0
,
NULL
,
TRUE
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment