November 2014 - Wine-Commits

Sebastian Lackner : user32/tests: Reenable test function for WM_GETTEXT.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 0a6e56bdc686912adefefc06c39043a659743508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a6e56bdc686912adefefc06c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 05:01:45 2014 +0100 user32/tests: Reenable test function for WM_GETTEXT. --- dlls/user32/tests/win.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index e7ffb25..24cbd78 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5691,21 +5691,15 @@ static void test_ShowWindow(void) static void test_gettext(void) { - WNDCLASSA cls; - LPCSTR clsname = "gettexttest"; HWND hwnd; LRESULT r; - memset( &cls, 0, sizeof cls ); - cls.lpfnWndProc = DefWindowProcA; - cls.lpszClassName = clsname; - cls.hInstance = GetModuleHandleA(NULL); - - if (!RegisterClassA( &cls )) return; - - hwnd = CreateWindowA( clsname, "test text", WS_OVERLAPPED, 0, 0, 10, 10, 0, NULL, NULL, NULL); - ok( hwnd != NULL, "window was null\n"); + hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL ); + ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + /* seems to crash on every modern Windows version */ + if (0) + { r = SendMessageA( hwnd, WM_GETTEXT, 0x10, 0x1000); ok( r == 0, "settext should return zero\n"); @@ -5717,9 +5711,9 @@ static void test_gettext(void) r = SendMessageA( hwnd, WM_GETTEXT, 0x1000, 0xff000000); ok( r == 0, "settext should return zero (%ld)\n", r); + } DestroyWindow(hwnd); - UnregisterClassA( clsname, NULL ); } @@ -7987,7 +7981,7 @@ START_TEST(win) test_csparentdc(); test_SetWindowLong(); test_ShowWindow(); - if (0) test_gettext(); /* crashes on NT4 */ + test_gettext(); test_GetUpdateRect(); test_Expose(); test_layered_window();

1 0

Sebastian Lackner : user32/tests: Add tests for internal window messages of FindWindowEx.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 381adbf1c4bdce69ad3e6f35eb28eb6f7c348b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=381adbf1c4bdce69ad3e6f35e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 04:52:30 2014 +0100 user32/tests: Add tests for internal window messages of FindWindowEx. --- dlls/user32/tests/win.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d1a7ca4..e7ffb25 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -63,6 +63,7 @@ static DWORD (WINAPI *pGetLayout)(HDC hdc); static BOOL (WINAPI *pMirrorRgn)(HWND hwnd, HRGN hrgn); static BOOL test_lbuttondown_flag; +static DWORD num_gettext_msgs; static HWND hwndMessage; static HWND hwndMain, hwndMain2; static HHOOK hhook; @@ -794,6 +795,9 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR flush_events( FALSE ); } break; + case WM_GETTEXT: + num_gettext_msgs++; + break; } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -6935,22 +6939,38 @@ static void test_FindWindowEx(void) hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0,0,0,0, 0, 0, 0, NULL ); ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == NULL, "expected a NULL hwnd\n" ); + todo_wine + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", NULL ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", "caption" ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + todo_wine + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); DestroyWindow( hwnd ); hwnd = CreateWindowExA( 0, "MainWindowClass", NULL, WS_POPUP, 0,0,0,0, 0, 0, 0, NULL ); ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + todo_wine + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", NULL ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); DestroyWindow( hwnd );

1 0

Stefan Dösinger : d3d9/tests: Test messages on focus loss.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 9bcd9722f10a893da1e47b0a83ec1c4d16b273e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bcd9722f10a893da1e47b0a8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 17 21:17:20 2014 +0100 d3d9/tests: Test messages on focus loss. --- dlls/d3d9/tests/d3d9ex.c | 286 +++++++++++++++++++++++++++++--------------- dlls/d3d9/tests/device.c | 302 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 393 insertions(+), 195 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bcd9722f10a893da1e47…

1 0

Sebastian Lackner : server: Avoid leaking file descriptor on error in create_thread function.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 0e2e9e4efcaf72d1f50efc6fec8ca402951d1006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e2e9e4efcaf72d1f50efc6fe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 17 19:23:13 2014 +0100 server: Avoid leaking file descriptor on error in create_thread function. --- server/thread.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/thread.c b/server/thread.c index 97860ee..ba3f1d5 100644 --- a/server/thread.c +++ b/server/thread.c @@ -219,11 +219,16 @@ struct thread *create_thread( int fd, struct process *process ) if (process->is_terminating) { + close( fd ); set_error( STATUS_PROCESS_IS_TERMINATING ); return NULL; } - if (!(thread = alloc_object( &thread_ops ))) return NULL; + if (!(thread = alloc_object( &thread_ops ))) + { + close( fd ); + return NULL; + } init_thread_structure( thread ); @@ -236,6 +241,7 @@ struct thread *create_thread( int fd, struct process *process ) if (!(thread->id = alloc_ptid( thread ))) { + close( fd ); release_object( thread ); return NULL; }

1 0

Nikolay Sivov : dwrite: Remove null pointer checks that can't fail.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 65644170826d65f0f38eac779241481059bab9e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65644170826d65f0f38eac779… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 18 12:26:01 2014 +0300 dwrite: Remove null pointer checks that can't fail. --- dlls/dwrite/font.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a8d1efe..91aca96 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -179,10 +179,8 @@ static inline void* get_fontface_cmap(struct dwrite_fontface *fontface) static void release_font_data(struct dwrite_font_data *data) { int i; - if (!data) - return; - i = InterlockedDecrement(&data->ref); - if (i > 0) + + if (InterlockedDecrement(&data->ref) > 0) return; for (i = DWRITE_INFORMATIONAL_STRING_NONE; i < sizeof(data->info_strings)/sizeof(data->info_strings[0]); i++) { @@ -196,14 +194,13 @@ static void release_font_data(struct dwrite_font_data *data) heap_free(data); } -static VOID _free_fontfamily_data(struct dwrite_fontfamily_data *data) +static void release_fontfamily_data(struct dwrite_fontfamily_data *data) { int i; - if (!data) - return; - i = InterlockedDecrement(&data->ref); - if (i > 0) + + if (InterlockedDecrement(&data->ref) > 0) return; + for (i = 0; i < data->font_count; i++) release_font_data(data->fonts[i]); heap_free(data->fonts); @@ -1060,7 +1057,7 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) if (!ref) { IDWriteFontCollection_Release(This->collection); - _free_fontfamily_data(This->data); + release_fontfamily_data(This->data); heap_free(This); } @@ -1238,7 +1235,7 @@ static ULONG WINAPI dwritefontcollection_Release(IDWriteFontCollection *iface) if (!ref) { for (i = 0; i < This->family_count; i++) - _free_fontfamily_data(This->family_data[i]); + release_fontfamily_data(This->family_data[i]); heap_free(This->family_data); heap_free(This); }

1 0

Stefan Dösinger : d3d8/tests: Test messages on focus loss.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 33976b4f445c1991988e999544909330f5fe9844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33976b4f445c1991988e99954… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 17 21:17:22 2014 +0100 d3d8/tests: Test messages on focus loss. --- dlls/d3d8/tests/device.c | 102 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 89 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index bf7f181..55d522f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2136,6 +2136,8 @@ struct message { UINT message; enum message_window window; + BOOL check_wparam; + WPARAM expect_wparam; }; static const struct message *expect_messages; @@ -2176,7 +2178,15 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM break; }; - if (hwnd == w && expect_messages->message == message) ++expect_messages; + if (hwnd == w && expect_messages->message == message) + { + if (expect_messages->check_wparam) + ok(wparam == expect_messages->expect_wparam, + "Got unexpected wparam %lx for message %x, expected %lx.\n", + wparam, message, expect_messages->expect_wparam); + + ++expect_messages; + } } return DefWindowProcA(hwnd, message, wparam, lparam); @@ -2227,16 +2237,41 @@ static void test_wndproc(void) ULONG ref; DWORD res, tid; HWND tmp; + HRESULT hr; - static const struct message messages[] = - { - {WM_WINDOWPOSCHANGING, FOCUS_WINDOW}, - {WM_ACTIVATE, FOCUS_WINDOW}, - {WM_SETFOCUS, FOCUS_WINDOW}, - {WM_WINDOWPOSCHANGING, DEVICE_WINDOW}, - {WM_MOVE, DEVICE_WINDOW}, - {WM_SIZE, DEVICE_WINDOW}, - {0, 0}, + static const struct message create_messages[] = + { + {WM_WINDOWPOSCHANGING, FOCUS_WINDOW, FALSE, 0}, + /* Do not test wparam here. If device creation succeeds, + * wparam is WA_ACTIVE. If device creation fails (testbot) + * wparam is set to WA_INACTIVE on some Windows versions. */ + {WM_ACTIVATE, FOCUS_WINDOW, FALSE, 0}, + {WM_SETFOCUS, FOCUS_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_MOVE, DEVICE_WINDOW, FALSE, 0}, + {WM_SIZE, DEVICE_WINDOW, FALSE, 0}, + {0, 0, FALSE, 0}, + }; + static const struct message focus_loss_messages[] = + { + /* WM_ACTIVATE (wparam = WA_INACTIVE) is sent on Windows. It is + * not reliable on X11 WMs. When the window focus follows the + * mouse pointer the message is not sent. + * {WM_ACTIVATE, FOCUS_WINDOW, TRUE, WA_INACTIVE}, */ + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + /* Windows sends WM_ACTIVATE to the device window, indicating that + * SW_SHOWMINIMIZED is used instead of SW_MINIMIZE. Yet afterwards + * the foreground and focus window are NULL. On Wine SW_SHOWMINIMIZED + * leaves the device window active, breaking re-activation in the + * lost device test. + * {WM_ACTIVATE, DEVICE_WINDOW, TRUE, 0x200000 | WA_ACTIVE}, */ + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + {WM_SIZE, DEVICE_WINDOW, TRUE, SIZE_MINIMIZED}, + {WM_ACTIVATEAPP, FOCUS_WINDOW, TRUE, FALSE}, + /* WM_ACTIVATEAPP is sent to the device window too, but the order is + * not deterministic. It may be sent after the focus window handling + * or before. */ + {0, 0, FALSE, 0}, }; d3d8 = Direct3DCreate8(D3D_SDK_VERSION); @@ -2286,7 +2321,7 @@ static void test_wndproc(void) flush_events(); - expect_messages = messages; + expect_messages = create_messages; device_desc.device_window = device_window; device_desc.width = registry_mode.dmPelsWidth; @@ -2312,8 +2347,6 @@ static void test_wndproc(void) SetForegroundWindow(focus_window); flush_events(); - filter_messages = focus_window; - proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); @@ -2321,6 +2354,49 @@ static void test_wndproc(void) proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc); + expect_messages = focus_loss_messages; + /* SetForegroundWindow is a poor replacement for the user pressing alt-tab or + * manually changing the focus. It generates the same messages, but the task + * bar still shows the previous foreground window as active, and the window has + * an inactive titlebar if reactivated with SetForegroundWindow. Reactivating + * the device is difficult, see below. */ + SetForegroundWindow(GetDesktopWindow()); + 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; + tmp = GetFocus(); + ok(tmp != device_window, "The device window is active.\n"); + ok(tmp != focus_window, "The focus window is active.\n"); + + /* The Present call is necessary to make native realize the device is lost. */ + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + /* Focus-follows-mouse WMs prematurely reactivate our window. */ + if (hr == D3DERR_DEVICENOTRESET) + todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + else + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + + /* I have to minimize and restore the focus window, otherwise native d3d9 fails + * device::reset with D3DERR_DEVICELOST. This does not happen when the window + * restore is triggered by the user. */ + ShowWindow(focus_window, SW_MINIMIZE); + ShowWindow(focus_window, SW_RESTORE); + /* Set focus twice to make KDE and fvwm in focus-follows-mouse mode happy. */ + SetForegroundWindow(focus_window); + flush_events(); + SetForegroundWindow(focus_window); + flush_events(); + + hr = IDirect3DDevice8_TestCooperativeLevel(device); + ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + + /* Releasing a device in lost state breaks follow-up tests on native. */ + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + + filter_messages = focus_window; 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 style changes on focus loss.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: ef60604d44191f2675e2f26c5c7d930422e3a9eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef60604d44191f2675e2f26c5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 17 21:17:21 2014 +0100 d3d9/tests: Test style changes on focus loss. --- dlls/d3d9/tests/d3d9ex.c | 85 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/d3d9/tests/device.c | 40 +++++++++++++++++++++-- 2 files changed, 117 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index a43baa4..ff3864a 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2227,24 +2227,27 @@ done: static void test_window_style(void) { RECT focus_rect, device_rect, fullscreen_rect, r, r2; - LONG device_style, device_exstyle; + LONG device_style, device_exstyle, expected_style; LONG focus_style, focus_exstyle; struct device_desc device_desc; LONG style; IDirect3DDevice9Ex *device; HRESULT hr; ULONG ref; + BOOL ret; static const struct { LONG style_flags; DWORD device_flags; + LONG focus_loss_style; + LONG create2_style, create2_exstyle; } tests[] = { - {0, 0}, - {WS_VISIBLE, 0}, - {0, CREATE_DEVICE_NOWINDOWCHANGES}, - {WS_VISIBLE, CREATE_DEVICE_NOWINDOWCHANGES}, + {0, 0, 0, WS_VISIBLE, WS_EX_TOPMOST}, + {WS_VISIBLE, 0, WS_MINIMIZE, WS_VISIBLE, WS_EX_TOPMOST}, + {0, CREATE_DEVICE_NOWINDOWCHANGES, 0, 0, 0}, + {WS_VISIBLE, CREATE_DEVICE_NOWINDOWCHANGES, 0, 0, 0}, }; unsigned int i; @@ -2332,6 +2335,78 @@ static void test_window_style(void) ref = IDirect3DDevice9Ex_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + style = GetWindowLongA(device_window, GWL_STYLE); + if (device_style & WS_VISIBLE) + ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", + device_style, style, i); + else + todo_wine ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", + device_style, style, i); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x, i=%u.\n", + device_exstyle, style, i); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x, i=%u.\n", + focus_style, style, i); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x, i=%u.\n", + focus_exstyle, style, i); + + /* The second time a device is created on the window the window becomes visible and + * topmost if D3DCREATE_NOWINDOWCHANGES is not set. */ + device_desc.flags = CREATE_DEVICE_FULLSCREEN | tests[i].device_flags; + device = create_device(focus_window, &device_desc); + ok(!!device, "Failed to create a D3D device.\n"); + style = GetWindowLongA(device_window, GWL_STYLE); + expected_style = device_style | tests[i].create2_style; + todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", + expected_style, style, i); + expected_style = device_exstyle | tests[i].create2_exstyle; + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n", + expected_style, style, i); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x, i=%u.\n", + focus_style, style, i); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x, i=%u.\n", + focus_exstyle, style, i); + ref = IDirect3DDevice9Ex_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + + DestroyWindow(device_window); + DestroyWindow(focus_window); + focus_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW | tests[i].style_flags, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + device_window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW | tests[i].style_flags, + 0, 0, registry_mode.dmPelsWidth / 2, registry_mode.dmPelsHeight / 2, 0, 0, 0, 0); + + device_desc.device_window = device_window; + device = create_device(focus_window, &device_desc); + ok(!!device, "Failed to create a D3D device.\n"); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + + style = GetWindowLongA(device_window, GWL_STYLE); + expected_style = device_style | tests[i].focus_loss_style; + todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", + expected_style, style, i); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x, i=%u.\n", + device_exstyle, style, i); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x, i=%u.\n", + focus_style, style, i); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x, i=%u.\n", + focus_exstyle, style, i); + + ref = IDirect3DDevice9Ex_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + DestroyWindow(device_window); DestroyWindow(focus_window); } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5ffcfdc..e41dcbc 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3796,15 +3796,16 @@ static void test_window_style(void) IDirect3D9 *d3d9; HRESULT hr; ULONG ref; + BOOL ret; static const struct { DWORD device_flags; - LONG style, exstyle; + LONG style, focus_loss_style, exstyle; } tests[] = { - {0, WS_VISIBLE, WS_EX_TOPMOST}, - {CREATE_DEVICE_NOWINDOWCHANGES, 0}, + {0, WS_VISIBLE, WS_MINIMIZE, WS_EX_TOPMOST}, + {CREATE_DEVICE_NOWINDOWCHANGES, 0, 0, 0}, }; unsigned int i; @@ -3899,6 +3900,39 @@ static void test_window_style(void) ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x, i=%u.\n", focus_exstyle, style, i); + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + + style = GetWindowLongA(device_window, GWL_STYLE); + expected_style = device_style | tests[i].focus_loss_style | tests[i].style; + todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x.\n", + expected_style, style); + style = GetWindowLongA(device_window, GWL_EXSTYLE); + expected_style = device_exstyle | tests[i].exstyle; + todo_wine ok(style == expected_style, "Expected device window extended style %#x, got %#x.\n", + expected_style, style); + + style = GetWindowLongA(focus_window, GWL_STYLE); + ok(style == focus_style, "Expected focus window style %#x, got %#x.\n", + focus_style, style); + style = GetWindowLongA(focus_window, GWL_EXSTYLE); + ok(style == focus_exstyle, "Expected focus window extended style %#x, got %#x.\n", + focus_exstyle, style); + + /* In d3d8 follow-up tests fail on native if the device is destroyed while + * lost. This doesn't happen in d3d9 on my test machine but it still seems + * like a good idea to reset it first. */ + ShowWindow(focus_window, SW_MINIMIZE); + ShowWindow(focus_window, SW_RESTORE); + ret = SetForegroundWindow(focus_window); + ok(ret, "Failed to set foreground window.\n"); + flush_events(); + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + ref = IDirect3DDevice9_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);

1 0

Michael Stefaniuc : comdlg32: Simplify check for an empty string ( PVS-Studio).
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: b4b58a82e3ddddbc0bc5837b912bd85966501e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b58a82e3ddddbc0bc5837b9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 18 10:18:20 2014 +0100 comdlg32: Simplify check for an empty string (PVS-Studio). --- dlls/comdlg32/filedlgbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 499ebb7..eed34f5 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -942,7 +942,7 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBr return S_OK; /* Check if there is a mask to apply if not */ - if(!fodInfos->ShellInfos.lpstrCurrentFilter || !lstrlenW(fodInfos->ShellInfos.lpstrCurrentFilter)) + if(!fodInfos->ShellInfos.lpstrCurrentFilter || !fodInfos->ShellInfos.lpstrCurrentFilter[0]) return S_OK; if (SUCCEEDED(IShellFolder_GetDisplayNameOf(fodInfos->Shell.FOIShellFolder, pidl, SHGDN_INFOLDER | SHGDN_FORPARSING, &str)))

1 0

Sebastian Lackner : shlwapi: Fix invalid usage of CompareString in PathCreateFromUrlW.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 132164423905c495785bd64f74867712c5fcec97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=132164423905c495785bd64f7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 07:11:39 2014 +0100 shlwapi: Fix invalid usage of CompareString in PathCreateFromUrlW. --- dlls/shlwapi/path.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 5c7a88a..a3b462c 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -3313,6 +3313,9 @@ HRESULT WINAPI PathCreateFromUrlW(LPCWSTR pszUrl, LPWSTR pszPath, if (!pszUrl || !pszPath || !pcchPath || !*pcchPath) return E_INVALIDARG; + if (lstrlenW(pszUrl) < 5) + return E_INVALIDARG; + if (CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pszUrl, 5, file_colon, 5) != CSTR_EQUAL) return E_INVALIDARG; @@ -3354,9 +3357,8 @@ HRESULT WINAPI PathCreateFromUrlW(LPCWSTR pszUrl, LPWSTR pszPath, src -= 1; break; case 2: - if (CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, src, 9, - localhost, 9) == CSTR_EQUAL && - (src[9] == '/' || src[9] == '\\')) + if (lstrlenW(src) >= 10 && CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, + src, 9, localhost, 9) == CSTR_EQUAL && (src[9] == '/' || src[9] == '\\')) { /* 'file://localhost/' + escaped DOS path */ src += 10;

1 0

Sebastian Lackner : user32/tests: Remove unnecessary char array and add additional test in test_FindWindowEx.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 0cf86baf65e265fe81d93c5299a325bf658b15c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf86baf65e265fe81d93c529… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 04:46:08 2014 +0100 user32/tests: Remove unnecessary char array and add additional test in test_FindWindowEx. --- dlls/user32/tests/win.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cfc2a02..d1a7ca4 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6931,24 +6931,23 @@ todo_wine static void test_FindWindowEx(void) { HWND hwnd, found; - CHAR title[1]; hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0,0,0,0, 0, 0, 0, NULL ); ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); - title[0] = 0; - - found = FindWindowExA( 0, 0, "MainWindowClass", title ); + found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == NULL, "expected a NULL hwnd\n" ); found = FindWindowExA( 0, 0, "MainWindowClass", NULL ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + found = FindWindowExA( 0, 0, "MainWindowClass", "caption" ); + ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); DestroyWindow( hwnd ); hwnd = CreateWindowExA( 0, "MainWindowClass", NULL, WS_POPUP, 0,0,0,0, 0, 0, 0, NULL ); ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); - found = FindWindowExA( 0, 0, "MainWindowClass", title ); + found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); found = FindWindowExA( 0, 0, "MainWindowClass", NULL ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); @@ -6956,7 +6955,7 @@ static void test_FindWindowEx(void) DestroyWindow( hwnd ); /* test behaviour with a window title that is an empty character */ - found = FindWindowExA( 0, 0, "Shell_TrayWnd", title ); + found = FindWindowExA( 0, 0, "Shell_TrayWnd", "" ); ok( found != NULL, "found is NULL, expected a valid hwnd\n" ); found = FindWindowExA( 0, 0, "Shell_TrayWnd", NULL ); ok( found != NULL, "found is NULL, expected a valid hwnd\n" );

1 0