November 2018 - Wine-commits

Józef Kucia : d3d8: Avoid locking wined3d mutex around wined3d_swapchain_incref().
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 240ebb189a772ddfe11dcf60f200b26f8888bfd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=240ebb189a772ddfe11dcf60… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 29 14:33:42 2018 +0100 d3d8: Avoid locking wined3d mutex around wined3d_swapchain_incref(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/swapchain.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 39e3b23..92ec011 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -57,9 +57,7 @@ static ULONG WINAPI d3d8_swapchain_AddRef(IDirect3DSwapChain8 *iface) { if (swapchain->parent_device) IDirect3DDevice8_AddRef(swapchain->parent_device); - wined3d_mutex_lock(); wined3d_swapchain_incref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); } return ref;

1 0

Józef Kucia : d3d9: Avoid locking wined3d mutex around wined3d_swapchain_incref().
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: bcbfcd386988fb7af779515480122f9e429e7467 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcbfcd386988fb7af7795154… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 29 14:33:43 2018 +0100 d3d9: Avoid locking wined3d mutex around wined3d_swapchain_incref(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/swapchain.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index d303f3f..81d5605 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -100,9 +100,7 @@ static ULONG WINAPI d3d9_swapchain_AddRef(IDirect3DSwapChain9Ex *iface) if (swapchain->parent_device) IDirect3DDevice9Ex_AddRef(swapchain->parent_device); - wined3d_mutex_lock(); wined3d_swapchain_incref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); } return refcount;

1 0

Józef Kucia : dxgi: Avoid locking wined3d mutex around wined3d_swapchain_incref().
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: aaba7fdd007498fa8d3702ecf7bab6cde5d1b5bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaba7fdd007498fa8d3702ec… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 29 14:33:44 2018 +0100 dxgi: Avoid locking wined3d mutex around wined3d_swapchain_incref(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 76a4d44..914ba48 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -143,14 +143,10 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_AddRef(IDXGISwapChain1 *iface) struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); ULONG refcount = InterlockedIncrement(&swapchain->refcount); - TRACE("%p increasing refcount to %u\n", swapchain, refcount); + TRACE("%p increasing refcount to %u.\n", swapchain, refcount); if (refcount == 1) - { - wined3d_mutex_lock(); wined3d_swapchain_incref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); - } return refcount; }

1 0

Józef Kucia : wined3d: Lock wined3d mutex in wined3d_swapchain_decref().
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 56d2db81b3b9b735bc6578f343197ca5d3c0c85d URL: https://source.winehq.org/git/wine.git/?a=commit;h=56d2db81b3b9b735bc6578f3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 29 14:33:45 2018 +0100 wined3d: Lock wined3d mutex in wined3d_swapchain_decref(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/swapchain.c | 2 -- dlls/d3d9/swapchain.c | 2 -- dlls/dxgi/swapchain.c | 2 -- dlls/wined3d/swapchain.c | 7 ++++++- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 92ec011..c137d0d 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -74,9 +74,7 @@ static ULONG WINAPI d3d8_swapchain_Release(IDirect3DSwapChain8 *iface) { IDirect3DDevice8 *parent_device = swapchain->parent_device; - wined3d_mutex_lock(); wined3d_swapchain_decref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); if (parent_device) IDirect3DDevice8_Release(parent_device); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 81d5605..5bd16ba 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -124,9 +124,7 @@ static ULONG WINAPI d3d9_swapchain_Release(IDirect3DSwapChain9Ex *iface) { IDirect3DDevice9Ex *parent_device = swapchain->parent_device; - wined3d_mutex_lock(); wined3d_swapchain_decref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ if (parent_device) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 914ba48..4dfa068 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -168,9 +168,7 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_Release(IDXGISwapChain1 *iface) } if (swapchain->factory) IDXGIFactory_Release(swapchain->factory); - wined3d_mutex_lock(); wined3d_swapchain_decref(swapchain->wined3d_swapchain); - wined3d_mutex_unlock(); if (device) IWineDXGIDevice_Release(device); } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2170629..ed8a3b3 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -109,17 +109,22 @@ ULONG CDECL wined3d_swapchain_incref(struct wined3d_swapchain *swapchain) ULONG CDECL wined3d_swapchain_decref(struct wined3d_swapchain *swapchain) { ULONG refcount = InterlockedDecrement(&swapchain->ref); + struct wined3d_device *device; TRACE("%p decreasing refcount to %u.\n", swapchain, refcount); if (!refcount) { - struct wined3d_device *device = swapchain->device; + wined3d_mutex_lock(); + device = swapchain->device; device->cs->ops->finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); swapchain_cleanup(swapchain); swapchain->parent_ops->wined3d_object_destroyed(swapchain->parent); + + wined3d_mutex_unlock(); + heap_free(swapchain); }

1 0

Gabriel Ivăncescu : shell32/autocomplete: Sort the enumerated strings using a helper function.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: d288d4dbd176279b35748814a3b46e5a8d64c71c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d288d4dbd176279b35748814… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 28 18:27:46 2018 +0200 shell32/autocomplete: Sort the enumerated strings using a helper function. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 236ba15..b9ea68f 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -103,11 +103,16 @@ 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) +static int sort_strs_cmpfn(const void *a, const void *b) { return strcmpiW(*(WCHAR* const*)a, *(WCHAR* const*)b); } +static void sort_strs(WCHAR **strs, UINT numstrs) +{ + qsort(strs, numstrs, sizeof(*strs), sort_strs_cmpfn); +} + /* Enumerate all of the strings and sort them in the internal list. @@ -140,7 +145,7 @@ static void enumerate_strings(IAutoCompleteImpl *ac) { strs = tmp; if (cur > 0) - qsort(strs, cur, sizeof(*strs), enumerate_strings_cmpfn); + sort_strs(strs, cur); ac->enum_strs = strs; ac->enum_strs_num = cur;

1 0

Gabriel Ivăncescu : shell32/autocomplete: Implement ACO_FILTERPREFIXES.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 77b23a5e015a96026db0c6ff43b7e0ccbefb4052 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77b23a5e015a96026db0c6ff… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 28 18:27:47 2018 +0200 shell32/autocomplete: Implement ACO_FILTERPREFIXES. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 148 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 132 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77b23a5e015a96026db0…

1 0

Gabriel Ivăncescu : shell32/tests: Add tests for ACO_FILTERPREFIXES.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 8a8bab3ac8d9692624f0b71d99bef770acf5b09a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a8bab3ac8d9692624f0b71d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 28 18:27:48 2018 +0200 shell32/tests: Add tests for ACO_FILTERPREFIXES. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/autocomplete.c | 172 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index ad7eb6a..33a5e64 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -450,6 +450,50 @@ static void dispatch_messages(void) } } +#define check_dropdown(acdropdown, hwnd_edit, list, list_num) check_dropdown_(__FILE__, __LINE__, acdropdown, hwnd_edit, list, list_num) +static void check_dropdown_(const char *file, UINT line, IAutoCompleteDropDown *acdropdown, HWND hwnd_edit, WCHAR **list, UINT list_num) +{ + UINT i; + DWORD flags = 0; + LPWSTR str; + HRESULT hr; + + hr = IAutoCompleteDropDown_GetDropDownStatus(acdropdown, &flags, &str); + ok_(file, line)(hr == S_OK, "IAutoCompleteDropDown_GetDropDownStatus failed: %x\n", hr); + if (hr != S_OK) return; + if (list_num) ok_(file, line)(flags & ACDD_VISIBLE, "AutoComplete DropDown not visible\n"); + else + { + ok_(file, line)(!(flags & ACDD_VISIBLE), "AutoComplete DropDown visible\n"); + return; + } + ok_(file, line)(str == NULL, "Expected (null), got %s\n", wine_dbgstr_w(str)); + if (str) + { + CoTaskMemFree(str); + return; + } + + for (i = 0; i <= list_num; i++) + { + flags = 0; + SendMessageW(hwnd_edit, WM_KEYDOWN, VK_DOWN, 0); + SendMessageW(hwnd_edit, WM_KEYUP, VK_DOWN, 0xc0000000); + hr = IAutoCompleteDropDown_GetDropDownStatus(acdropdown, &flags, &str); + ok_(file, line)(hr == S_OK, "IAutoCompleteDropDown_GetDropDownStatus failed: %x\n", hr); + ok_(file, line)(flags & ACDD_VISIBLE, "AutoComplete DropDown not visible\n"); + if (hr == S_OK) + { + if (i < list_num) + ok_(file, line)(str && !lstrcmpW(list[i], str), "Expected %s, got %s\n", + wine_dbgstr_w(list[i]), wine_dbgstr_w(str)); + else + ok_(file, line)(str == NULL, "Expected (null), got %s\n", wine_dbgstr_w(str)); + } + if (str) CoTaskMemFree(str); + } +} + static void test_aclist_expand(HWND hwnd_edit, void *enumerator) { struct string_enumerator *obj = (struct string_enumerator*)enumerator; @@ -504,6 +548,132 @@ static void test_aclist_expand(HWND hwnd_edit, void *enumerator) ok(obj->num_resets == 5, "Expected 5 resets, got %u\n", obj->num_resets); } +static void test_prefix_filtering(HWND hwnd_edit) +{ + static WCHAR htt[] = {'h','t','t',0}; + static WCHAR www[] = {'w','w','w','.',0}; + static WCHAR str0[] = {'w','w','w','.','a','x',0}; + static WCHAR str1[] = {'h','t','t','p','s',':','/','/','w','w','w','.','a','c',0}; + static WCHAR str2[] = {'a','a',0}; + static WCHAR str3[] = {'a','b',0}; + static WCHAR str4[] = {'h','t','t','p',':','/','/','a','0',0}; + static WCHAR str5[] = {'h','t','t','p','s',':','/','/','h','t','a',0}; + static WCHAR str6[] = {'h','f','o','o',0}; + static WCHAR str7[] = {'h','t','t','p',':','/','/','w','w','w','.','a','d','d',0}; + static WCHAR str8[] = {'w','w','w','.','w','w','w','.','?',0}; + static WCHAR str9[] = {'h','t','t','p',':','/','/','a','b','c','.','a','a','.','c','o','m',0}; + static WCHAR str10[]= {'f','t','p',':','/','/','a','b','c',0}; + static WCHAR str11[]= {'f','i','l','e',':','/','/','a','a',0}; + static WCHAR str12[]= {'f','t','p',':','/','/','w','w','w','.','a','a',0}; + static WCHAR *suggestions[] = { str0, str1, str2, str3, str4, str5, str6, str7, str8, str9, str10, str11, str12 }; + static WCHAR *sorted1[] = { str4, str2, str3, str9, str1, str7, str0 }; + static WCHAR *sorted2[] = { str3, str9 }; + static WCHAR *sorted3[] = { str1, str7, str0 }; + static WCHAR *sorted4[] = { str6, str5 }; + static WCHAR *sorted5[] = { str5 }; + static WCHAR *sorted6[] = { str4, str9 }; + static WCHAR *sorted7[] = { str11, str10, str12 }; + IUnknown *enumerator; + IAutoComplete2 *autocomplete; + IAutoCompleteDropDown *acdropdown; + WCHAR buffer[20]; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_AutoComplete, NULL, CLSCTX_INPROC_SERVER, &IID_IAutoComplete2, (void**)&autocomplete); + ok(hr == S_OK, "CoCreateInstance failed: %x\n", hr); + + hr = IAutoComplete2_QueryInterface(autocomplete, &IID_IAutoCompleteDropDown, (LPVOID*)&acdropdown); + ok(hr == S_OK, "No IAutoCompleteDropDown interface: %x\n", hr); + + string_enumerator_create((void**)&enumerator, suggestions, ARRAY_SIZE(suggestions)); + + hr = IAutoComplete2_SetOptions(autocomplete, ACO_FILTERPREFIXES | ACO_AUTOSUGGEST | ACO_AUTOAPPEND); + ok(hr == S_OK, "IAutoComplete2_SetOptions failed: %x\n", hr); + hr = IAutoComplete2_Init(autocomplete, hwnd_edit, enumerator, NULL, NULL); + ok(hr == S_OK, "IAutoComplete_Init failed: %x\n", hr); + + SendMessageW(hwnd_edit, EM_SETSEL, 0, -1); + SendMessageW(hwnd_edit, WM_CHAR, 'a', 1); + dispatch_messages(); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + ok(lstrcmpW(str4 + 7, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str4 + 7), wine_dbgstr_w(buffer)); + check_dropdown(acdropdown, hwnd_edit, sorted1, ARRAY_SIZE(sorted1)); + + SendMessageW(hwnd_edit, EM_SETSEL, 0, -1); + SendMessageW(hwnd_edit, WM_CHAR, 'a', 1); + SendMessageW(hwnd_edit, WM_CHAR, 'b', 1); + dispatch_messages(); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + ok(lstrcmpW(str3, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str3), wine_dbgstr_w(buffer)); + check_dropdown(acdropdown, hwnd_edit, sorted2, ARRAY_SIZE(sorted2)); + SendMessageW(hwnd_edit, EM_SETSEL, 0, -1); + SendMessageW(hwnd_edit, WM_CHAR, 'a', 1); + SendMessageW(hwnd_edit, WM_CHAR, 'b', 1); + SendMessageW(hwnd_edit, WM_CHAR, 'c', 1); + dispatch_messages(); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + ok(lstrcmpW(str9 + 7, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str9 + 7), wine_dbgstr_w(buffer)); + + SendMessageW(hwnd_edit, WM_SETTEXT, 0, (LPARAM)www); + SendMessageW(hwnd_edit, EM_SETSEL, ARRAY_SIZE(www) - 1, ARRAY_SIZE(www) - 1); + SendMessageW(hwnd_edit, WM_CHAR, 'a', 1); + dispatch_messages(); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + ok(lstrcmpW(str1 + 8, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str1 + 8), wine_dbgstr_w(buffer)); + check_dropdown(acdropdown, hwnd_edit, sorted3, ARRAY_SIZE(sorted3)); + SendMessageW(hwnd_edit, WM_SETTEXT, 0, (LPARAM)www); + SendMessageW(hwnd_edit, EM_SETSEL, ARRAY_SIZE(www) - 1, ARRAY_SIZE(www) - 1); + SendMessageW(hwnd_edit, WM_CHAR, 'w', 1); + dispatch_messages(); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + ok(lstrcmpW(str8, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str8), wine_dbgstr_w(buffer)); + + SendMessageW(hwnd_edit, EM_SETSEL, 0, -1); + SendMessageW(hwnd_edit, WM_CHAR, 'h', 1); + dispatch_messages(); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + ok(lstrcmpW(str6, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str6), wine_dbgstr_w(buffer)); + check_dropdown(acdropdown, hwnd_edit, sorted4, ARRAY_SIZE(sorted4)); + SendMessageW(hwnd_edit, WM_CHAR, 't', 1); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + ok(lstrcmpW(str5 + 8, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str5 + 8), wine_dbgstr_w(buffer)); + check_dropdown(acdropdown, hwnd_edit, sorted5, ARRAY_SIZE(sorted5)); + SendMessageW(hwnd_edit, WM_CHAR, 't', 1); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + ok(lstrcmpW(htt, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(htt), wine_dbgstr_w(buffer)); + check_dropdown(acdropdown, hwnd_edit, NULL, 0); + SendMessageW(hwnd_edit, WM_CHAR, 'p', 1); + SendMessageW(hwnd_edit, WM_CHAR, ':', 1); + SendMessageW(hwnd_edit, WM_CHAR, '/', 1); + SendMessageW(hwnd_edit, WM_CHAR, '/', 1); + SendMessageW(hwnd_edit, WM_CHAR, 'a', 1); + dispatch_messages(); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + ok(lstrcmpW(str4, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str4), wine_dbgstr_w(buffer)); + check_dropdown(acdropdown, hwnd_edit, sorted6, ARRAY_SIZE(sorted6)); + SendMessageW(hwnd_edit, EM_SETSEL, 0, 2); + SendMessageW(hwnd_edit, WM_CHAR, 'H', 1); + dispatch_messages(); + check_dropdown(acdropdown, hwnd_edit, NULL, 0); + SendMessageW(hwnd_edit, WM_CHAR, 't', 1); + dispatch_messages(); + check_dropdown(acdropdown, hwnd_edit, sorted6, ARRAY_SIZE(sorted6)); + + SendMessageW(hwnd_edit, EM_SETSEL, 0, -1); + SendMessageW(hwnd_edit, WM_CHAR, 'F', 1); + dispatch_messages(); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + check_dropdown(acdropdown, hwnd_edit, sorted7, ARRAY_SIZE(sorted7)); + SendMessageW(hwnd_edit, WM_CHAR, 'i', 1); + SendMessageW(hwnd_edit, WM_CHAR, 'L', 1); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + check_dropdown(acdropdown, hwnd_edit, sorted7, 1); + + IAutoCompleteDropDown_Release(acdropdown); + IAutoComplete2_Release(autocomplete); + IUnknown_Release(enumerator); +} + static void test_custom_source(void) { static WCHAR str_alpha[] = {'t','e','s','t','1',0}; @@ -618,6 +788,8 @@ static void test_custom_source(void) ok(obj->num_resets == 1, "Expected 1 reset, got %u\n", obj->num_resets); IAutoCompleteDropDown_Release(acdropdown); + test_prefix_filtering(hwnd_edit); + ShowWindow(hMainWnd, SW_HIDE); DestroyWindow(hwnd_edit); }

1 0

Gabriel Ivăncescu : shell32/autocomplete: Check the edit control in ResetEnumerator instead of whether the object is initialized.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: da2e51b3a6b725d0ba75952843d72d0a8d35785f URL: https://source.winehq.org/git/wine.git/?a=commit;h=da2e51b3a6b725d0ba759528… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 28 18:27:49 2018 +0200 shell32/autocomplete: Check the edit control in ResetEnumerator instead of whether the object is initialized. An autocomplete object can be destroyed and detached from the edit control and still survive, if there are still references to it (even though it's useless). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 9292eec..6c013a8 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -1181,7 +1181,7 @@ static HRESULT WINAPI IAutoCompleteDropDown_fnResetEnumerator( TRACE("(%p)\n", This); - if (This->initialized) + if (This->hwndEdit) { free_enum_strs(This); if ((This->options & ACO_AUTOSUGGEST) && IsWindowVisible(This->hwndListBox))

1 0

Akihiro Sagawa : gdi32: Try Fontconfig substitutions when the font face is missing.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 11ab9ff7b3c43bb41c0325fe9417b1d7f44ad516 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11ab9ff7b3c43bb41c0325fe… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 28 00:50:20 2018 +0900 gdi32: Try Fontconfig substitutions when the font face is missing. This improves font selection. With this patch, we can choose a decent font family by Fontconfig. Otherwise, Wine chooses some fonts based on supported charset, e.g. Droid Sans Fallback. Droid Sans Fallback supports various scripts including Japanese. However, as it's a fallback font, it doesn't have Latin alphabet glyphs. If the font is chosen, typically Japanese Ubuntu environment, users see a lot of squares instead of Latin alphabets. This patch asks Fontconfig for the best font for the current locale. If the font is returned and matches requested charset, the font is used. If failure, it fallbacks to existing procedure. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5a47272..441a771 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -173,9 +173,12 @@ static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter); #ifdef SONAME_LIBFONTCONFIG #include <fontconfig/fontconfig.h> MAKE_FUNCPTR(FcConfigSubstitute); +MAKE_FUNCPTR(FcDefaultSubstitute); MAKE_FUNCPTR(FcFontList); +MAKE_FUNCPTR(FcFontMatch); MAKE_FUNCPTR(FcFontSetDestroy); MAKE_FUNCPTR(FcInit); +MAKE_FUNCPTR(FcPatternAddString); MAKE_FUNCPTR(FcPatternCreate); MAKE_FUNCPTR(FcPatternDestroy); MAKE_FUNCPTR(FcPatternGetBool); @@ -2790,9 +2793,12 @@ static void init_fontconfig(void) #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(fc_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); return;} LOAD_FUNCPTR(FcConfigSubstitute); + LOAD_FUNCPTR(FcDefaultSubstitute); LOAD_FUNCPTR(FcFontList); + LOAD_FUNCPTR(FcFontMatch); LOAD_FUNCPTR(FcFontSetDestroy); LOAD_FUNCPTR(FcInit); + LOAD_FUNCPTR(FcPatternAddString); LOAD_FUNCPTR(FcPatternCreate); LOAD_FUNCPTR(FcPatternDestroy); LOAD_FUNCPTR(FcPatternGetBool); @@ -5196,6 +5202,82 @@ done: return ret; } +#ifdef SONAME_LIBFONTCONFIG +static Family* get_fontconfig_family(DWORD pitch_and_family, const CHARSETINFO *csi) +{ + const char *name; + WCHAR nameW[LF_FACESIZE]; + FcChar8 *str; + FcPattern *pat = NULL, *best = NULL; + FcResult result; + FcBool r; + int ret, i; + Family *family = NULL; + + if (!csi->fs.fsCsb[0]) return NULL; + + if((pitch_and_family & FIXED_PITCH) || + (pitch_and_family & 0xF0) == FF_MODERN) + name = "monospace"; + else if((pitch_and_family & 0xF0) == FF_ROMAN) + name = "serif"; + else + name = "sans-serif"; + + pat = pFcPatternCreate(); + if (!pat) return NULL; + r = pFcPatternAddString(pat, FC_FAMILY, (const FcChar8 *)name); + if (!r) goto end; + r = pFcPatternAddString(pat, FC_NAMELANG, (const FcChar8 *)"en-us"); + if (!r) goto end; + r = pFcPatternAddString(pat, FC_PRGNAME, (const FcChar8 *)"wine"); + if (!r) goto end; + r = pFcConfigSubstitute(NULL, pat, FcMatchPattern); + if (!r) goto end; + pFcDefaultSubstitute(pat); + + best = pFcFontMatch(NULL, pat, &result); + if (!best || result != FcResultMatch) goto end; + + for (i = 0; + !family && pFcPatternGetString(best, FC_FAMILY, i, &str) == FcResultMatch; + i++) + { + Face *face; + const SYSTEM_LINKS *font_link; + const struct list *face_list; + + ret = MultiByteToWideChar(CP_UTF8, 0, (const char*)str, -1, + nameW, ARRAY_SIZE(nameW)); + if (!ret) continue; + family = find_family_from_any_name(nameW); + if (!family) continue; + + font_link = find_font_link(family->FamilyName); + face_list = get_face_list_from_family(family); + LIST_FOR_EACH_ENTRY( face, face_list, Face, entry ) { + if (!face->scalable) + continue; + if (csi->fs.fsCsb[0] & face->fs.fsCsb[0]) + goto found; + if (font_link != NULL && + csi->fs.fsCsb[0] & font_link->fs.fsCsb[0]) + goto found; + } + family = NULL; + } + +found: + if (family) + TRACE("got %s\n", wine_dbgstr_w(nameW)); + +end: + if (!pat) pFcPatternDestroy(pat); + if (!best) pFcPatternDestroy(best); + return family; +} +#endif + static const GSUB_Script* GSUB_get_script_table( const GSUB_Header* header, const char* tag) { const GSUB_ScriptList *script; @@ -5584,6 +5666,12 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) } } +#ifdef SONAME_LIBFONTCONFIG + /* Try FontConfig substitutions if the face isn't found */ + family = get_fontconfig_family(lf.lfPitchAndFamily, &csi); + if (family) goto found; +#endif + last_resort_family = NULL; LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { font_link = find_font_link(family->FamilyName);

1 0

Michael Müller : libwine: Do not restrict base address of main thread on 64 bit mac os.
by Alexandre Julliard 29 Nov '18

29 Nov '18

Module: wine Branch: master Commit: 9fd13a1a5efb467b80a46ffa94f0556eeab4e86d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fd13a1a5efb467b80a46ffa… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Nov 26 17:27:05 2018 -0600 libwine: Do not restrict base address of main thread on 64 bit mac os. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/loader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 0af3b8e..8f40ea0 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -709,6 +709,7 @@ struct apple_stack_info * Callback for wine_mmap_enum_reserved_areas to allocate space for * the secondary thread's stack. */ +#ifndef _WIN64 static int apple_alloc_thread_stack( void *base, size_t size, void *arg ) { struct apple_stack_info *info = arg; @@ -725,6 +726,7 @@ static int apple_alloc_thread_stack( void *base, size_t size, void *arg ) info->desired_size, PROT_READ|PROT_WRITE, MAP_FIXED ); return (info->stack != (void *)-1); } +#endif /*********************************************************************** * apple_create_wine_thread @@ -742,6 +744,7 @@ static void apple_create_wine_thread( void *init_func ) if (!pthread_attr_init( &attr )) { +#ifndef _WIN64 struct apple_stack_info info; /* Try to put the new thread's stack in the reserved area. If this @@ -753,6 +756,7 @@ static void apple_create_wine_thread( void *init_func ) wine_mmap_remove_reserved_area( info.stack, info.desired_size, 0 ); pthread_attr_setstackaddr( &attr, (char*)info.stack + info.desired_size ); } +#endif if (!pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE ) && !pthread_create( &thread, &attr, init_func, NULL ))

1 0