November 2018 - Wine-Commits

Józef Kucia : wined3d: Lock wined3d mutex in wined3d_swapchain_resize_target().
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: master Commit: 0896decb183b4363235e7bd47ff780c92ba992e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0896decb183b4363235e7bd4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 29 14:33:40 2018 +0100 wined3d: Lock wined3d mutex in wined3d_swapchain_resize_target(). Fixes a deadlock. It can also be seen as a small step towards more fine-grained locking in wined3d. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45431 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 | 7 +------ dlls/wined3d/swapchain.c | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0d325cf..76a4d44 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -434,7 +434,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); struct wined3d_display_mode mode; - HRESULT hr; TRACE("iface %p, target_mode_desc %p.\n", iface, target_mode_desc); @@ -451,11 +450,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i wined3d_display_mode_from_dxgi(&mode, target_mode_desc); - wined3d_mutex_lock(); - hr = wined3d_swapchain_resize_target(swapchain->wined3d_swapchain, &mode); - wined3d_mutex_unlock(); - - return hr; + return wined3d_swapchain_resize_target(swapchain->wined3d_swapchain, &mode); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 43582ce..2170629 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1327,29 +1327,38 @@ static HRESULT wined3d_swapchain_set_display_mode(struct wined3d_swapchain *swap HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchain, const struct wined3d_display_mode *mode) { - struct wined3d_device *device = swapchain->device; struct wined3d_display_mode actual_mode; RECT original_window_rect, window_rect; + struct wined3d_device *device; + HWND window; HRESULT hr; TRACE("swapchain %p, mode %p.\n", swapchain, mode); + wined3d_mutex_lock(); + + device = swapchain->device; + window = swapchain->device_window; + if (swapchain->desc.windowed) { SetRect(&window_rect, 0, 0, mode->width, mode->height); AdjustWindowRectEx(&window_rect, - GetWindowLongW(swapchain->device_window, GWL_STYLE), FALSE, - GetWindowLongW(swapchain->device_window, GWL_EXSTYLE)); + GetWindowLongW(window, GWL_STYLE), FALSE, + GetWindowLongW(window, GWL_EXSTYLE)); SetRect(&window_rect, 0, 0, window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); - GetWindowRect(swapchain->device_window, &original_window_rect); + GetWindowRect(window, &original_window_rect); OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); } else if (swapchain->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { actual_mode = *mode; if (FAILED(hr = wined3d_swapchain_set_display_mode(swapchain, &actual_mode))) + { + wined3d_mutex_unlock(); return hr; + } SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); } else @@ -1358,15 +1367,17 @@ HRESULT CDECL wined3d_swapchain_resize_target(struct wined3d_swapchain *swapchai &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); + wined3d_mutex_unlock(); return hr; } SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); } - MoveWindow(swapchain->device_window, window_rect.left, window_rect.top, - window_rect.right - window_rect.left, - window_rect.bottom - window_rect.top, TRUE); + wined3d_mutex_unlock(); + + MoveWindow(window, window_rect.left, window_rect.top, + window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); return WINED3D_OK; }

1 0

Józef Kucia : dxgi/tests: Add separate window thread for test_resize_target_wndproc().
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: master Commit: 03c37f22eb38e8c3a43c07aa238bf30693b821e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03c37f22eb38e8c3a43c07aa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 29 14:33:41 2018 +0100 dxgi/tests: Add separate window thread for test_resize_target_wndproc(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45431 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/tests/dxgi.c | 80 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 66 insertions(+), 14 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index bfe98f4..1aaed46 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2686,20 +2686,65 @@ static LRESULT CALLBACK resize_target_wndproc(HWND hwnd, unsigned int message, W } } +struct window_thread_data +{ + HWND window; + HANDLE window_created; + HANDLE finished; +}; + +static DWORD WINAPI window_thread(void *data) +{ + struct window_thread_data *thread_data = data; + unsigned int ret; + WNDCLASSA wc; + MSG msg; + + memset(&wc, 0, sizeof(wc)); + wc.lpfnWndProc = resize_target_wndproc; + wc.lpszClassName = "dxgi_resize_target_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + thread_data->window = CreateWindowA("dxgi_resize_target_wndproc_wc", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + ok(!!thread_data->window, "Failed to create window.\n"); + + ret = SetEvent(thread_data->window_created); + ok(ret, "Failed to set event, last error %#x.\n", GetLastError()); + + for (;;) + { + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + + ret = WaitForSingleObject(thread_data->finished, 0); + if (ret != WAIT_TIMEOUT) + break; + } + ok(ret == WAIT_OBJECT_0, "Failed to wait for event, ret %#x, last error %#x.\n", ret, GetLastError()); + + DestroyWindow(thread_data->window); + thread_data->window = NULL; + + UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); + + return 0; +} + static void test_resize_target_wndproc(void) { + struct window_thread_data thread_data; DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGISwapChain *swapchain; IDXGIFactory *factory; IDXGIAdapter *adapter; DXGI_MODE_DESC mode; IDXGIDevice *device; + unsigned int ret; ULONG refcount; LONG_PTR data; - WNDCLASSA wc; + HANDLE thread; HRESULT hr; RECT rect; - BOOL ret; if (!(device = create_device(0))) { @@ -2707,10 +2752,16 @@ static void test_resize_target_wndproc(void) return; } - memset(&wc, 0, sizeof(wc)); - wc.lpfnWndProc = resize_target_wndproc; - wc.lpszClassName = "dxgi_resize_target_wndproc_wc"; - ok(RegisterClassA(&wc), "Failed to register window class.\n"); + memset(&thread_data, 0, sizeof(thread_data)); + thread_data.window_created = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(!!thread_data.window_created, "Failed to create event, last error %#x.\n", GetLastError()); + thread_data.finished = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(!!thread_data.finished, "Failed to create event, last error %#x.\n", GetLastError()); + + thread = CreateThread(NULL, 0, window_thread, &thread_data, 0, NULL); + ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); + ret = WaitForSingleObject(thread_data.window_created, INFINITE); + ok(ret == WAIT_OBJECT_0, "Failed to wait for thread, ret %#x, last error %#x.\n", ret, GetLastError()); hr = IDXGIDevice_GetAdapter(device, &adapter); ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); @@ -2728,18 +2779,14 @@ static void test_resize_target_wndproc(void) swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = thread_data.window; swapchain_desc.Windowed = TRUE; swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - - swapchain_desc.OutputWindow = CreateWindowA("dxgi_resize_target_wndproc_wc", - "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); - ok(!!swapchain_desc.OutputWindow, "Failed to create window.\n"); - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); - data = SetWindowLongPtrA(swapchain_desc.OutputWindow, GWLP_USERDATA, (LONG_PTR)swapchain); + data = SetWindowLongPtrA(thread_data.window, GWLP_USERDATA, (LONG_PTR)swapchain); ok(!data, "Got unexpected GWLP_USERDATA %p.\n", (void *)data); memset(&mode, 0, sizeof(mode)); @@ -2762,7 +2809,6 @@ static void test_resize_target_wndproc(void) refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - DestroyWindow(swapchain_desc.OutputWindow); IDXGIAdapter_Release(adapter); refcount = IDXGIDevice_Release(device); @@ -2770,7 +2816,13 @@ static void test_resize_target_wndproc(void) refcount = IDXGIFactory_Release(factory); ok(!refcount, "Factory has %u references left.\n", refcount); - UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); + ret = SetEvent(thread_data.finished); + ok(ret, "Failed to set event, last error %#x.\n", GetLastError()); + ret = WaitForSingleObject(thread, INFINITE); + ok(ret == WAIT_OBJECT_0, "Failed to wait for thread, ret %#x, last error %#x.\n", ret, GetLastError()); + CloseHandle(thread); + CloseHandle(thread_data.window_created); + CloseHandle(thread_data.finished); } static void test_inexact_modes(void)

1 0

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

Nov. 29, 2018

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/tests: Add test for ResizeTarget() with window procedure.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: master Commit: 5fb9e144c65b7af05f17fc0c080e1eb8a8f99cb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fb9e144c65b7af05f17fc0c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 29 14:33:39 2018 +0100 dxgi/tests: Add test for ResizeTarget() with window procedure. 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/tests/dxgi.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index b3a4705..bfe98f4 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2665,6 +2665,114 @@ static void test_resize_target(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +static LRESULT CALLBACK resize_target_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) +{ + IDXGISwapChain *swapchain = (IDXGISwapChain *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + DXGI_SWAP_CHAIN_DESC desc; + HRESULT hr; + + switch (message) + { + case WM_SIZE: + ok(!!swapchain, "GWLP_USERDATA is NULL.\n"); + hr = IDXGISwapChain_GetDesc(swapchain, &desc); + ok(hr == S_OK, "Failed to get desc, hr %#x.\n", hr); + ok(desc.BufferDesc.Width == 800, "Got unexpected buffer width %u.\n", desc.BufferDesc.Width); + ok(desc.BufferDesc.Height == 600, "Got unexpected buffer height %u.\n", desc.BufferDesc.Height); + return 0; + + default: + return DefWindowProcA(hwnd, message, wparam, lparam); + } +} + +static void test_resize_target_wndproc(void) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + DXGI_MODE_DESC mode; + IDXGIDevice *device; + ULONG refcount; + LONG_PTR data; + WNDCLASSA wc; + HRESULT hr; + RECT rect; + BOOL ret; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + memset(&wc, 0, sizeof(wc)); + wc.lpfnWndProc = resize_target_wndproc; + wc.lpszClassName = "dxgi_resize_target_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 1; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + swapchain_desc.OutputWindow = CreateWindowA("dxgi_resize_target_wndproc_wc", + "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + ok(!!swapchain_desc.OutputWindow, "Failed to create window.\n"); + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + + data = SetWindowLongPtrA(swapchain_desc.OutputWindow, GWLP_USERDATA, (LONG_PTR)swapchain); + ok(!data, "Got unexpected GWLP_USERDATA %p.\n", (void *)data); + + memset(&mode, 0, sizeof(mode)); + mode.Width = 600; + mode.Height = 400; + hr = IDXGISwapChain_ResizeTarget(swapchain, &mode); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); + ok(hr == S_OK, "Getswapchain_desc failed, hr %#x.\n", hr); + ok(swapchain_desc.BufferDesc.Width == 800, + "Got unexpected buffer width %u.\n", swapchain_desc.BufferDesc.Width); + ok(swapchain_desc.BufferDesc.Height == 600, + "Got unexpected buffer height %u.\n", swapchain_desc.BufferDesc.Height); + + ret = GetClientRect(swapchain_desc.OutputWindow, &rect); + ok(ret, "Failed to get client rect.\n"); + ok(rect.right == mode.Width && rect.bottom == mode.Height, + "Got unexpected client rect %s.\n", wine_dbgstr_rect(&rect)); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + DestroyWindow(swapchain_desc.OutputWindow); + + IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + + UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); +} + static void test_inexact_modes(void) { struct swapchain_fullscreen_state initial_state, expected_state; @@ -4753,6 +4861,7 @@ START_TEST(dxgi) queue_test(test_output); queue_test(test_find_closest_matching_mode); queue_test(test_get_containing_output); + queue_test(test_resize_target_wndproc); queue_test(test_create_factory); queue_test(test_private_data); queue_test(test_swapchain_present);

1 0

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

Nov. 29, 2018

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

Andrey Gusev : ntdll/tests: Fix a typo in comment.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: master Commit: 7ec37be381f309a0282b2db1ed936e9a36207fd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ec37be381f309a0282b2db1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 29 14:17:12 2018 +0200 ntdll/tests: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 79344e7..b59d267 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -374,7 +374,7 @@ todo_wine ok(!key, "key = %p\n", key); if (status == STATUS_SUCCESS) NtClose(key); - /* Calling without parent key requres full registry path. */ + /* Calling without parent key requires full registry path. */ pRtlCreateUnicodeStringFromAsciiz( &str, "Machine" ); InitializeObjectAttributes(&attr, &str, 0, 0, 0); key = (HANDLE)0xdeadbeef;

1 0

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

Nov. 29, 2018

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

Nikolay Sivov : shcore: Add SHRegDuplicateHKey().
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: master Commit: a88f66d1556a9b721f818af7d5e0fdcc6a08f54d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a88f66d1556a9b721f818af7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 12:06:13 2018 +0300 shcore: Add SHRegDuplicateHKey(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 12 ++++++++++++ dlls/shcore/shcore.spec | 2 +- dlls/shcore/tests/Makefile.in | 1 + dlls/shcore/tests/shcore.c | 20 ++++++++++++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 1228c9d..96ba7d7 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -1751,3 +1751,15 @@ DWORD WINAPI SHAnsiToUnicode(const char *src, WCHAR *dest, int dest_len) return ret; } + +/************************************************************************* + * SHRegDuplicateHKey [SHCORE.@] + */ +HKEY WINAPI SHRegDuplicateHKey(HKEY hKey) +{ + HKEY newKey = 0; + + RegOpenKeyExW(hKey, 0, 0, MAXIMUM_ALLOWED, &newKey); + TRACE("new key is %p\n", newKey); + return newKey; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index bd2bf12..c7a8744 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -61,7 +61,7 @@ @ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) shlwapi.SHQueryInfoKeyW @ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) shlwapi.SHQueryValueExA @ stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr) shlwapi.SHQueryValueExW -@ stdcall SHRegDuplicateHKey(long) shlwapi.SHRegDuplicateHKey +@ stdcall SHRegDuplicateHKey(long) @ stdcall SHRegGetIntW(ptr wstr long) shlwapi.SHRegGetIntW @ stdcall SHRegGetPathA(long str str ptr long) shlwapi.SHRegGetPathA @ stdcall SHRegGetPathW(long wstr wstr ptr long) shlwapi.SHRegGetPathW diff --git a/dlls/shcore/tests/Makefile.in b/dlls/shcore/tests/Makefile.in index 0ea769a..4f537fa 100644 --- a/dlls/shcore/tests/Makefile.in +++ b/dlls/shcore/tests/Makefile.in @@ -1,4 +1,5 @@ TESTDLL = shcore.dll +IMPORTS = advapi32 C_SRCS = \ shcore.c diff --git a/dlls/shcore/tests/shcore.c b/dlls/shcore/tests/shcore.c index f788afd..0945e12 100644 --- a/dlls/shcore/tests/shcore.c +++ b/dlls/shcore/tests/shcore.c @@ -33,6 +33,7 @@ static int (WINAPI *pSHUnicodeToAnsi)(const WCHAR *, char *, int); static int (WINAPI *pSHAnsiToUnicode)(const char *, WCHAR *, int); static int (WINAPI *pSHAnsiToAnsi)(const char *, char *, int); static int (WINAPI *pSHUnicodeToUnicode)(const WCHAR *, WCHAR *, int); +static HKEY (WINAPI *pSHRegDuplicateHKey)(HKEY); static void init(HMODULE hshcore) { @@ -43,6 +44,7 @@ static void init(HMODULE hshcore) X(SHAnsiToUnicode); X(SHAnsiToAnsi); X(SHUnicodeToUnicode); + X(SHRegDuplicateHKey); #undef X } @@ -300,6 +302,23 @@ static void test_SHUnicodeToUnicode(void) ok(buff[5] == 'f', "Unexpected buffer contents.\n"); } +static void test_SHRegDuplicateHKey(void) +{ + HKEY hkey, hkey2; + DWORD ret; + + ret = RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkey); + ok(!ret, "Failed to create test key, ret %d.\n", ret); + + hkey2 = pSHRegDuplicateHKey(hkey); + ok(hkey2 != NULL && hkey2 != hkey, "Unexpected duplicate key.\n"); + + RegCloseKey(hkey2); + RegCloseKey(hkey); + + RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test"); +} + START_TEST(shcore) { HMODULE hshcore = LoadLibraryA("shcore.dll"); @@ -317,4 +336,5 @@ START_TEST(shcore) test_SHAnsiToUnicode(); test_SHAnsiToAnsi(); test_SHUnicodeToUnicode(); + test_SHRegDuplicateHKey(); }

1 0

Dmitry Timoshkov : gdi32: ExtTextOut on a path with bitmap font selected shouldn't fail.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: master Commit: 3e9da621a249b32e5db86c42bda38c9f72d77e05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e9da621a249b32e5db86c42… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 29 12:28:24 2018 +0300 gdi32: ExtTextOut on a path with bitmap font selected shouldn't fail. This just leads to empty path generated. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 2 +- dlls/gdi32/tests/metafile.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 49e270c..402b082 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1594,7 +1594,7 @@ static BOOL pathdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const REC void *outline; dwSize = GetGlyphOutlineW(dev->hdc, str[idx], ggo_flags, &gm, 0, NULL, &identity); - if (dwSize == GDI_ERROR) return FALSE; + if (dwSize == GDI_ERROR) continue; /* add outline only if char is printable */ if(dwSize) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index c683f58..b33437a 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2439,7 +2439,6 @@ static void test_emf_ExtTextOut_on_path(void) ok(ret, "BeginPath error %d\n", GetLastError()); ret = ExtTextOutA(hdcDisplay, 11, 22, 0, NULL, "Test", 4, dx); -todo_wine ok(ret, "ExtTextOut error %d\n", GetLastError()); ret = EndPath(hdcDisplay); @@ -2455,7 +2454,7 @@ todo_wine ok(ret, "BeginPath error %d\n", GetLastError()); ret = ExtTextOutA(hdcMetafile, 11, 22, 0, NULL, "Test", 4, dx); - todo_wine ok(ret, "ExtTextOut error %d\n", GetLastError()); + ok(ret, "ExtTextOut error %d\n", GetLastError()); ret = EndPath(hdcMetafile); ok(ret, "EndPath error %d\n", GetLastError()); @@ -2514,7 +2513,6 @@ todo_wine ok(ret, "BeginPath error %d\n", GetLastError()); ret = ExtTextOutA(hdcMetafile, 11, 22, 0, NULL, "Test", 4, dx); -todo_wine ok(ret, "ExtTextOut error %d\n", GetLastError()); ret = EndPath(hdcMetafile);

1 0

Andrey Gusev : kernel32/tests: Fix typos in ok() messages.
by Alexandre Julliard Nov. 29, 2018

Nov. 29, 2018

Module: wine Branch: master Commit: bf8eb249138c61614c92acf1c6e12ce22c9013ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf8eb249138c61614c92acf1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 29 14:18:35 2018 +0200 kernel32/tests: Fix typos in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index f27bbdf..331db9b 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1012,8 +1012,8 @@ static VOID test_GetCurrentThreadStackLimits(void) } pGetCurrentThreadStackLimits(&low, &high); - ok(low == (ULONG_PTR)NtCurrentTeb()->DeallocationStack, "exptected %p, got %lx\n", NtCurrentTeb()->DeallocationStack, low); - ok(high == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase, "exptected %p, got %lx\n", NtCurrentTeb()->Tib.StackBase, high); + ok(low == (ULONG_PTR)NtCurrentTeb()->DeallocationStack, "expected %p, got %lx\n", NtCurrentTeb()->DeallocationStack, low); + ok(high == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase, "expected %p, got %lx\n", NtCurrentTeb()->Tib.StackBase, high); } static VOID test_GetThreadExitCode(void)

1 0