January 2017 - Wine-commits

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

10 Jan '17

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 : mshtml/tests: Some spelling fixes in comments.
by Alexandre Julliard 10 Jan '17

10 Jan '17

Module: wine Branch: master Commit: 7effdeebdae46c202c53635275391ba24121bea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7effdeebdae46c202c5363527… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:42:45 2017 +0100 mshtml/tests: Some spelling fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 60e1bf8..8e8a662 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6539,7 +6539,7 @@ static void test_body_funs(IHTMLBodyElement *body) ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); - /* Restore Originial */ + /* Restore Original */ hres = IHTMLBodyElement_put_bgColor(body, vDefaultbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vDefaultbg); @@ -7194,7 +7194,7 @@ static void test_tr_elem(IHTMLElement *elem) ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); - /* Restore Originial */ + /* Restore Original */ hres = IHTMLTableRow_put_bgColor(row, vDefaultbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vDefaultbg); @@ -7265,7 +7265,7 @@ static void test_td_elem(IHTMLElement *elem) ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); - /* Restore Originial */ + /* Restore Original */ hres = IHTMLTableCell_put_bgColor(cell, vDefaultbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vDefaultbg); @@ -7510,7 +7510,7 @@ static void test_table_elem(IHTMLElement *elem) ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); - /* Restore Originial */ + /* Restore Original */ hres = IHTMLTable_put_bgColor(table, vDefaultbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vDefaultbg);

1 0

Francois Gouget : jscript: Make scope_push() static.
by Alexandre Julliard 10 Jan '17

10 Jan '17

Module: wine Branch: master Commit: 493659e09704602784c48a35f62ac511aea181be URL: http://source.winehq.org/git/wine.git/?a=commit;h=493659e09704602784c48a35f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:46:59 2017 +0100 jscript: Make scope_push() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f958204..90e6f8f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -390,7 +390,7 @@ static inline void clear_ret(call_frame_t *frame) jsval_release(steal_ret(frame)); } -HRESULT scope_push(scope_chain_t *scope, jsdisp_t *jsobj, IDispatch *obj, scope_chain_t **ret) +static HRESULT scope_push(scope_chain_t *scope, jsdisp_t *jsobj, IDispatch *obj, scope_chain_t **ret) { scope_chain_t *new_scope; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 3ac8169..f5b484b 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -197,7 +197,6 @@ typedef struct _scope_chain_t { struct _scope_chain_t *next; } scope_chain_t; -HRESULT scope_push(scope_chain_t*,jsdisp_t*,IDispatch*,scope_chain_t**) DECLSPEC_HIDDEN; void scope_release(scope_chain_t*) DECLSPEC_HIDDEN; static inline scope_chain_t *scope_addref(scope_chain_t *scope)

1 0

Francois Gouget : usp10: A spelling fix in a comment.
by Alexandre Julliard 10 Jan '17

10 Jan '17

Module: wine Branch: master Commit: c705eca8cb10a47e713c69153f18f15e4889d08e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c705eca8cb10a47e713c69153… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:43:43 2017 +0100 usp10: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 3ee412a..1c8d064 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2155,7 +2155,7 @@ static inline int unicode_lex(WCHAR c) switch( type ) { case 0x0d07: /* Unknown */ - case 0x0e07: /* Unknwon */ + case 0x0e07: /* Unknown */ default: return lex_Generic; case 0x0001: case 0x0002:

1 0

Francois Gouget : imm32/tests: A spelling fix in an ok() message.
by Alexandre Julliard 10 Jan '17

10 Jan '17

Module: wine Branch: master Commit: a0a22397fdc7dc6872c42a4f7c9d57bfd08a3924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0a22397fdc7dc6872c42a4f7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:44:43 2017 +0100 imm32/tests: A spelling fix in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index a2072e9..b02f85d 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -1050,7 +1050,7 @@ static DWORD WINAPI test_default_ime_with_message_only_window_cb(void *arg) CW_USEDEFAULT, CW_USEDEFAULT, 240, 120, hwnd1, NULL, GetModuleHandleW(NULL), NULL); default_ime_wnd = ImmGetDefaultIMEWnd(hwnd2); - ok(IsWindow(default_ime_wnd), "Expected IME window existance\n"); + ok(IsWindow(default_ime_wnd), "Expected IME window existence\n"); DestroyWindow(hwnd2); DestroyWindow(hwnd1);

1 0

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

10 Jan '17

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

Nikolay Sivov : shell32/tests: Test valid special folder IDs with NameSpace() method.
by Alexandre Julliard 10 Jan '17

10 Jan '17

Module: wine Branch: master Commit: dba1a78a2013d845e5cf6f9abefefe450005cde0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dba1a78a2013d845e5cf6f9ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 10 16:49:51 2017 +0300 shell32/tests: Test valid special folder IDs with NameSpace() method. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 61 +++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 3f2d902..0c71125 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -58,6 +58,48 @@ static void init_function_pointers(void) static void test_namespace(void) { + static const ShellSpecialFolderConstants special_folders[] = + { + ssfDESKTOP, + ssfPROGRAMS, + ssfCONTROLS, + ssfPRINTERS, + ssfPERSONAL, + ssfFAVORITES, + ssfSTARTUP, + ssfRECENT, + ssfSENDTO, + ssfBITBUCKET, + ssfSTARTMENU, + ssfDESKTOPDIRECTORY, + ssfDRIVES, + ssfNETWORK, + ssfNETHOOD, + ssfFONTS, + ssfTEMPLATES, + ssfCOMMONSTARTMENU, + ssfCOMMONPROGRAMS, + ssfCOMMONSTARTUP, + ssfCOMMONDESKTOPDIR, + ssfAPPDATA, + ssfPRINTHOOD, + ssfLOCALAPPDATA, + ssfALTSTARTUP, + ssfCOMMONALTSTARTUP, + ssfCOMMONFAVORITES, + ssfINTERNETCACHE, + ssfCOOKIES, + ssfHISTORY, + ssfCOMMONAPPDATA, + ssfWINDOWS, + ssfSYSTEM, + ssfPROGRAMFILES, + ssfMYPICTURES, + ssfPROFILE, + ssfSYSTEMx86, + ssfPROGRAMFILESx86, + }; + static const WCHAR backslashW[] = {'\\',0}; static const WCHAR clsidW[] = { ':',':','{','6','4','5','F','F','0','4','0','-','5','0','8','1','-', @@ -73,7 +115,7 @@ static void test_namespace(void) FolderItem *item; VARIANT var; BSTR title, item_path; - int len; + int len, i; r = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, &IID_IShellDispatch, (LPVOID*)&sd); @@ -92,6 +134,21 @@ static void test_namespace(void) ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); ok(folder == NULL, "expected NULL, got %p\n", folder); + /* test valid folder ids */ + for (i = 0; i < sizeof(special_folders)/sizeof(special_folders[0]); i++) + { + V_VT(&var) = VT_I4; + V_I4(&var) = special_folders[i]; + folder = (void*)0xdeadbeef; + r = IShellDispatch_NameSpace(sd, var, &folder); + if (special_folders[i] == ssfALTSTARTUP || special_folders[i] == ssfCOMMONALTSTARTUP) + ok(r == S_OK || broken(r == S_FALSE) /* winxp */, "Failed to get folder for index %#x, got %08x\n", special_folders[i], r); + else + ok(r == S_OK, "Failed to get folder for index %#x, got %08x\n", special_folders[i], r); + if (folder) + Folder_Release(folder); + } + V_VT(&var) = VT_I4; V_I4(&var) = -1; folder = (void*)0xdeadbeef; @@ -99,6 +156,8 @@ static void test_namespace(void) todo_wine { ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); ok(folder == NULL, "got %p\n", folder); + if (r == S_OK) + Folder_Release(folder); } V_VT(&var) = VT_I4; V_I4(&var) = ssfPROGRAMFILES;

1 0

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

10 Jan '17

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

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

10 Jan '17

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

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

10 Jan '17

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