September 2016 - Wine-commits

Alexandre Julliard : winex11: Add a helper function to register builtin clipboard formats.
by Alexandre Julliard 26 Sep '16

26 Sep '16

Module: wine Branch: master Commit: e9461b4567935c75ab1d6d48358de9dd06df85f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9461b4567935c75ab1d6d483… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 20:16:06 2016 +0900 winex11: Add a helper function to register builtin clipboard formats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 47 ++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index cc4f92f..602a69a 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -342,6 +342,31 @@ static struct clipboard_format *find_x11_format( Atom atom ) /************************************************************************** + * register_builtin_formats + */ +static void register_builtin_formats(void) +{ + struct clipboard_format *formats; + unsigned int i; + + if (!(formats = HeapAlloc( GetProcessHeap(), 0, NB_BUILTIN_FORMATS * sizeof(*formats)))) return; + + for (i = 0; i < NB_BUILTIN_FORMATS; i++) + { + if (builtin_formats[i].name) + formats[i].id = RegisterClipboardFormatW( builtin_formats[i].name ); + else + formats[i].id = builtin_formats[i].id; + + formats[i].atom = GET_ATOM(builtin_formats[i].data); + formats[i].import = builtin_formats[i].import; + formats[i].export = builtin_formats[i].export; + list_add_tail( &format_list, &formats[i].entry ); + } +} + + +/************************************************************************** * register_formats */ static void register_formats( const UINT *ids, const Atom *atoms, unsigned int count ) @@ -376,6 +401,8 @@ static void register_win32_formats( const UINT *ids, UINT size ) Atom atoms[256]; WCHAR buffer[256]; + if (list_empty( &format_list)) register_builtin_formats(); + while (size) { for (count = 0; count < 256 && size; ids++, size--) @@ -410,6 +437,8 @@ static void register_x11_formats( const Atom *atoms, UINT size ) Atom new_atoms[256]; WCHAR buffer[256]; + if (list_empty( &format_list)) register_builtin_formats(); + while (size) { for (count = 0; count < 256 && size; atoms++, size--) @@ -442,23 +471,7 @@ static void register_x11_formats( const Atom *atoms, UINT size ) */ void X11DRV_InitClipboard(void) { - struct clipboard_format *formats; - UINT i; - - if (!(formats = HeapAlloc( GetProcessHeap(), 0, NB_BUILTIN_FORMATS * sizeof(*formats)))) return; - - for (i = 0; i < NB_BUILTIN_FORMATS; i++) - { - if (builtin_formats[i].name) - formats[i].id = RegisterClipboardFormatW( builtin_formats[i].name ); - else - formats[i].id = builtin_formats[i].id; - - formats[i].atom = GET_ATOM(builtin_formats[i].data); - formats[i].import = builtin_formats[i].import; - formats[i].export = builtin_formats[i].export; - list_add_tail( &format_list, &formats[i].entry ); - } + register_builtin_formats(); }

1 0

Alexandre Julliard : winex11: Remove the driver-side clipboard data storage.
by Alexandre Julliard 26 Sep '16

26 Sep '16

Module: wine Branch: master Commit: a46d7360123ab02b5bf9dfb9234c433e8c6ebcc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46d7360123ab02b5bf9dfb92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 20:24:47 2016 +0900 winex11: Remove the driver-side clipboard data storage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 412 +------------------------------------- dlls/winex11.drv/winex11.drv.spec | 6 - 2 files changed, 3 insertions(+), 415 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a46d7360123ab02b5bf9d…

1 0

Alexandre Julliard : winex11: Run a single clipboard manager thread per window station, inside the explorer process.
by Alexandre Julliard 26 Sep '16

26 Sep '16

Module: wine Branch: master Commit: a52d09198d3264c9c712a70de57446e6183957dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52d09198d3264c9c712a70de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 20:27:40 2016 +0900 winex11: Run a single clipboard manager thread per window station, inside the explorer process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 423 ++++++++++++++++++++--------------------- dlls/winex11.drv/window.c | 6 +- dlls/winex11.drv/x11drv.h | 5 +- dlls/winex11.drv/x11drv_main.c | 2 - 4 files changed, 216 insertions(+), 220 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a52d09198d3264c9c712a…

1 0

Alexandre Julliard : winex11: Ignore X11 errors happening on the clipboard display connection.
by Alexandre Julliard 26 Sep '16

26 Sep '16

Module: wine Branch: master Commit: 4bbe8f90d47e9a9fffc7e471cd27fa7768636e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bbe8f90d47e9a9fffc7e471c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 21:06:14 2016 +0900 winex11: Ignore X11 errors happening on the clipboard display connection. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 17 +++++------------ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 3 +++ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 1b4817f..d0d301b 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -203,6 +203,8 @@ static ULONG64 last_clipboard_update; static struct clipboard_format **current_x11_formats; static unsigned int nb_current_x11_formats; +Display *clipboard_display = NULL; + static const char *debugstr_format( UINT id ) { WCHAR buffer[256]; @@ -259,11 +261,6 @@ static int is_atom_error( Display *display, XErrorEvent *event, void *arg ) return (event->error_code == BadAtom); } -static int is_window_error( Display *display, XErrorEvent *event, void *arg ) -{ - return (event->error_code == BadWindow); -} - /************************************************************************** * find_win32_format @@ -2007,12 +2004,12 @@ static DWORD WINAPI clipboard_thread( void *arg ) XSetWindowAttributes attr; WNDCLASSW class; MSG msg; - Display *display = thread_init_display(); if (!wait_clipboard_mutex()) return 0; + clipboard_display = thread_init_display(); attr.event_mask = PropertyChangeMask; - import_window = XCreateWindow( display, root_window, 0, 0, 1, 1, 0, CopyFromParent, + import_window = XCreateWindow( clipboard_display, root_window, 0, 0, 1, 1, 0, CopyFromParent, InputOutput, CopyFromParent, CWEventMask, &attr ); if (!import_window) { @@ -2039,7 +2036,7 @@ static DWORD WINAPI clipboard_thread( void *arg ) clipboard_thread_id = GetCurrentThreadId(); AddClipboardFormatListener( clipboard_hwnd ); register_builtin_formats(); - grab_win32_clipboard( display ); + grab_win32_clipboard( clipboard_display ); TRACE( "clipboard thread %04x running\n", GetCurrentThreadId() ); while (GetMessageW( &msg, 0, 0, 0 )) DispatchMessageW( &msg ); @@ -2075,8 +2072,6 @@ BOOL X11DRV_SelectionRequest( HWND hwnd, XEvent *xev ) XEvent result; Atom rprop = None; - X11DRV_expect_error( display, is_window_error, NULL ); - TRACE( "got request on %lx for selection %s target %s win %lx prop %s\n", event->owner, debugstr_xatom( event->selection ), debugstr_xatom( event->target ), event->requestor, debugstr_xatom( event->property )); @@ -2105,8 +2100,6 @@ done: result.xselection.time = event->time; TRACE( "sending SelectionNotify for %s to %lx\n", debugstr_xatom( rprop ), event->requestor ); XSendEvent( display, event->requestor, False, NoEventMask, &result ); - XSync( display, False ); - if (X11DRV_check_error()) WARN( "requestor %lx is no longer valid\n", event->requestor ); return FALSE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 544e869..d622468 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -385,6 +385,7 @@ extern int copy_default_colors DECLSPEC_HIDDEN; extern int alloc_system_colors DECLSPEC_HIDDEN; extern int xrender_error_base DECLSPEC_HIDDEN; extern HMODULE x11drv_module DECLSPEC_HIDDEN; +extern Display *clipboard_display DECLSPEC_HIDDEN; /* atoms */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e020c68..41097f4 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -210,6 +210,9 @@ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) if ((event->request_code == X_SetInputFocus || event->request_code == X_ChangeWindowAttributes) && (event->error_code == BadMatch || event->error_code == BadWindow)) return TRUE; + /* the clipboard display interacts with external windows, ignore all errors */ + if (display == clipboard_display) return TRUE; + /* ignore a number of errors on gdi display caused by creating/destroying windows */ if (display == gdi_display) {

1 0

Piotr Caban : msvcp140: Add _Execute_once implementation.
by Alexandre Julliard 26 Sep '16

26 Sep '16

Module: wine Branch: master Commit: bb88947b051680cac11dbf7d9b2c3c06b143048b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb88947b051680cac11dbf7d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 26 12:00:36 2016 +0200 msvcp140: Add _Execute_once implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 6 +++--- dlls/msvcp90/misc.c | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index cc2e338..a43950f 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1145,9 +1145,9 @@ @ cdecl -arch=arm ?_Empty@?$_Yarn(a)_W@std@@QBA_NXZ(ptr) _Yarn_wchar__Empty @ thiscall -arch=i386 ?_Empty@?$_Yarn(a)_W@std@@QBE_NXZ(ptr) _Yarn_wchar__Empty @ cdecl -arch=win64 ?_Empty@?$_Yarn(a)_W@std@@QEBA_NXZ(ptr) _Yarn_wchar__Empty -@ stub -arch=arm ?_Execute_once(a)std@@YAHAAUonce_flag(a)1@P6AHPAX1PAPAX(a)Z1@Z -@ stub -arch=i386 ?_Execute_once(a)std@@YAHAAUonce_flag(a)1@P6GHPAX1PAPAX(a)Z1@Z -@ stub -arch=win64 ?_Execute_once(a)std@@YAHAEAUonce_flag(a)1@P6AHPEAX1PEAPEAX(a)Z1@Z +@ cdecl -arch=arm ?_Execute_once(a)std@@YAHAAUonce_flag(a)1@P6AHPAX1PAPAX(a)Z1@Z(ptr ptr ptr) _Execute_once +@ cdecl -arch=i386 ?_Execute_once(a)std@@YAHAAUonce_flag(a)1@P6GHPAX1PAPAX(a)Z1@Z(ptr ptr ptr) _Execute_once +@ cdecl -arch=win64 ?_Execute_once(a)std@@YAHAEAUonce_flag(a)1@P6AHPEAX1PEAPEAX(a)Z1@Z(ptr ptr ptr) _Execute_once @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) num_put_char__Ffmt @ cdecl -arch=win64 ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAPEADPEADDH(a)Z(ptr ptr long long) num_put_char__Ffmt @ cdecl -arch=win32 ?_Ffmt@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABAPADPADDH(a)Z(ptr ptr long long) num_put_wchar__Ffmt diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 4b3d506..41f2eeb 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1162,6 +1162,13 @@ HANDLE CDECL MSVCP__crtCreateSemaphoreExW( return CreateSemaphoreExW(attribs, initial_count, max_count, name, flags, access); } +/* ?_Execute_once(a)std@@YAHAAUonce_flag(a)1@P6GHPAX1PAPAX(a)Z1@Z */ +/* ?_Execute_once(a)std@@YAHAEAUonce_flag(a)1@P6AHPEAX1PEAPEAX(a)Z1@Z */ +BOOL __cdecl _Execute_once(INIT_ONCE *flag, PINIT_ONCE_FN func, void *param) +{ + return InitOnceExecuteOnce(flag, func, param, NULL); +} + void init_misc(void *base) { #ifdef __x86_64__

1 0

Filip Frąckiewicz : wined3d: Add NVIDIA GTX 675MX to the GPU list.
by Alexandre Julliard 26 Sep '16

26 Sep '16

Module: wine Branch: master Commit: b8273a1118fec45237d76d3e357ecb215c09d8c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8273a1118fec45237d76d3e3… Author: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Date: Sat Sep 24 00:00:18 2016 +0200 wined3d: Add NVIDIA GTX 675MX to the GPU list. Signed-off-by: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 783cd45..2cdc03f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1281,6 +1281,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660TI, "NVIDIA GeForce GTX 660 Ti", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX675MX, "NVIDIA GeForce GTX 675MX", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX690, "NVIDIA GeForce GTX 690", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1806,6 +1807,7 @@ cards_nvidia_binary[] = {"GT 730", CARD_NVIDIA_GEFORCE_GT730}, /* Geforce 700 - lowend */ {"GTX 690", CARD_NVIDIA_GEFORCE_GTX690}, /* Geforce 600 - highend */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ + {"GTX 675MX", CARD_NVIDIA_GEFORCE_GTX675MX}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ {"GTX 660 Ti", CARD_NVIDIA_GEFORCE_GTX660TI}, /* Geforce 600 - midend high */ @@ -2168,7 +2170,7 @@ cards_nvidia_mesa[] = {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, - {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* 690 */ + {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* 690 / 675MX */ /* Fermi */ {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, {"NVD7", CARD_NVIDIA_GEFORCE_820M}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f1440ba..e8b11d6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1917,6 +1917,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX660TI = 0x1183, CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, + CARD_NVIDIA_GEFORCE_GTX675MX = 0x11a7, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, CARD_NVIDIA_GEFORCE_GTX690 = 0x1188, CARD_NVIDIA_GEFORCE_GT730 = 0x1287,

1 0

Piotr Caban : msvcp140: Add codecvt<char,char,_Mbstatet> exports.
by Alexandre Julliard 23 Sep '16

23 Sep '16

Module: wine Branch: master Commit: f41466261d301934f3634e645338eabe22f5316a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41466261d301934f3634e645… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 23 16:08:34 2016 +0200 msvcp140: Add codecvt<char,char,_Mbstatet> exports. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 6 +-- dlls/msvcp120/msvcp120.spec | 6 +-- dlls/msvcp120_app/msvcp120_app.spec | 6 +-- dlls/msvcp140/msvcp140.spec | 92 ++++++++++++++++++------------------- dlls/msvcp90/locale.c | 15 +++++- 5 files changed, 68 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f41466261d301934f3634…

1 0

Piotr Caban : msvcp140: Add _Cnd_init_in_situ implementation.
by Alexandre Julliard 23 Sep '16

23 Sep '16

Module: wine Branch: master Commit: 61e6e8baa01dd44fa46744a8bc2b226474ce487a URL: http://source.winehq.org/git/wine.git/?a=commit;h=61e6e8baa01dd44fa46744a8b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 23 16:28:21 2016 +0200 msvcp140: Add _Cnd_init_in_situ implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/misc.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 5980081..cc2e338 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3626,7 +3626,7 @@ @ stub _Cnd_destroy_in_situ @ stub _Cnd_do_broadcast_at_thread_exit @ cdecl _Cnd_init(ptr) _Cnd_init -@ stub _Cnd_init_in_situ +@ cdecl _Cnd_init_in_situ(ptr) @ stub _Cnd_register_at_thread_exit @ cdecl _Cnd_signal(ptr) _Cnd_signal @ cdecl _Cnd_timedwait(ptr ptr ptr) _Cnd_timedwait diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 96339e2..4b3d506 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -584,10 +584,9 @@ typedef _Cnd_t *_Cnd_arg_t; static HANDLE keyed_event; -int __cdecl _Cnd_init(_Cnd_t *cnd) +void __cdecl _Cnd_init_in_situ(_Cnd_t cnd) { - *cnd = MSVCRT_operator_new(sizeof(**cnd)); - InitializeConditionVariable(&(*cnd)->cv); + InitializeConditionVariable(&cnd->cv); if(!keyed_event) { HANDLE event; @@ -596,7 +595,12 @@ int __cdecl _Cnd_init(_Cnd_t *cnd) if(InterlockedCompareExchangePointer(&keyed_event, event, NULL) != NULL) NtClose(event); } +} +int __cdecl _Cnd_init(_Cnd_t *cnd) +{ + *cnd = MSVCRT_operator_new(sizeof(**cnd)); + _Cnd_init_in_situ(*cnd); return 0; }

1 0

Alexandre Julliard : winex11: If multiple clipboard formats can be exported, use the first available one.
by Alexandre Julliard 23 Sep '16

23 Sep '16

Module: wine Branch: master Commit: df9ff6872cf36f4f025d81c329ec5ac709d1bfef URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9ff6872cf36f4f025d81c32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 12:20:32 2016 +0900 winex11: If multiple clipboard formats can be exported, use the first available one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 0850448..f557c80 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -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 ) { - struct clipboard_format *format = X11DRV_CLIPBOARD_LookupProperty( NULL, target ); + struct clipboard_format *format; HANDLE handle = 0; - BOOL ret = FALSE; - - if (!format || !format->export) return FALSE; - - 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 ); + BOOL open = FALSE, ret = FALSE; - if (!OpenClipboard( 0 )) + LIST_FOR_EACH_ENTRY( format, &format_list, struct clipboard_format, entry ) { - ERR( "failed to open clipboard for %s\n", debugstr_format( format->id )); - return FALSE; - } - - if ((handle = GetClipboardData( format->id ))) - ret = format->export( display, win, prop, target, handle ); + if (format->atom != target) continue; + 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 ); - CloseClipboard(); + ret = format->export( display, win, prop, target, handle ); + break; + } + /* keep looking for another Win32 format mapping to the same target */ + } + if (open) CloseClipboard(); return ret; }

1 0

Alexandre Julliard : winex11: Reimplement import_targets to go through the format list in the standard way.
by Alexandre Julliard 23 Sep '16

23 Sep '16

Module: wine Branch: master Commit: 548ce58b4f43efdfe19fa57925e22d780fe45c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=548ce58b4f43efdfe19fa5792… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 12:33:44 2016 +0900 winex11: Reimplement import_targets to go through the format list in the standard way. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 89 +++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 58 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index f557c80..f139586 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -464,22 +464,6 @@ void X11DRV_InitClipboard(void) /************************************************************************** - * X11DRV_CLIPBOARD_LookupProperty - */ -static struct clipboard_format *X11DRV_CLIPBOARD_LookupProperty( struct clipboard_format *current, Atom prop ) -{ - struct list *ptr = current ? &current->entry : &format_list; - - while ((ptr = list_next( &format_list, ptr ))) - { - struct clipboard_format *format = LIST_ENTRY( ptr, struct clipboard_format, entry ); - if (format->atom == prop) return format; - } - return NULL; -} - - -/************************************************************************** * X11DRV_CLIPBOARD_LookupData */ static LPWINE_CLIPDATA X11DRV_CLIPBOARD_LookupData(DWORD wID) @@ -1255,6 +1239,37 @@ static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ) /************************************************************************** + * import_targets + * + * Import TARGETS and mark the corresponding clipboard formats as available. + */ +static HANDLE import_targets( Atom type, const void *data, size_t size ) +{ + UINT i, count = size / sizeof(Atom); + const Atom *properties = data; + struct clipboard_format *format; + + if (type != XA_ATOM && type != x11drv_atom(TARGETS)) return 0; + + register_x11_formats( properties, count ); + + LIST_FOR_EACH_ENTRY( format, &format_list, struct clipboard_format, entry ) + { + for (i = 0; i < count; i++) if (properties[i] == format->atom) break; + if (i == count) continue; + if (format->import && format->id) + { + TRACE( "property %s -> format %s\n", + debugstr_xatom( properties[i] ), debugstr_format( format->id )); + X11DRV_CLIPBOARD_InsertClipboardData( format->id, 0, format, FALSE ); + } + else TRACE( "property %s (ignoring)\n", debugstr_xatom( properties[i] )); + } + return (HANDLE)1; +} + + +/************************************************************************** * import_data * * Generic import clipboard data routine. @@ -1883,48 +1898,6 @@ static BOOL export_multiple( Display *display, Window win, Atom prop, Atom targe /************************************************************************** - * import_targets - * - * Import TARGETS and mark the corresponding clipboard formats as available. - */ -static HANDLE import_targets( Atom type, const void *data, size_t size ) -{ - UINT i, count = size / sizeof(Atom); - const Atom *properties = data; - - if (type != XA_ATOM && type != x11drv_atom(TARGETS)) return 0; - - register_x11_formats( properties, count ); - - /* Cache these formats in the clipboard cache */ - for (i = 0; i < count; i++) - { - LPWINE_CLIPFORMAT lpFormat = X11DRV_CLIPBOARD_LookupProperty(NULL, properties[i]); - - if (lpFormat) - { - /* We found at least one Window's format that mapps to the property. - * Continue looking for more. - * - * If more than one property map to a Window's format then we use the first - * one and ignore the rest. - */ - while (lpFormat) - { - TRACE( "property %s -> format %s\n", - debugstr_xatom( lpFormat->atom ), debugstr_format( lpFormat->id )); - if (lpFormat->id) - X11DRV_CLIPBOARD_InsertClipboardData( lpFormat->id, 0, lpFormat, FALSE ); - lpFormat = X11DRV_CLIPBOARD_LookupProperty(lpFormat, properties[i]); - } - } - } - - return (HANDLE)1; -} - - -/************************************************************************** * X11DRV_CLIPBOARD_QueryAvailableData * * Caches the list of data formats available from the current selection.

1 0