wine-commits December 2014

wine-commits@winehq.org

2 participants
319 discussions

Martin Storsjo : msvcr120: Implement the _vacopy function.
by Alexandre Julliard 08 Dec '14

08 Dec '14

Module: wine Branch: master Commit: 589f58d806908e506fd52a5ef4760932a612de28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589f58d806908e506fd52a5ef… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Dec 5 00:40:51 2014 +0200 msvcr120: Implement the _vacopy function. --- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcrt/misc.c | 8 ++++++++ include/msvcrt/crtdefs.h | 6 ++++++ include/windef.h | 6 ++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1b8dc28..d0ba290 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1792,7 +1792,7 @@ @ cdecl _unlock_file(ptr) MSVCRT__unlock_file @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) -@ stub _vacopy +@ cdecl _vacopy(ptr ptr) MSVCR120__vacopy @ cdecl _vcprintf(str ptr) @ stub _vcprintf_l @ stub _vcprintf_p diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index c66152b..4e9f288 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -490,3 +490,11 @@ BOOL CDECL MSVCR110__crtInitializeCriticalSectionEx( TRACE("(%p %x %x)\n", cs, spin_count, flags); return InitializeCriticalSectionEx(cs, spin_count, flags); } + +/********************************************************************* + * _vacopy (MSVCR120.@) + */ +void CDECL MSVCR120__vacopy(__ms_va_list *dest, __ms_va_list src) +{ + __ms_va_copy(*dest, src); +} diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index da278be..f2600ad 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -80,10 +80,16 @@ # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) +# define __ms_va_copy(dest,src) __builtin_ms_va_copy(dest,src) # else # define __ms_va_list va_list # define __ms_va_start(list,arg) va_start(list,arg) # define __ms_va_end(list) va_end(list) +# ifdef va_copy +# define __ms_va_copy(dest,src) va_copy(dest,src) +# else +# define __ms_va_copy(dest,src) ((dest) = (src)) +# endif # endif #endif diff --git a/include/windef.h b/include/windef.h index 9322c41..e914726 100644 --- a/include/windef.h +++ b/include/windef.h @@ -89,10 +89,16 @@ extern "C" { # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) +# define __ms_va_copy(dest,src) __builtin_ms_va_copy(dest,src) # else # define __ms_va_list va_list # define __ms_va_start(list,arg) va_start(list,arg) # define __ms_va_end(list) va_end(list) +# ifdef va_copy +# define __ms_va_copy(dest,src) va_copy(dest,src) +# else +# define __ms_va_copy(dest,src) ((dest) = (src)) +# endif # endif #endif

1 0

Nikolay Sivov : dwrite: Partially implement GetDesignGlyphMetrics().
by Alexandre Julliard 08 Dec '14

08 Dec '14

Module: wine Branch: master Commit: 9978bfb6d7e1a72f0e055c8bd6f19861e54ec8a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9978bfb6d7e1a72f0e055c8bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 8 13:24:39 2014 +0300 dwrite: Partially implement GetDesignGlyphMetrics(). --- dlls/dwrite/dwrite_private.h | 7 +- dlls/dwrite/font.c | 93 ++++++++++++++++++--------- dlls/dwrite/freetype.c | 149 +++++++++++++++++++++++++++++++++++-------- dlls/dwrite/tests/font.c | 51 +++++++++++++++ 4 files changed, 241 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9978bfb6d7e1a72f0e055…

1 0

Nikolay Sivov : dwrite: Set font style to oblique when oblique simulation, was requested.
by Alexandre Julliard 08 Dec '14

08 Dec '14

Module: wine Branch: master Commit: 517185fcf39356faecfc1e544ed7581b5713b708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=517185fcf39356faecfc1e544… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 8 13:22:01 2014 +0300 dwrite: Set font style to oblique when oblique simulation, was requested. --- dlls/dwrite/font.c | 8 +++++++- dlls/dwrite/tests/font.c | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index df3d2dd..8b57809 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -87,6 +87,7 @@ struct dwrite_font { IDWriteFontFamily *family; USHORT simulations; + DWRITE_FONT_STYLE style; struct dwrite_font_data *data; }; @@ -738,7 +739,7 @@ static DWRITE_FONT_STYLE WINAPI dwritefont_GetStyle(IDWriteFont2 *iface) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); TRACE("(%p)\n", This); - return This->data->style; + return This->style; } static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont2 *iface) @@ -1001,9 +1002,14 @@ static HRESULT create_font(struct dwrite_font_data *data, IDWriteFontFamily *fam This->family = family; IDWriteFontFamily_AddRef(family); This->simulations = simulations; + This->style = data->style; This->data = data; InterlockedIncrement(&This->data->ref); + /* set oblique style from requested simulation */ + if ((simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) && data->style == DWRITE_FONT_STYLE_NORMAL) + This->style = DWRITE_FONT_STYLE_OBLIQUE; + *font = (IDWriteFont*)&This->IDWriteFont2_iface; return S_OK; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 49e7154..4af8338 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -441,10 +441,10 @@ if (0) ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "got %d\n", weight); style = IDWriteFont_GetStyle(font); -todo_wine { ok(style == DWRITE_FONT_STYLE_OBLIQUE, "got %d\n", style); +todo_wine ok(otm.otmfsSelection == 1, "got 0x%08x\n", otm.otmfsSelection); -} + ret = IDWriteFont_IsSymbolFont(font); ok(!ret, "got %d\n", ret);

1 0

Stefan Dösinger : wined3d: Filter messages generated by focus handling.
by Alexandre Julliard 08 Dec '14

08 Dec '14

Module: wine Branch: master Commit: 19c860499a12495e8f7a7cb2909fa948e24261d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c860499a12495e8f7a7cb29… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 4 21:51:49 2014 +0100 wined3d: Filter messages generated by focus handling. --- dlls/d3d8/tests/device.c | 2 +- dlls/d3d9/tests/d3d9ex.c | 5 +---- dlls/d3d9/tests/device.c | 13 +++---------- dlls/ddraw/ddraw.c | 3 ++- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 21 ++++++++++++++------- include/wine/wined3d.h | 1 + 7 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 0084272..73970c1 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2688,7 +2688,7 @@ static void test_wndproc(void) SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", expect_messages->message, expect_messages->window); - todo_wine ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it.\n"); + ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it.\n"); expect_messages = NULL; /* The window is iconic even though no message was sent. */ diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 49be31e..fef80f4 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2236,10 +2236,7 @@ static void test_wndproc(void) SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); - if (tests[i].create_flags & CREATE_DEVICE_NOWINDOWCHANGES) - ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); - else - todo_wine ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); + ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); expect_messages = NULL; /* The window is iconic even though no message was sent. */ diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 72044a5..3206e57 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3675,10 +3675,7 @@ static void test_wndproc(void) SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); - if (tests[i].create_flags & CREATE_DEVICE_NOWINDOWCHANGES) - ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); - else - todo_wine ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); + ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); expect_messages = NULL; /* The window is iconic even though no message was sent. */ @@ -3730,12 +3727,8 @@ static void test_wndproc(void) ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); /* About 1 in 8 test runs receives WM_WINDOWPOSCHANGED on Vista. */ - if (tests[i].create_flags & CREATE_DEVICE_NOWINDOWCHANGES) - ok(!windowposchanged_received || broken(1), - "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); - else - todo_wine ok(!windowposchanged_received || broken(1), - "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); + ok(!windowposchanged_received || broken(1), + "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); expect_messages = NULL; filter_messages = focus_window; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index fce1c22..f0ebc52 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4850,7 +4850,8 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->numIfaces = 1; ddraw->ref7 = 1; - flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING | WINED3D_RESTORE_MODE_ON_ACTIVATE; + flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING + | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES; if (!(ddraw->wined3d = wined3d_create(flags))) { if (!(ddraw->wined3d = wined3d_create(flags | WINED3D_NO3D))) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ae6600e..89ec00a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4961,7 +4961,7 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) { - if (device->filter_messages) + if (device->filter_messages && message != WM_DISPLAYCHANGE) { TRACE("Filtering message: window %p, message %#x, wparam %#lx, lparam %#lx.\n", window, message, wparam, lparam); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 89f83ea..887143f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1176,14 +1176,19 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) { + struct wined3d_device *device = swapchain->device; + BOOL filter_messages = device->filter_messages; + /* This code is not protected by the wined3d mutex, so it may run while * wined3d_device_reset is active. Testing on Windows shows that changing * focus during resets and resetting during focus change events causes * the application to crash with an invalid memory access. */ + device->filter_messages = !(device->wined3d->flags & WINED3D_FOCUS_MESSAGES); + if (activate) { - if (!(swapchain->device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES)) + if (!(device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES)) { /* The d3d versions do not agree on the exact messages here. D3d8 restores * the window but leaves the size untouched, d3d9 sets the size on an @@ -1197,23 +1202,25 @@ void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activa SWP_NOACTIVATE | SWP_NOZORDER); } - if (swapchain->device->wined3d->flags & WINED3D_RESTORE_MODE_ON_ACTIVATE) + if (device->wined3d->flags & WINED3D_RESTORE_MODE_ON_ACTIVATE) { - if (FAILED(wined3d_set_adapter_display_mode(swapchain->device->wined3d, - swapchain->device->adapter->ordinal, &swapchain->d3d_mode))) + if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, + device->adapter->ordinal, &swapchain->d3d_mode))) ERR("Failed to set display mode.\n"); } } else { - if (FAILED(wined3d_set_adapter_display_mode(swapchain->device->wined3d, - swapchain->device->adapter->ordinal, NULL))) + if (FAILED(wined3d_set_adapter_display_mode(device->wined3d, + device->adapter->ordinal, NULL))) ERR("Failed to set display mode.\n"); swapchain->reapply_mode = TRUE; - if (!(swapchain->device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES) + if (!(device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES) && IsWindowVisible(swapchain->device_window)) ShowWindow(swapchain->device_window, SW_MINIMIZE); } + + device->filter_messages = filter_messages; } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2362cbc..baa102a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1238,6 +1238,7 @@ enum wined3d_display_rotation #define WINED3D_VIDMEM_ACCOUNTING 0x00000004 #define WINED3D_PRESENT_CONVERSION 0x00000008 #define WINED3D_RESTORE_MODE_ON_ACTIVATE 0x00000010 +#define WINED3D_FOCUS_MESSAGES 0x00000020 #define WINED3D_RESZ_CODE 0x7fa05000

1 0

Stefan Dösinger : ddraw/tests: Test WM_SYSCOMMAND handling.
by Alexandre Julliard 08 Dec '14

08 Dec '14

Module: wine Branch: master Commit: 262b9cc62e86c6e31ee8bb8fdbbaa5c126a8a505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=262b9cc62e86c6e31ee8bb8fd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 4 21:51:48 2014 +0100 ddraw/tests: Test WM_SYSCOMMAND handling. --- dlls/ddraw/tests/ddraw1.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 168 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=262b9cc62e86c6e31ee8b…

1 0

Stefan Dösinger : ddraw/tests: Fix window deactivation in test_coop_level_activateapp.
by Alexandre Julliard 08 Dec '14

08 Dec '14

Module: wine Branch: master Commit: bd91c559ae5fdaac576b548ae6d0a110532697d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd91c559ae5fdaac576b548ae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 4 21:51:47 2014 +0100 ddraw/tests: Fix window deactivation in test_coop_level_activateapp. --- dlls/ddraw/tests/ddraw1.c | 21 ++++++++------------- dlls/ddraw/tests/ddraw2.c | 21 ++++++++------------- dlls/ddraw/tests/ddraw4.c | 21 ++++++++------------- dlls/ddraw/tests/ddraw7.c | 21 ++++++++------------- 4 files changed, 32 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd91c559ae5fdaac576b5…

1 0

Stefan Dösinger : d3d8/tests: Test WM_SYSCOMMAND handling.
by Alexandre Julliard 08 Dec '14

08 Dec '14

Module: wine Branch: master Commit: c37549ef5df769036150c0fc09442636b0af047e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c37549ef5df769036150c0fc0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 4 21:51:46 2014 +0100 d3d8/tests: Test WM_SYSCOMMAND handling. --- dlls/d3d8/tests/device.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b6875d0..0084272 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2360,6 +2360,32 @@ static void test_wndproc(void) {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, TRUE}, {0, 0, FALSE, 0}, }; + static const struct message sc_restore_messages[] = + { + {WM_WINDOWPOSCHANGING, FOCUS_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, FOCUS_WINDOW, FALSE, 0}, + {WM_SIZE, FOCUS_WINDOW, TRUE, SIZE_RESTORED}, + {WM_SYSCOMMAND, FOCUS_WINDOW, TRUE, SC_RESTORE}, + {0, 0, FALSE, 0}, + }; + static const struct message sc_minimize_messages[] = + { + {WM_SYSCOMMAND, FOCUS_WINDOW, TRUE, SC_MINIMIZE}, + {WM_WINDOWPOSCHANGING, FOCUS_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, FOCUS_WINDOW, FALSE, 0}, + {WM_MOVE, FOCUS_WINDOW, FALSE, 0}, + {WM_SIZE, FOCUS_WINDOW, TRUE, SIZE_MINIMIZED}, + {0, 0, FALSE, 0}, + }; + static const struct message sc_maximize_messages[] = + { + {WM_SYSCOMMAND, FOCUS_WINDOW, TRUE, SC_MAXIMIZE}, + {WM_WINDOWPOSCHANGING, FOCUS_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, FOCUS_WINDOW, FALSE, 0}, + {WM_MOVE, FOCUS_WINDOW, FALSE, 0}, + {WM_SIZE, FOCUS_WINDOW, TRUE, SIZE_MAXIMIZED}, + {0, 0, FALSE, 0}, + }; d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); @@ -2581,12 +2607,42 @@ static void test_wndproc(void) expect_messages->message, expect_messages->window); ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it.\n"); expect_messages = NULL; + flush_events(); ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth, "Got unexpect width %u.\n", devmode.dmPelsWidth); ok(devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect height %u.\n", devmode.dmPelsHeight); + /* SW_SHOWMINNOACTIVE is needed to make FVWM happy. SW_SHOWNOACTIVATE is needed to make windows + * send SIZE_RESTORED after ShowWindow(SW_SHOWMINNOACTIVE). */ + ShowWindow(focus_window, SW_SHOWNOACTIVATE); + ShowWindow(focus_window, SW_SHOWMINNOACTIVE); + flush_events(); + + expect_messages = sc_restore_messages; + SendMessageA(focus_window, WM_SYSCOMMAND, SC_RESTORE, 0); + todo_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + expect_messages = NULL; + flush_events(); + + expect_messages = sc_minimize_messages; + SendMessageA(focus_window, WM_SYSCOMMAND, SC_MINIMIZE, 0); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + expect_messages = NULL; + flush_events(); + + expect_messages = sc_maximize_messages; + SendMessageA(focus_window, WM_SYSCOMMAND, SC_MAXIMIZE, 0); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + expect_messages = NULL; + flush_events(); + + SetForegroundWindow(GetDesktopWindow()); + ShowWindow(device_window, SW_MINIMIZE); ShowWindow(focus_window, SW_MINIMIZE); ShowWindow(focus_window, SW_RESTORE); SetForegroundWindow(focus_window); @@ -2613,6 +2669,9 @@ static void test_wndproc(void) * device will show it again. */ filter_messages = NULL; ShowWindow(device_window, SW_HIDE); + /* Remove the maximized state from the SYSCOMMAND test while we're not + * interfering with a device. */ + ShowWindow(focus_window, SW_SHOWNORMAL); filter_messages = focus_window; device_desc.device_window = focus_window; @@ -2638,6 +2697,35 @@ static void test_wndproc(void) hr = IDirect3DDevice8_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + expect_messages = sc_restore_messages; + SendMessageA(focus_window, WM_SYSCOMMAND, SC_RESTORE, 0); + todo_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + expect_messages = NULL; + flush_events(); + + /* For FVWM. */ + ShowWindow(focus_window, SW_RESTORE); + flush_events(); + + expect_messages = sc_minimize_messages; + SendMessageA(focus_window, WM_SYSCOMMAND, SC_MINIMIZE, 0); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + expect_messages = NULL; + /* Needed to make the next test reliably send WM_SIZE(SIZE_MAXIMIZED). Without + * this call it sends WM_SIZE(SIZE_RESTORED). */ + ShowWindow(focus_window, SW_RESTORE); + flush_events(); + + expect_messages = sc_maximize_messages; + SendMessageA(focus_window, WM_SYSCOMMAND, SC_MAXIMIZE, 0); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + expect_messages = NULL; + SetForegroundWindow(GetDesktopWindow()); + flush_events(); + /* ShowWindow(SW_RESTORE); SetForegroundWindow(desktop); SetForegroundWindow(focus); * results in the second SetForegroundWindow call failing and the device not being * restored on native. Directly useing ShowWindow(SW_RESTORE) works, but it means

1 0

Stefan Dösinger : d3d9/test: Test WM_SYSCOMMAND handling.
by Alexandre Julliard 08 Dec '14

08 Dec '14

Module: wine Branch: master Commit: f217636e2d574c441d7ce8184883e8c488bbc7d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f217636e2d574c441d7ce8184… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 4 21:51:45 2014 +0100 d3d9/test: Test WM_SYSCOMMAND handling. --- dlls/d3d9/tests/d3d9ex.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 83 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f217636e2d574c441d7ce…

1 0

Stefan Dösinger : d3d8/tests: Test focus loss message filtering.
by Alexandre Julliard 08 Dec '14

08 Dec '14

Module: wine Branch: master Commit: e8ce1085a92c46d9bdc4f69a0dc16d6378aa8413 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8ce1085a92c46d9bdc4f69a0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 4 21:51:44 2014 +0100 d3d8/tests: Test focus loss message filtering. --- dlls/d3d8/tests/device.c | 79 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 64 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 33d3cd5..b6875d0 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2181,8 +2181,9 @@ struct message WPARAM expect_wparam; }; -static const struct message *expect_messages, *unexpected_messages; +static const struct message *expect_messages; static HWND device_window, focus_window; +static BOOL windowposchanged_received; struct wndproc_thread_param { @@ -2230,12 +2231,12 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM } } - if (unexpected_messages) - { - const struct message *i; - for (i = unexpected_messages; i->message; i++) - ok(i->message != message, "Got unexpected message %x on window %p.\n", message, hwnd); - } + /* KDE randomly does something with the hidden window during the + * mode change that sometimes generates a WM_WINDOWPOSCHANGING + * message. A WM_WINDOWPOSCHANGED message is not generated, so + * just flag WM_WINDOWPOSCHANGED as bad. */ + if (message == WM_WINDOWPOSCHANGED) + windowposchanged_received = TRUE; return DefWindowProcA(hwnd, message, wparam, lparam); } @@ -2344,13 +2345,19 @@ static void test_wndproc(void) {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, FALSE}, {0, 0, FALSE, 0}, }; - static const struct message focus_loss_messages_hidden_unexpected[] = + static const struct message focus_loss_messages_filtered[] = { - /* KDE randomly does something with the hidden window during the - * mode change that sometimes generates a WM_WINDOWPOSCHANGING - * message. A WM_WINDOWPOSCHANGED message is not generated, so - * just flag WM_WINDOWPOSCHANGED as bad. */ - {WM_WINDOWPOSCHANGED, 0, FALSE, 0}, + /* WM_ACTIVATE is delivered to the window proc because it is + * generated by SetForegroundWindow before the d3d routine + * starts it work. Don't check for it due to focus-follows-mouse + * WMs though. */ + {WM_DISPLAYCHANGE, FOCUS_WINDOW, FALSE, 0}, + {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, FALSE}, + {0, 0, FALSE, 0}, + }; + static const struct message reactivate_messages_filtered[] = + { + {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, TRUE}, {0, 0, FALSE, 0}, }; @@ -2568,12 +2575,12 @@ static void test_wndproc(void) flush_events(); expect_messages = focus_loss_messages_hidden; - unexpected_messages = focus_loss_messages_hidden_unexpected; + windowposchanged_received = FALSE; SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", expect_messages->message, expect_messages->window); + ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it.\n"); expect_messages = NULL; - unexpected_messages = NULL; ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); @@ -2601,6 +2608,13 @@ static void test_wndproc(void) ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); + /* Hide the device window. It prevents WM_ACTIVATEAPP messages from being sent + * on native in the test below. It isn't needed anyways. Creating the third + * device will show it again. */ + filter_messages = NULL; + ShowWindow(device_window, SW_HIDE); + filter_messages = focus_window; + device_desc.device_window = focus_window; if (!(device = create_device(d3d8, focus_window, &device_desc))) { @@ -2608,6 +2622,41 @@ static void test_wndproc(void) goto done; } + filter_messages = NULL; + + expect_messages = focus_loss_messages_filtered; + windowposchanged_received = FALSE; + SetForegroundWindow(GetDesktopWindow()); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + todo_wine ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it.\n"); + expect_messages = NULL; + + /* The window is iconic even though no message was sent. */ + ok(IsIconic(focus_window), "The focus window is not iconic.\n"); + + hr = IDirect3DDevice8_TestCooperativeLevel(device); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + + /* ShowWindow(SW_RESTORE); SetForegroundWindow(desktop); SetForegroundWindow(focus); + * results in the second SetForegroundWindow call failing and the device not being + * restored on native. Directly useing ShowWindow(SW_RESTORE) works, but it means + * we cannot test for the absence of WM_WINDOWPOSCHANGED messages. */ + expect_messages = reactivate_messages_filtered; + ShowWindow(focus_window, SW_RESTORE); + SetForegroundWindow(focus_window); + flush_events(); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it\n", + expect_messages->message, expect_messages->window); + expect_messages = NULL; + + filter_messages = focus_window; + hr = IDirect3DDevice8_TestCooperativeLevel(device); + ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);

1 0

Stefan Dösinger : d3d9/tests: Test focus loss message filtering in d3d9ex.
by Alexandre Julliard 08 Dec '14

08 Dec '14

Module: wine Branch: master Commit: 0c55b9d2b308a61d346fa8a2533e69986885933c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c55b9d2b308a61d346fa8a25… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 4 21:51:43 2014 +0100 d3d9/tests: Test focus loss message filtering in d3d9ex. --- dlls/d3d9/tests/d3d9ex.c | 71 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 0ac9db7..e207405 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1723,8 +1723,9 @@ struct message WPARAM expect_wparam; }; -static const struct message *expect_messages, *unexpected_messages; +static const struct message *expect_messages; static HWND device_window, focus_window; +static BOOL windowposchanged_received; struct wndproc_thread_param { @@ -1772,12 +1773,12 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM } } - if (unexpected_messages) - { - const struct message *i; - for (i = unexpected_messages; i->message; i++) - ok(i->message != message, "Got unexpected message %x on window %p.\n", message, hwnd); - } + /* KDE randomly does something with the hidden window during the + * mode change that sometimes generates a WM_WINDOWPOSCHANGING + * message. A WM_WINDOWPOSCHANGED message is not generated, so + * just flag WM_WINDOWPOSCHANGED as bad. */ + if (message == WM_WINDOWPOSCHANGED) + windowposchanged_received = TRUE; return DefWindowProcA(hwnd, message, wparam, lparam); } @@ -1887,24 +1888,26 @@ static void test_wndproc(void) {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, FALSE}, {0, 0, FALSE, 0}, }; - static const struct message focus_loss_messages_hidden_unexpected[] = + static const struct message focus_loss_messages_filtered[] = { - /* KDE randomly does something with the hidden window during the - * mode change that sometimes generates a WM_WINDOWPOSCHANGING - * message. A WM_WINDOWPOSCHANGED message is not generated, so - * just flag WM_WINDOWPOSCHANGED as bad. */ - {WM_WINDOWPOSCHANGED, 0, FALSE, 0}, + /* WM_ACTIVATE is delivered to the window proc because it is + * generated by SetForegroundWindow before the d3d routine + * starts it work. Don't check for it due to focus-follows-mouse + * WMs though. */ + {WM_DISPLAYCHANGE, FOCUS_WINDOW, FALSE, 0}, + {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, FALSE}, {0, 0, FALSE, 0}, }; static const struct { DWORD create_flags; const struct message *focus_loss_messages; + BOOL iconic; } tests[] = { - {0, focus_loss_messages}, - {CREATE_DEVICE_NOWINDOWCHANGES, focus_loss_messages_nowc}, + {0, focus_loss_messages, TRUE}, + {CREATE_DEVICE_NOWINDOWCHANGES, focus_loss_messages_nowc, FALSE}, }; hr = pDirect3DCreate9Ex(D3D_SDK_VERSION, &d3d9ex); @@ -2122,12 +2125,12 @@ static void test_wndproc(void) flush_events(); expect_messages = focus_loss_messages_hidden; - unexpected_messages = focus_loss_messages_hidden_unexpected; + windowposchanged_received = FALSE; SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); expect_messages = NULL; - unexpected_messages = NULL; ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); @@ -2152,13 +2155,47 @@ static void test_wndproc(void) ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx, i=%u.\n", (LONG_PTR)test_proc, proc, i); + /* Hide the device window. It prevents WM_ACTIVATEAPP messages from being sent + * on native in the test below. It isn't needed anyways. Creating the third + * device will show it again. */ + filter_messages = NULL; + ShowWindow(device_window, SW_HIDE); + filter_messages = focus_window; + device_desc.device_window = focus_window; if (!(device = create_device(focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; } + filter_messages = NULL; + SetForegroundWindow(focus_window); /* For KDE. */ + flush_events(); + + expect_messages = focus_loss_messages_filtered; + windowposchanged_received = FALSE; + SetForegroundWindow(GetDesktopWindow()); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", + expect_messages->message, expect_messages->window, i); + if (tests[i].create_flags & CREATE_DEVICE_NOWINDOWCHANGES) + ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); + else + todo_wine ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); + expect_messages = NULL; + + /* The window is iconic even though no message was sent. */ + ok(!IsIconic(focus_window) == !tests[i].iconic, + "Expected IsIconic %u, got %u, i=%u.\n", tests[i].iconic, IsIconic(focus_window), i); + /* This test can't activate, drop focus and restore focus like in plain d3d9 because d3d9ex + * immediately restores the device on activation. There are plenty of WM_WINDOWPOSCHANGED + * messages that are generated by ShowWindow, so testing for their absence is pointless. */ + ShowWindow(focus_window, SW_MINIMIZE); + ShowWindow(focus_window, SW_RESTORE); + SetForegroundWindow(focus_window); + flush_events(); + + filter_messages = focus_window; ref = IDirect3DDevice9Ex_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u, i=%u.\n", ref, i);

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2014