November 2018 - Wine-Devel - list.winehq.org

[PATCH 2/2] ntdll: Update debug trace.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

Nov. 1, 2018

[PATCH 1/2] ntdll: Remove no longer needed event handle from async_irp.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/file.c | 5 ----- 1 file changed, 5 deletions(-)

Nov. 1, 2018

[PATCH] server: Add FILE_SKIP_SET_EVENT_ON_HANDLE support.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/file.c | 4 ++-- dlls/ntdll/tests/pipe.c | 4 ---- server/fd.c | 5 ++++- 3 files changed, 6 insertions(+), 7 deletions(-)

Nov. 1, 2018

Re: [PATCH] comctl32/pager: Support header notification conversion.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

Nov. 1, 2018

Re: [PATCH v4 1/4] shell32/autocomplete: Implement a cache and sort the enumerated strings for proper behavior

by Huw Davies

On Thu, Nov 01, 2018 at 09:57:37AM +0000, Huw Davies wrote: > On Wed, Oct 31, 2018 at 01:24:28PM +0200, Gabriel Ivăncescu wrote: > > + UINT i, cur = 0, array_size = 1024; > > + LPOLESTR *strs = NULL, *tmp; > > + ULONG n; > > + > > + do > > + { > > + if ((tmp = heap_realloc(strs, array_size * sizeof(*strs))) == NULL) > > + goto fail; > > + strs = tmp; > > + > > + do > > + IEnumString_Next(ac->enumstr, array_size - cur, &strs[cur], &n); > > + while (n != 0 && (cur += n) < array_size); > > + > > + array_size *= 2; > > + } while (n != 0); > > Hopefully you agree that this looks much nicer than the previous > versions. There's a slight issue though in that you should check that > the return value from IEnumString_Next() == S_OK. You could simply > then set n = 0 if that condition isn't met, to break out of the loops. Sorry, actually test using FAILED(). IEnumString_Next() is supposed to return S_FALSE if the number read < number asked for. Huw.

Nov. 1, 2018

Re: [PATCH v4 1/4] shell32/autocomplete: Implement a cache and sort the enumerated strings for proper behavior

by Huw Davies

On Wed, Oct 31, 2018 at 01:24:28PM +0200, Gabriel Ivăncescu wrote: > 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> > --- > > v4: Simplified it more and culled many variables. > > dlls/shell32/autocomplete.c | 193 ++++++++++++++++++++++++++++++++------------ > 1 file changed, 143 insertions(+), 50 deletions(-) > > diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c > index b3f86f3..5a31259 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,88 @@ 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. > + > + We don't free the enumerated strings (except on error) to avoid needless > + copies, until the next reset (or the object itself is destroyed) > + */ Please move this comment to above the function. > + UINT i, cur = 0, array_size = 1024; > + LPOLESTR *strs = NULL, *tmp; > + ULONG n; > + > + do > + { > + if ((tmp = heap_realloc(strs, array_size * sizeof(*strs))) == NULL) > + goto fail; > + strs = tmp; > + > + do > + IEnumString_Next(ac->enumstr, array_size - cur, &strs[cur], &n); > + while (n != 0 && (cur += n) < array_size); > + > + array_size *= 2; > + } while (n != 0); Hopefully you agree that this looks much nicer than the previous versions. There's a slight issue though in that you should check that the return value from IEnumString_Next() == S_OK. You could simply then set n = 0 if that condition isn't met, to break out of the loops. Also, let's change 'n' -> 'read'. > + /* Allocate even if there were zero strings enumerated, to mark it non-NULL */ > + if ((tmp = heap_realloc(strs, cur * sizeof(*strs)))) > + { > + strs = tmp; > + if (cur > 0) > + qsort(strs, cur, sizeof(*strs), enumerate_strings_cmpfn); > + > + ac->enum_strs = strs; > + ac->enum_strs_num = cur; > + return; > + } > + > +fail: > + i = cur; 'i' is superfluous, you can directly decrement 'cur'. > + while (i--) > + CoTaskMemFree(strs[i]); > + heap_free(strs); > +} > + > +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) > @@ -240,7 +319,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; > @@ -276,6 +359,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; > @@ -312,60 +398,60 @@ 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 */ > - UINT cpt; > + WCHAR **str = ac->enum_strs; > + UINT cnt, a, b, i; > + if (!str) return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; > > - if (ac->options & ACO_AUTOSUGGEST) > - { > - SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); > - SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); > - } > - for (cpt = 0;;) > + if (len) > { > - HRESULT hr; > - LPOLESTR strs = NULL; > - ULONG fetched; > - > - hr = IEnumString_Next(ac->enumstr, 1, &strs, &fetched); > - if (hr != S_OK) > - break; > - > - if (!strncmpiW(text, strs, 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 > { > - 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); > + UINT mid = (a + b - 1) / 2; > + if (!strncmpiW(text, str[mid], len)) > + a = mid + 1; > + else > + b = mid; > + } while (a < b); So this search loop looks like the code in find_first_matching...(). I'd suggest making that function more general, and having a take a parameter 'BOOL direction' parameter that would find the last in the list if set. You could also pass the start and end indicies to avoid unnecessary searching in this case. > } > - > - if (ac->options & ACO_AUTOSUGGEST) > + else > { > - if (cpt) > - { > - show_listbox(ac, cpt); > - SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); > - } > - 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; > } There's still a lot of code shuffling in this patch in dispatch_matching_strs(). Can you try to reduce that by more patch splitting? At the moment there's just too much going on to clearly see what this patch is doing. > static void autocomplete_text(IAutoCompleteImpl *ac, HWND hwnd, enum autoappend_flag flag) > { > WCHAR *text; > + BOOL expanded = FALSE; > UINT size, len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); > > if (flag != autoappend_flag_displayempty && len == 0) > @@ -382,28 +468,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 (!display_matching_strs(ac, text, len, hwnd, flag)) > - hide_listbox(ac, ac->hwndListBox); > + { > + /* 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); > + } So you moved this to a helper as I suggested and then moved it back in the next patch?? You could add a BOOL flag to hide_listbox that performs the reset if it's set. Huw.

Nov. 1, 2018

[PATCH 3/3] gdiplus: Skip failed font family when building system collection.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/font.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 74cd29b2c3..729592b982 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1496,6 +1496,7 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) struct add_font_param { GpFontCollection *collection; + BOOL is_system; GpStatus stat; }; @@ -1541,6 +1542,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, lfw.lfPitchAndFamily = 0; param.collection = fontCollection; + param.is_system = FALSE; if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&param, 0)) ret = param.stat; @@ -1651,6 +1653,9 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, if ((stat = GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &family)) != Ok) { + WARN("Failed to create font family for %s, status %d.\n", debugstr_w(lfw->lfFaceName), stat); + if (param->is_system) + return 1; param->stat = stat; return 0; } @@ -1691,6 +1696,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( lfw.lfPitchAndFamily = 0; param.collection = &installedFontCollection; + param.is_system = TRUE; if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&param, 0)) { free_installed_fonts(); -- 2.19.1

Nov. 1, 2018

[PATCH 2/3] gdiplus: Return actual code on failed attempt to add a font.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/font.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 64778bb226..74cd29b2c3 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1493,6 +1493,12 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) return NULL; } +struct add_font_param +{ + GpFontCollection *collection; + GpStatus stat; +}; + static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam); /***************************************************************************** @@ -1520,6 +1526,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, ret = InvalidParameter; else { + struct add_font_param param; HDC hdc; LOGFONTW lfw; @@ -1533,8 +1540,9 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, lstrcpyW(lfw.lfFaceName, name); lfw.lfPitchAndFamily = 0; - if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)fontCollection, 0)) - ret = OutOfMemory; + param.collection = fontCollection; + if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&param, 0)) + ret = param.stat; DeleteDC(hdc); } @@ -1606,10 +1614,14 @@ void free_installed_fonts(void) static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) { - GpFontCollection* fonts = (GpFontCollection*)lParam; + struct add_font_param *param = (struct add_font_param *)lParam; + GpFontCollection *fonts = param->collection; GpFontFamily* family; + GpStatus stat; int i; + param->stat = Ok; + if (type == RASTER_FONTTYPE) return 1; @@ -1626,7 +1638,10 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, GpFontFamily** new_family_list = heap_alloc(new_alloc_count*sizeof(void*)); if (!new_family_list) + { + param->stat = OutOfMemory; return 0; + } memcpy(new_family_list, fonts->FontFamilies, fonts->count*sizeof(void*)); heap_free(fonts->FontFamilies); @@ -1634,8 +1649,11 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, fonts->allocated = new_alloc_count; } - if (GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &family) != Ok) + if ((stat = GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &family)) != Ok) + { + param->stat = stat; return 0; + } /* skip duplicates */ for (i=0; i<fonts->count; i++) @@ -1662,6 +1680,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( if (installedFontCollection.count == 0) { + struct add_font_param param; HDC hdc; LOGFONTW lfw; @@ -1671,11 +1690,12 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( lfw.lfFaceName[0] = 0; lfw.lfPitchAndFamily = 0; - if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&installedFontCollection, 0)) + param.collection = &installedFontCollection; + if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&param, 0)) { free_installed_fonts(); DeleteDC(hdc); - return OutOfMemory; + return param.stat; } DeleteDC(hdc); -- 2.19.1

Nov. 1, 2018

[PATCH 1/3] gdiplus/tests: Add parameter validation test for GdipGetFontCollectionFamilyCount().

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/tests/font.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 961d8459cb..0a3a3bef79 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -1238,6 +1238,27 @@ static void test_GdipGetFontCollectionFamilyList(void) GdipDeleteFontFamily(family2); } +static void test_GdipGetFontCollectionFamilyCount(void) +{ + GpFontCollection *collection; + GpStatus status; + INT count; + + status = GdipGetFontCollectionFamilyCount(NULL, NULL); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + + count = 123; + status = GdipGetFontCollectionFamilyCount(NULL, &count); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + ok(count == 123, "Unexpected family count %d.\n", count); + + status = GdipNewInstalledFontCollection(&collection); + ok(status == Ok, "Failed to get system collection, status %d.\n", status); + + status = GdipGetFontCollectionFamilyCount(collection, NULL); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); +} + START_TEST(font) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1269,6 +1290,7 @@ START_TEST(font) test_installedfonts(); test_heightgivendpi(); test_GdipGetFontCollectionFamilyList(); + test_GdipGetFontCollectionFamilyCount(); GdiplusShutdown(gdiplusToken); } -- 2.19.1

Nov. 1, 2018

Re: [PATCH 2/2] rpcrt4: Avoid reference leaks when unmarshalling [in, out] interface pointers.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Nov. 1, 2018