ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: If multiple clipboard formats can be exported, use the first available one.

Browse Source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2016-09-23 12:20:32 +09:00
parent cc7abfdfda
commit df9ff6872c
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dlls/winex11.drv/clipboard.c
View File

@ -1793,27 +1793,37 @@ static BOOL export_targets( Display *display, Window win, Atom prop, Atom target
*/ */
static BOOL export_selection( Display *display, Window win, Atom prop, Atom target ) static BOOL export_selection( Display *display, Window win, Atom prop, Atom target )
{ {
struct clipboard_format *format = X11DRV_CLIPBOARD_LookupProperty( NULL, target ); struct clipboard_format *format;
HANDLE handle = 0; HANDLE handle = 0;
BOOL ret = FALSE; BOOL open = FALSE, ret = FALSE;
if (!format || !format->export) return FALSE; LIST_FOR_EACH_ENTRY( format, &format_list, struct clipboard_format, entry )
TRACE( "win %lx prop %s target %s exporting %s\n", win,
debugstr_xatom( prop ), debugstr_xatom( target ), debugstr_format( format->id ) );
if (!format->id) return format->export( display, win, prop, target, 0 );
if (!OpenClipboard( 0 ))
{ {
ERR( "failed to open clipboard for %s\n", debugstr_format( format->id )); if (format->atom != target) continue;
return FALSE; if (!format->export) continue;
if (!format->id)
{
TRACE( "win %lx prop %s target %s\n", win, debugstr_xatom( prop ), debugstr_xatom( target ));
ret = format->export( display, win, prop, target, 0 );
break;
}
if (!open && !(open = OpenClipboard( 0 )))
{
ERR( "failed to open clipboard for %s\n", debugstr_xatom( target ));
return FALSE;
}
if ((handle = GetClipboardData( format->id )))
{
TRACE( "win %lx prop %s target %s exporting %s %p\n",
win, debugstr_xatom( prop ), debugstr_xatom( target ),
debugstr_format( format->id ), handle );
ret = format->export( display, win, prop, target, handle );
break;
}
/* keep looking for another Win32 format mapping to the same target */
} }
if (open) CloseClipboard();
if ((handle = GetClipboardData( format->id )))
ret = format->export( display, win, prop, target, handle );
CloseClipboard();
return ret; return ret;
} }