January 2017 - Wine-Commits

Henri Verbeet : ddraw/tests: Try to avoid killing the Intel (kernel) driver.
by Alexandre Julliard Jan. 11, 2017

Jan. 11, 2017

Module: wine Branch: master Commit: 544fd16c15943fecec9ad03d201d24f5775c1224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=544fd16c15943fecec9ad03d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 10 22:35:51 2017 +0100 ddraw/tests: Try to avoid killing the Intel (kernel) driver. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 97 ++++++++++++++++++++++++++++++----------------- dlls/ddraw/tests/ddraw2.c | 97 ++++++++++++++++++++++++++++++----------------- dlls/ddraw/tests/ddraw4.c | 77 ++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw7.c | 77 ++++++++++++++++++++++++------------- 4 files changed, 228 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=544fd16c15943fecec9ad…

1 0

Nikolay Sivov : comctl32/toolbar: Protect from NULL pointer access in TB_GETBUTTONINFOW handler.
by Alexandre Julliard Jan. 11, 2017

Jan. 11, 2017

Module: wine Branch: master Commit: 26067cc0b9e39ac80bd13f8c90d9c9948eb60fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=26067cc0b9e39ac80bd13f8c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 11 15:31:42 2017 +0300 comctl32/toolbar: Protect from NULL pointer access in TB_GETBUTTONINFOW handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 11 ++++++++++- dlls/comctl32/toolbar.c | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 7dcdadb..f2f7924 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1710,12 +1710,13 @@ static void test_recalc(void) static void test_getbuttoninfo(void) { HWND hToolbar = NULL; + TBBUTTONINFOW tbiW; + TBBUTTONINFOA tbi; int i; rebuild_toolbar_with_buttons(&hToolbar); for (i = 0; i < 128; i++) { - TBBUTTONINFOA tbi; int ret; tbi.cbSize = i; @@ -1727,6 +1728,14 @@ static void test_getbuttoninfo(void) compare(ret, -1, "%d"); } } + + /* TBIF_TEXT with NULL pszText */ + memset(&tbiW, 0, sizeof(tbiW)); + tbiW.cbSize = sizeof(tbiW); + tbiW.dwMask = TBIF_BYINDEX | TBIF_STYLE | TBIF_COMMAND | TBIF_TEXT; + i = SendMessageA(hToolbar, TB_GETBUTTONINFOW, 1, (LPARAM)&tbiW); + ok(i == 1, "Got index %d\n", i); + DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 422845c..0c545a2 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3397,7 +3397,7 @@ TOOLBAR_GetButtonInfoT(const TOOLBAR_INFO *infoPtr, INT Id, LPTBBUTTONINFOW lpTb Str_GetPtrW(lpText, lpTbInfo->pszText, lpTbInfo->cchText); else Str_GetPtrWtoA(lpText, (LPSTR)lpTbInfo->pszText, lpTbInfo->cchText); - } else + } else if (!bUnicode || lpTbInfo->pszText) lpTbInfo->pszText[0] = '\0'; } return nIndex;

1 0

Louis Lenders : advapi32: Spelling fix in comment.
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: 05f9b023d2996984dda3b8143e80a2b5037968b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f9b023d2996984dda3b8143… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Jan 10 16:17:55 2017 +0100 advapi32: Spelling fix in comment. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 28331df..7e41c0a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2688,7 +2688,7 @@ BOOL WINAPI AddAuditAccessAce( } /****************************************************************************** - * AddAuditAccessAce [ADVAPI32.@] + * AddAuditAccessAceEx [ADVAPI32.@] */ BOOL WINAPI AddAuditAccessAceEx( IN OUT PACL pAcl,

1 0

Alexandre Julliard : winex11: Periodically check for selection changes using a timer.
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: d4f8366fa61b0f7a20b2b71272a40ef09e617140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4f8366fa61b0f7a20b2b7127… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 16:23:37 2017 +0100 winex11: Periodically check for selection changes using a timer. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 8afe2c2..1d7dbad 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1852,6 +1852,7 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) last_size = size; last_clipboard_update = GetTickCount64(); CloseClipboard(); + SetTimer( clipboard_hwnd, 1, SELECTION_UPDATE_DELAY, NULL ); return TRUE; } @@ -1888,9 +1889,14 @@ static LRESULT CALLBACK clipboard_wndproc( HWND hwnd, UINT msg, WPARAM wp, LPARA case WM_RENDERFORMAT: if (render_format( wp )) rendered_formats++; break; + case WM_TIMER: + if (!is_clipboard_owner) break; + request_selection_contents( thread_display(), FALSE ); + break; case WM_DESTROYCLIPBOARD: TRACE( "WM_DESTROYCLIPBOARD: lost ownership\n" ); is_clipboard_owner = FALSE; + KillTimer( hwnd, 1 ); break; } return DefWindowProcW( hwnd, msg, wp, lp );

1 0

Alexandre Julliard : winex11: Merge reading the selection data into the conversion function.
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: e4cc5bf1b9db23aa8d3adc7bca6abf079c6a1b2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4cc5bf1b9db23aa8d3adc7bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 16:21:46 2017 +0100 winex11: Merge reading the selection data into the conversion function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index f56fd4f..3ff8453 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -133,8 +133,8 @@ static BOOL export_targets( Display *display, Window win, Atom prop, Atom target static BOOL export_multiple( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); static BOOL export_timestamp( Display *display, Window win, Atom prop, Atom target, HANDLE handle ); -static BOOL X11DRV_CLIPBOARD_ReadProperty( Display *display, Window w, Atom prop, - Atom *type, unsigned char **data, unsigned long *datasize ); +static BOOL read_property( Display *display, Window w, Atom prop, + Atom *type, unsigned char **data, unsigned long *datasize ); /* Clipboard formats */ @@ -435,22 +435,28 @@ static void put_property( Display *display, Window win, Atom prop, Atom type, in /************************************************************************** * convert_selection */ -static Atom convert_selection( Display *display, Window win, Atom selection, Atom target ) +static BOOL convert_selection( Display *display, Window win, Atom selection, + struct clipboard_format *format, Atom *type, + unsigned char **data, unsigned long *size ) { int i; XEvent event; - XConvertSelection( display, selection, target, x11drv_atom(SELECTION_DATA), win, CurrentTime ); + TRACE( "import %s from %s win %lx to format %s\n", + debugstr_xatom( format->atom ), debugstr_xatom( selection ), + win, debugstr_format( format->id ) ); + + XConvertSelection( display, selection, format->atom, x11drv_atom(SELECTION_DATA), win, CurrentTime ); for (i = 0; i < SELECTION_RETRIES; i++) { Bool res = XCheckTypedWindowEvent( display, win, SelectionNotify, &event ); - if (res && event.xselection.selection == selection && event.xselection.target == target) - return event.xselection.property; + if (res && event.xselection.selection == selection && event.xselection.target == format->atom) + return read_property( display, win, event.xselection.property, type, data, size ); usleep( SELECTION_WAIT ); } ERR( "Timed out waiting for SelectionNotify event\n" ); - return None; + return FALSE; } @@ -975,25 +981,16 @@ static HANDLE import_selection( Display *display, Window win, Atom selection, { unsigned char *data; unsigned long size; - Atom prop, type; + Atom type; HANDLE ret; if (!format->import) return 0; - TRACE( "import %s from %s win %lx to format %s\n", - debugstr_xatom( format->atom ), debugstr_xatom( selection ), - win, debugstr_format( format->id ) ); - - if ((prop = convert_selection( display, win, selection, format->atom )) == None) + if (!convert_selection( display, win, selection, format, &type, &data, &size )) { TRACE( "failed to convert selection\n" ); return 0; } - if (!X11DRV_CLIPBOARD_ReadProperty( display, win, prop, &type, &data, &size )) - { - TRACE( "failed to read property\n" ); - return 0; - } ret = format->import( type, data, size ); HeapFree( GetProcessHeap(), 0, data ); return ret; @@ -1627,11 +1624,12 @@ struct clipboard_data_packet { }; /************************************************************************** - * X11DRV_CLIPBOARD_ReadProperty + * read_property + * * Reads the contents of the X selection property. */ -static BOOL X11DRV_CLIPBOARD_ReadProperty( Display *display, Window w, Atom prop, - Atom *type, unsigned char** data, unsigned long* datasize ) +static BOOL read_property( Display *display, Window w, Atom prop, + Atom *type, unsigned char **data, unsigned long *datasize ) { XEvent xe;

1 0

Francois Gouget : msacm32/tests: Make acm_driver_func() static.
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: 199af34f08ffadcb5197c99b0c02ddf78cb17ad6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199af34f08ffadcb5197c99b0… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:40:23 2017 +0100 msacm32/tests: Make acm_driver_func() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 0816cb0..6e79f46 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -848,7 +848,7 @@ static struct int other; } driver_calls; -LRESULT CALLBACK acm_driver_func(DWORD_PTR id, HDRVR handle, UINT msg, LPARAM param1, LPARAM param2) +static LRESULT CALLBACK acm_driver_func(DWORD_PTR id, HDRVR handle, UINT msg, LPARAM param1, LPARAM param2) { switch (msg) {

1 0

Francois Gouget : riched20: A spelling fix in a comment.
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: e63cea5dfc1881ce9e34c302c8074d88510b7824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e63cea5dfc1881ce9e34c302c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:37:55 2017 +0100 riched20: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/style.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 1a944cbb..4f08b3b 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -183,7 +183,7 @@ ME_Style *ME_ApplyStyle(ME_TextEditor *editor, ME_Style *sSrc, CHARFORMAT2W *mod } COPY_STYLE_ITEM(CFM_UNDERLINETYPE, bUnderlineType); - /* If the CFM_UNDERLINE effect is not specified set it appropiately */ + /* If the CFM_UNDERLINE effect is not specified, set it appropriately */ if ((mod->dwMask & CFM_UNDERLINETYPE) && !(mod->dwMask & CFM_UNDERLINE)) { fmt.dwMask |= CFM_UNDERLINE;

1 0

Francois Gouget : regedit: Make output_writeconsole() static.
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: 49c30d4b8ee1da2cfc02f7df87422ed62f7ed1f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c30d4b8ee1da2cfc02f7df8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:38:15 2017 +0100 regedit: Make output_writeconsole() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 2 +- programs/regedit/regproc.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 7b2ddaef..47fec63 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(regedit); -void output_writeconsole(const WCHAR *str, DWORD wlen) +static void output_writeconsole(const WCHAR *str, DWORD wlen) { DWORD count, ret; diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index bc46009..aff4bee 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -24,7 +24,6 @@ #define REG_FORMAT_5 1 #define REG_FORMAT_4 2 -void output_writeconsole(const WCHAR *str, DWORD wlen); void __cdecl output_message(unsigned int id, ...); BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format);

1 0

Francois Gouget : quartz: A couple of spelling fixes in comments.
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: ff36b5c816a37b28d334f9c55a1c1a57a154640d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff36b5c816a37b28d334f9c55… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:43:12 2017 +0100 quartz: A couple of spelling fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 2 +- dlls/quartz/vmr9.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e5671d2..1089de7 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -157,7 +157,7 @@ static void test_basic_video(void) ok(top == video_height/3, "expected %d, got %d\n", video_height/3, top); ok(height == video_height/4+1, "expected %d, got %d\n", video_height/4+1, height); - /* test desination rectangle */ + /* test destination rectangle */ hr = IBasicVideo_GetDestinationPosition(pbv, NULL, NULL, NULL, NULL); ok(hr == E_POINTER, "IBasicVideo_GetDestinationPosition returned: %x\n", hr); hr = IBasicVideo_GetDestinationPosition(pbv, &left, &top, NULL, NULL); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 490d8d8..13f0d89 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -3028,7 +3028,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_AdviseNotify(IVMRSurfaceAllocatorEx9 TRACE("(%p/%p)->(...)\n", iface, This); - /* No AddRef taken here or the base VMR9 filter would never be destroied */ + /* No AddRef taken here or the base VMR9 filter would never be destroyed */ This->SurfaceAllocatorNotify = allocnotify; return S_OK; }

1 0

Alexandre Julliard : winex11: Don' t update the clipboard if the X11 selection hasn't changed.
by Alexandre Julliard Jan. 10, 2017

Jan. 10, 2017

Module: wine Branch: master Commit: 1137e3502dc7e27e9db64c18436bfbc27a763820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1137e3502dc7e27e9db64c184… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 16:23:20 2017 +0100 winex11: Don't update the clipboard if the X11 selection hasn't changed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 84 +++++++++++++++++++++++++++++++------------- 1 file changed, 59 insertions(+), 25 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 3ff8453..8afe2c2 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -191,6 +191,7 @@ static BOOL is_clipboard_owner; static Window selection_window; static Window import_window; static Atom current_selection; +static UINT rendered_formats; static ULONG64 last_clipboard_update; static struct clipboard_format **current_x11_formats; static unsigned int nb_current_x11_formats; @@ -1025,13 +1026,13 @@ void X11DRV_CLIPBOARD_ImportSelection( Display *display, Window win, Atom select /************************************************************************** * render_format */ -static void render_format( UINT id ) +static HANDLE render_format( UINT id ) { Display *display = thread_display(); unsigned int i; HANDLE handle = 0; - if (!current_selection) return; + if (!current_selection) return 0; for (i = 0; i < nb_current_x11_formats; i++) { @@ -1040,6 +1041,7 @@ static void render_format( UINT id ) if (handle) SetClipboardData( id, handle ); break; } + return handle; } @@ -1778,45 +1780,77 @@ static void release_selection( Display *display, Time time ) * * Retrieve the contents of the X11 selection when it's owned by an X11 app. */ -static void request_selection_contents( Display *display ) +static BOOL request_selection_contents( Display *display, BOOL changed ) { struct clipboard_format *targets = find_x11_format( x11drv_atom(TARGETS) ); struct clipboard_format *string = find_x11_format( XA_STRING ); + struct clipboard_format *format = NULL; + Window owner = 0; + unsigned char *data = NULL; + unsigned long size = 0; + Atom type = 0; + + static Atom last_selection; + static Window last_owner; + static struct clipboard_format *last_format; + static Atom last_type; + static unsigned char *last_data; + static unsigned long last_size; assert( targets ); assert( string ); current_selection = 0; - if (use_primary_selection && XGetSelectionOwner( display, XA_PRIMARY )) + if (use_primary_selection) { - if (import_selection( display, import_window, XA_PRIMARY, targets )) + if ((owner = XGetSelectionOwner( display, XA_PRIMARY ))) current_selection = XA_PRIMARY; - else - import_selection( display, import_window, XA_PRIMARY, string ); } - else if (XGetSelectionOwner( display, x11drv_atom(CLIPBOARD) )) + if (!current_selection) { - if (import_selection( display, import_window, x11drv_atom(CLIPBOARD), targets )) + if ((owner = XGetSelectionOwner( display, x11drv_atom(CLIPBOARD) ))) current_selection = x11drv_atom(CLIPBOARD); - else - import_selection( display, import_window, x11drv_atom(CLIPBOARD), string ); } -} + if (current_selection) + { + if (convert_selection( display, import_window, current_selection, targets, &type, &data, &size )) + format = targets; + else if (convert_selection( display, import_window, current_selection, string, &type, &data, &size )) + format = string; + } + + changed = (changed || + rendered_formats || + last_selection != current_selection || + last_owner != owner || + last_format != format || + last_type != type || + last_size != size || + memcmp( last_data, data, size )); + + if (!changed) + { + HeapFree( GetProcessHeap(), 0, data ); + return FALSE; + } -/************************************************************************** - * grab_win32_clipboard - * - * Grab the Win32 clipboard when an X11 app has grabbed the X11 selection, - * and fill it with the selection contents. - */ -static BOOL grab_win32_clipboard( Display *display ) -{ if (!OpenClipboard( clipboard_hwnd )) return FALSE; + TRACE( "selection changed, importing\n" ); EmptyClipboard(); is_clipboard_owner = TRUE; + rendered_formats = 0; + + if (format) format->import( type, data, size ); + + HeapFree( GetProcessHeap(), 0, last_data ); + last_selection = current_selection; + last_owner = owner; + last_format = format; + last_type = type; + last_data = data; + last_size = size; last_clipboard_update = GetTickCount64(); - request_selection_contents( display ); CloseClipboard(); return TRUE; } @@ -1832,7 +1866,7 @@ BOOL update_clipboard( HWND hwnd ) if (hwnd != clipboard_hwnd) return TRUE; if (!is_clipboard_owner) return TRUE; if (GetTickCount64() - last_clipboard_update <= SELECTION_UPDATE_DELAY) return TRUE; - return grab_win32_clipboard( thread_display() ); + return request_selection_contents( thread_display(), FALSE ); } @@ -1852,7 +1886,7 @@ static LRESULT CALLBACK clipboard_wndproc( HWND hwnd, UINT msg, WPARAM wp, LPARA acquire_selection( thread_init_display() ); break; case WM_RENDERFORMAT: - render_format( wp ); + if (render_format( wp )) rendered_formats++; break; case WM_DESTROYCLIPBOARD: TRACE( "WM_DESTROYCLIPBOARD: lost ownership\n" ); @@ -1935,7 +1969,7 @@ static DWORD WINAPI clipboard_thread( void *arg ) clipboard_thread_id = GetCurrentThreadId(); AddClipboardFormatListener( clipboard_hwnd ); register_builtin_formats(); - grab_win32_clipboard( clipboard_display ); + request_selection_contents( clipboard_display, TRUE ); TRACE( "clipboard thread %04x running\n", GetCurrentThreadId() ); while (GetMessageW( &msg, 0, 0, 0 )) DispatchMessageW( &msg ); @@ -2014,7 +2048,7 @@ BOOL X11DRV_SelectionClear( HWND hwnd, XEvent *xev ) if (event->selection != x11drv_atom(CLIPBOARD)) return FALSE; release_selection( event->display, event->time ); - grab_win32_clipboard( event->display ); + request_selection_contents( event->display, TRUE ); return FALSE; }

1 0