October 2018 - Wine-devel - list.winehq.org

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng 25 Oct '18

25 Oct '18

From: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)

1 0

[PATCH v2 1/4] shell32/autocomplete: Implement a cache and sort the enumerated strings for proper behavior
by Gabriel Ivăncescu 25 Oct '18

25 Oct '18

Windows doesn't reset and re-enumerate it everytime autocompletion happens, and it also sorts the strings. This matches it more closely and makes it more useable on large lists as well. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Merged the first 3 patches, used qsort, replaced goto that broke out of nested scope with a BOOL check, and moved the goto failure path at the end outside of any blocks. dlls/shell32/autocomplete.c | 288 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 228 insertions(+), 60 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index dfe7638..751bda0 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -25,7 +25,6 @@ - implement ACO_FILTERPREFIXES style - implement ACO_RTLREADING style - implement ResetEnumerator - - string compares should be case-insensitive, the content of the list should be sorted */ #include "config.h" @@ -62,6 +61,8 @@ typedef struct LONG ref; BOOL initialized; BOOL enabled; + UINT enum_strs_num; + WCHAR **enum_strs; HWND hwndEdit; HWND hwndListBox; WNDPROC wpOrigEditProc; @@ -103,10 +104,160 @@ static void set_text_and_selection(IAutoCompleteImpl *ac, HWND hwnd, WCHAR *text CallWindowProcW(proc, hwnd, EM_SETSEL, start, end); } +static int enumerate_strings_cmpfn(const void *a, const void *b) +{ + return strcmpiW(*(WCHAR* const*)a, *(WCHAR* const*)b); +} + +static void enumerate_strings(IAutoCompleteImpl *ac) +{ + /* + Enumerate all of the strings and sort them in the internal list. Rough summary: + + - Enumerate the strings and place their addresses in a chain of blocks (stack-like) + - Copy the pointers from the blocks into a contiguous array/list + - Sort the contiguous array/list + + We don't free the enumerated strings (except on error) to avoid needless + copies, until the next reset (or the object itself is destroyed) + */ + struct + { + void *prev; + LPOLESTR str[1020]; + } *prevblock, *curblock; + + UINT i, cur, numstrs = 0; + LPOLESTR *strs; + + prevblock = NULL; + for (;;) + { + LONG rem; + BOOL break_enum = FALSE; + + if ((curblock = heap_alloc(sizeof(*curblock))) == NULL) + { + if (!prevblock) + return; + curblock = prevblock; + cur = ARRAY_SIZE(curblock->str); + goto fail_and_free_blocks; + } + curblock->prev = prevblock; + rem = ARRAY_SIZE(curblock->str); + + while (rem > 0) + { + ULONG n = 0; + cur = ARRAY_SIZE(curblock->str) - rem; + IEnumString_Next(ac->enumstr, rem, &curblock->str[cur], &n); + if (n == 0) + { + break_enum = TRUE; + break; + } + rem -= n; + } + if (break_enum) break; + prevblock = curblock; + numstrs += ARRAY_SIZE(curblock->str); + } + + /* Allocate even if there were zero strings enumerated, to mark it non-NULL */ + numstrs += cur; + if ((strs = heap_alloc(numstrs * sizeof(*strs)))) + { + if (numstrs == 0) + { + ac->enum_strs = strs; + ac->enum_strs_num = numstrs; + heap_free(curblock); + return; + } + + /* Copy the pointers from the chain of blocks to the contiguous list */ + i = numstrs; + do + { + i -= cur; + memcpy(&strs[i], curblock->str, cur * sizeof(*strs)); + + prevblock = curblock->prev; + heap_free(curblock); + curblock = prevblock; + cur = ARRAY_SIZE(curblock->str); + } while (curblock); + + /* Now sort the list */ + qsort(strs, numstrs, sizeof(*strs), enumerate_strings_cmpfn); + + ac->enum_strs = strs; + ac->enum_strs_num = numstrs; + return; + } + +fail_and_free_blocks: + do + { + LPOLESTR *str = curblock->str; + while (cur--) + CoTaskMemFree(str[cur]); + prevblock = curblock->prev; + heap_free(curblock); + curblock = prevblock; + cur = ARRAY_SIZE(curblock->str); + } while (curblock); +} + +static UINT find_first_matching_enum_str(IAutoCompleteImpl *ac, WCHAR *text, UINT len) +{ + WCHAR **strs = ac->enum_strs; + UINT index = ~0, a = 0, b = ac->enum_strs_num; + while (a < b) + { + UINT i = (a + b - 1) / 2; + int cmp = strncmpiW(text, strs[i], len); + if (cmp == 0) index = i; + if (cmp <= 0) b = i; + else a = i + 1; + } + return index; +} + +static void free_enum_strs(IAutoCompleteImpl *ac) +{ + WCHAR **strs = ac->enum_strs; + if (strs) + { + UINT i = ac->enum_strs_num; + ac->enum_strs = NULL; + while (i--) + CoTaskMemFree(strs[i]); + heap_free(strs); + } +} + static void hide_listbox(IAutoCompleteImpl *ac, HWND hwnd) { ShowWindow(hwnd, SW_HIDE); SendMessageW(hwnd, LB_RESETCONTENT, 0, 0); + free_enum_strs(ac); +} + +static void show_listbox(IAutoCompleteImpl *ac, UINT cnt) +{ + RECT r; + UINT width, height; + + GetWindowRect(ac->hwndEdit, &r); + SendMessageW(ac->hwndListBox, LB_CARETOFF, 0, 0); + + /* Windows XP displays 7 lines at most, then it uses a scroll bar */ + height = SendMessageW(ac->hwndListBox, LB_GETITEMHEIGHT, 0, 0) * min(cnt + 1, 7); + width = r.right - r.left; + + SetWindowPos(ac->hwndListBox, HWND_TOP, r.left, r.bottom + 1, width, height, SWP_SHOWWINDOW); } static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *str, size_t str_len) @@ -225,7 +376,11 @@ static LRESULT change_selection(IAutoCompleteImpl *ac, HWND hwnd, UINT key) static BOOL do_aclist_expand(IAutoCompleteImpl *ac, WCHAR *txt, WCHAR *last_delim) { - WCHAR c = last_delim[1]; + WCHAR c; + free_enum_strs(ac); + IEnumString_Reset(ac->enumstr); /* call before expand */ + + c = last_delim[1]; last_delim[1] = '\0'; IACList_Expand(ac->aclist, txt); last_delim[1] = c; @@ -261,6 +416,9 @@ static BOOL aclist_expand(IAutoCompleteImpl *ac, WCHAR *txt) while (i--) if (strchrW(delims, txt[i])) return do_aclist_expand(ac, txt, &txt[i]); + + /* Windows doesn't expand without a delim, but it does reset */ + free_enum_strs(ac); } return FALSE; @@ -293,11 +451,65 @@ static void autoappend_str(IAutoCompleteImpl *ac, WCHAR *text, UINT len, WCHAR * heap_free(tmp); } +static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, + HWND hwnd, enum autoappend_flag flag) +{ + /* Return FALSE if we need to hide the listbox */ + WCHAR **str = ac->enum_strs; + UINT cnt, a, b, i; + if (!str) return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; + + if (len) + { + i = find_first_matching_enum_str(ac, text, len); + if (i == ~0) + return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; + + if (flag == autoappend_flag_yes) + autoappend_str(ac, text, len, str[i], hwnd); + if (!(ac->options & ACO_AUTOSUGGEST)) + return TRUE; + + /* Find the last string that begins with text, starting the search from i, + which is guaranteed to find at least one string (if none other, then i) */ + a = i, b = ac->enum_strs_num; + do + { + UINT mid = (a + b - 1) / 2u; + if (!strncmpiW(text, str[mid], len)) + a = mid + 1; + else + b = mid; + } while (a < b); + } + else + { + if (!(ac->options & ACO_AUTOSUGGEST)) + return TRUE; + i = 0; + a = ac->enum_strs_num; + if (a == 0) + return FALSE; + } + cnt = a - i; + + SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); + SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); + SendMessageW(ac->hwndListBox, LB_INITSTORAGE, cnt, 0); + do + SendMessageW(ac->hwndListBox, LB_INSERTSTRING, -1, (LPARAM)str[i]); + while (++i < a); + + show_listbox(ac, cnt); + SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); + return TRUE; +} + static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_flag flag) { - HRESULT hr; WCHAR *text; - UINT cpt, size, len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); + BOOL expanded = FALSE; + UINT size, len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); if (flag != autoappend_flag_displayempty && len == 0) { @@ -313,79 +525,35 @@ static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_ if (len + 1 != size) text = heap_realloc(text, (len + 1) * sizeof(WCHAR)); - /* Reset it here to simplify the logic in aclist_expand for - empty strings, since it tracks changes using txtbackup, - and Reset needs to be called before IACList::Expand */ - IEnumString_Reset(ac->enumstr); if (ac->aclist) { - aclist_expand(ac, text); if (text[len - 1] == '\\' || text[len - 1] == '/') flag = autoappend_flag_no; + expanded = aclist_expand(ac, text); + } + if (expanded || !ac->enum_strs) + { + if (!expanded) IEnumString_Reset(ac->enumstr); + enumerate_strings(ac); } - /* Set txtbackup to point to text itself (which must not be released) */ + /* Set txtbackup to point to text itself (which must not be released), + and it must be done here since aclist_expand uses it to track changes */ heap_free(ac->txtbackup); ac->txtbackup = text; - if (ac->options & ACO_AUTOSUGGEST) + if (!display_matching_strs(ac, text, len, hwnd, flag)) { - SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); + /* Hide the listbox, but do not clear the enum strs, to match Windows */ + ShowWindow(ac->hwndListBox, SW_HIDE); SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); } - for (cpt = 0;;) - { - LPOLESTR strs = NULL; - ULONG fetched; - - hr = IEnumString_Next(ac->enumstr, 1, &strs, &fetched); - if (hr != S_OK) - break; - - if (!strncmpiW(text, strs, len)) - { - if (cpt == 0 && flag == autoappend_flag_yes) - { - autoappend_str(ac, text, len, strs, hwnd); - if (!(ac->options & ACO_AUTOSUGGEST)) - { - CoTaskMemFree(strs); - break; - } - } - - if (ac->options & ACO_AUTOSUGGEST) - SendMessageW(ac->hwndListBox, LB_ADDSTRING, 0, (LPARAM)strs); - - cpt++; - } - - CoTaskMemFree(strs); - } - - if (ac->options & ACO_AUTOSUGGEST) - { - if (cpt) - { - RECT r; - UINT height = SendMessageW(ac->hwndListBox, LB_GETITEMHEIGHT, 0, 0); - SendMessageW(ac->hwndListBox, LB_CARETOFF, 0, 0); - GetWindowRect(hwnd, &r); - /* It seems that Windows XP displays 7 lines at most - and otherwise displays a vertical scroll bar */ - SetWindowPos(ac->hwndListBox, HWND_TOP, - r.left, r.bottom + 1, r.right - r.left, height * min(cpt + 1, 7), - SWP_SHOWWINDOW ); - SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); - } - else - hide_listbox(ac, ac->hwndListBox); - } } static void destroy_autocomplete_object(IAutoCompleteImpl *ac) { ac->hwndEdit = NULL; + free_enum_strs(ac); if (ac->hwndListBox) DestroyWindow(ac->hwndListBox); IAutoComplete2_Release(&ac->IAutoComplete2_iface); -- 1.9.1

3 10

Re: RFC: wintab32: Qt applications crash after WTOpen
by Alex Henrie 25 Oct '18

25 Oct '18

On Wed, Oct 24, 2018 at 11:01 AM Bernhard Übelacker <bernhardu(a)mailbox.org> wrote: > > Hello Alex, > thank you for getting that bug fixed. > > There is just one thing that I remember now, that led me explore > the complicated way. Now every user without such hardware gets > such a message in the terminal: > > benutzer(a)debian:~/.wine/drive_c/test$ wine digitalclock.exe > 0009:err:wintab32:LoadTablet LoadTabletInfo(0x10046) failed > > I am not sure if thats an issue. If I understand correctly, practically every application that depends on the latest version of Qt is going to trigger this error message. The message (line 168 of dlls/wintab32/context.c) should probably just be deleted. Would you like to send the patch for that? -Alex

2 3

[PATCH] wintab32: Change the LoadTabletInfo failure message from ERR to TRACE
by Alex Henrie 25 Oct '18

25 Oct '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wintab32/context.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 17f9a11317..2993c4707e 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -156,16 +156,15 @@ static inline BOOL LoadTablet(void) if (loaded == TI_START) { - TRACE("Initializing the tablet to hwnd %p\n",hwndDefault); - if (pLoadTabletInfo && pLoadTabletInfo(hwndDefault)) { + TRACE("Initialized the tablet to hwnd %p\n", hwndDefault); loaded = TI_OK; } else { + TRACE("Failed to initialize the tablet to hwnd %p\n", hwndDefault); loaded = TI_FAIL; - ERR("LoadTabletInfo(%p) failed\n", hwndDefault); } } -- 2.19.1

1 0

[PATCH] libs/wine: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 25 Oct '18

25 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- libs/wine/debug.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 4116b9614a..ae12356cde 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -144,7 +144,7 @@ static void parse_options( const char *str ) if (p > opt) { - for (i = 0; i < sizeof(debug_classes)/sizeof(debug_classes[0]); i++) + for (i = 0; i < ARRAY_SIZE(debug_classes); i++) { int len = strlen(debug_classes[i]); if (len != (p - opt)) continue; @@ -155,7 +155,7 @@ static void parse_options( const char *str ) break; } } - if (i == sizeof(debug_classes)/sizeof(debug_classes[0])) /* bad class name, skip it */ + if (i == ARRAY_SIZE(debug_classes)) /* bad class name, skip it */ continue; } else @@ -268,7 +268,7 @@ static char *get_temp_buffer( size_t size ) char *ret; int idx; - idx = interlocked_xchg_add( &pos, 1 ) % (sizeof(list)/sizeof(list[0])); + idx = interlocked_xchg_add( &pos, 1 ) % ARRAY_SIZE(list); if ((ret = realloc( list[idx], size ))) list[idx] = ret; return ret; } @@ -411,7 +411,7 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch ret += wine_dbg_printf( "%04x:", GetCurrentProcessId() ); ret += wine_dbg_printf( "%04x:", GetCurrentThreadId() ); #endif - if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) + if (cls < ARRAY_SIZE(debug_classes)) ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func ); if (format) ret += funcs.dbg_vprintf( format, args ); -- 2.14.5

1 0

[PATCH] include: Use the ARRAY_SIZE() macro in debug.h
by Michael Stefaniuc 25 Oct '18

25 Oct '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index fb0d6bb737..066873a38a 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -254,7 +254,7 @@ static inline const char *wine_dbgstr_vt( VARTYPE vt ) if (vt & ~VT_TYPEMASK) return wine_dbg_sprintf( "%s%s", wine_dbgstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12] ); - if (vt < sizeof(variant_types)/sizeof(*variant_types)) + if (vt < ARRAY_SIZE(variant_types)) return variant_types[vt]; if (vt == VT_BSTR_BLOB) -- 2.14.5

1 0

[PATCH 5/5] kernel32: Add SetFileCompletionNotificationModes implementation.
by Jacek Caban 25 Oct '18

25 Oct '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38960 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/file.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)

1 0

[PATCH 4/5] server: Support FILE_SKIP_COMPLETION_PORT_ON_SUCCESS on client-side asyncs.
by Jacek Caban 25 Oct '18

25 Oct '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38960 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/file.c | 4 ---- dlls/ws2_32/socket.c | 15 ++++++++------- server/fd.c | 2 +- server/protocol.def | 1 + 4 files changed, 10 insertions(+), 12 deletions(-)

1 0

[PATCH 3/5] server: Support FILE_SKIP_COMPLETION_PORT_ON_SUCCESS on server-side asyncs.
by Jacek Caban 25 Oct '18

25 Oct '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38960 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 5 ----- server/async.c | 10 ++++++++-- server/fd.c | 8 ++++---- server/file.h | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-)

1 0

[PATCH 2/5 v2] ntdll/tests: Added more FILE_SKIP_COMPLETION_PORT_ON_SUCCESS tests.
by Jacek Caban 25 Oct '18

25 Oct '18

Based on patch by Sebastian Lackner. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed tests on win2k3 dlls/ntdll/tests/file.c | 38 +++++++++ dlls/ntdll/tests/pipe.c | 169 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 198 insertions(+), 9 deletions(-)

1 0