January 2021 - Wine-Commits

Tag wine-6.0-rc6 : Alexandre Julliard : Release 6.0-rc6
by Alexandre Julliard Jan. 8, 2021

Jan. 8, 2021

Module: wine Branch: refs/tags/wine-6.0-rc6 Tag: 936e28af2970470cb461d0cb87a22d895df1ba1e URL: https://source.winehq.org/git/wine.git/?a=tag;h=936e28af2970470cb461d0cb87a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 8 22:03:21 2021 +0100 Release 6.0-rc6

1 0

Alexandre Julliard : Release 6.0-rc6.
by Alexandre Julliard Jan. 8, 2021

Jan. 8, 2021

Module: wine Branch: master Commit: 7d3186e029fb4cf417fab59483a37d8aece95b5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d3186e029fb4cf417fab594… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 8 22:03:21 2021 +0100 Release 6.0-rc6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 127 ++++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 ++++----- 3 files changed, 67 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d3186e029fb4cf417fa…

1 0

Nikolay Sivov : mfplat/tests: Get source events in async mode.
by Alexandre Julliard Jan. 8, 2021

Jan. 8, 2021

Module: wine Branch: master Commit: f72f1ff9529e3c340f639fc9509011a7933fece8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f72f1ff9529e3c340f639fc9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 8 17:42:34 2021 +0300 mfplat/tests: Get source events in async mode. Fixes test crashes on Windows 7, that happen on synchronous GetEvent(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 95 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 67 insertions(+), 28 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index b361d4da162..77ac299c918 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -191,6 +191,7 @@ struct test_callback IMFAsyncCallback IMFAsyncCallback_iface; HANDLE event; DWORD param; + IMFMediaEvent *media_event; }; static struct test_callback *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) @@ -420,38 +421,77 @@ static const IMFAsyncCallbackVtbl test_create_from_file_handler_callback_vtbl = test_create_from_file_handler_callback_Invoke, }; +static HRESULT WINAPI source_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct test_callback *callback = impl_from_IMFAsyncCallback(iface); + IMFMediaEventGenerator *generator; + HRESULT hr; + + ok(!!result, "Unexpected result object.\n"); + + generator = (IMFMediaEventGenerator *)IMFAsyncResult_GetStateNoAddRef(result); + + hr = IMFMediaEventGenerator_EndGetEvent(generator, result, &callback->media_event); + ok(hr == S_OK, "Failed to create an object, hr %#x.\n", hr); + + SetEvent(callback->event); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl events_callback_vtbl = +{ + testcallback_QueryInterface, + testcallback_AddRef, + testcallback_Release, + testcallback_GetParameters, + source_events_callback_Invoke, +}; + static BOOL get_event(IMFMediaEventGenerator *generator, MediaEventType expected_event_type, PROPVARIANT *value) { + struct test_callback callback = { 0 }; MediaEventType event_type; - HRESULT hr, event_status; - IMFMediaEvent *event; + BOOL ret = FALSE; + HRESULT hr; - hr = IMFMediaEventGenerator_GetEvent(generator, 0, &event); - ok(hr == S_OK, "Failed to get event, hr %#x.\n", hr); + callback.IMFAsyncCallback_iface.lpVtbl = &events_callback_vtbl; + callback.event = CreateEventA(NULL, FALSE, FALSE, NULL); - hr = IMFMediaEvent_GetStatus(event, &event_status); - ok(hr == S_OK, "Failed to get status code, hr %#x.\n", hr); - ok(event_status == S_OK, "Unexpected event status code %#x.\n", event_status); + for (;;) + { + hr = IMFMediaEventGenerator_BeginGetEvent(generator, &callback.IMFAsyncCallback_iface, + (IUnknown *)generator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFMediaEvent_GetType(event, &event_type); - ok(hr == S_OK, "Failed to event type, hr %#x.\n", hr); - ok(event_type == expected_event_type, "Unexpected event type %u, expected %u.\n", event_type, expected_event_type); + if (WaitForSingleObject(callback.event, 1000) == WAIT_TIMEOUT) + { + ok(0, "timeout\n"); + break; + } - if (event_type != expected_event_type) - { - IMFMediaEvent_Release(event); - return FALSE; - } + Sleep(10); - if (value) - { - hr = IMFMediaEvent_GetValue(event, value); - ok(hr == S_OK, "Failed to get value of event, hr %#x.\n", hr); + hr = IMFMediaEvent_GetType(callback.media_event, &event_type); + ok(hr == S_OK, "Failed to event type, hr %#x.\n", hr); + + if ((ret = (event_type == expected_event_type))) + { + if (value) + { + hr = IMFMediaEvent_GetValue(callback.media_event, value); + ok(hr == S_OK, "Failed to get value of event, hr %#x.\n", hr); + } + + break; + } } - IMFMediaEvent_Release(event); + CloseHandle(callback.event); + if (callback.media_event) + IMFMediaEvent_Release(callback.media_event); - return TRUE; + return ret; } static void test_source_resolver(void) @@ -612,14 +652,13 @@ todo_wine hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var); ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr); - get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var); - ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MENewStream event.\n", var.vt); - video_stream = (IMFMediaStream *)var.punkVal; - - get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, NULL); + video_stream = NULL; + if (get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var)) + { + ok(var.vt == VT_UNKNOWN, "Unexpected value type.\n"); + video_stream = (IMFMediaStream *)var.punkVal; + } - /* Request samples, our file is 10 frames at 25fps */ - get_event((IMFMediaEventGenerator *)video_stream, MEStreamStarted, NULL); sample_count = 10; for (i = 0; i < sample_count; ++i)

1 0

Gabriel Ivăncescu : ntdll: Do not override existing context's RAX when dispatching user APC on x86_64.
by Alexandre Julliard Jan. 8, 2021

Jan. 8, 2021

Module: wine Branch: master Commit: 22dba3f0fb60c5e477d7b876ce744b878c98f89b URL: https://source.winehq.org/git/wine.git/?a=commit;h=22dba3f0fb60c5e477d7b876… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jan 8 20:26:16 2021 +0200 ntdll: Do not override existing context's RAX when dispatching user APC on x86_64. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 1fd26d5bd76..cccbfc2a3be 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2049,6 +2049,7 @@ struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *conte { c.ContextFlags = CONTEXT_FULL; NtGetContextThread( GetCurrentThread(), &c ); + c.Rax = STATUS_USER_APC; context = &c; } memmove( &stack->context, context, sizeof(stack->context) ); @@ -2076,7 +2077,6 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "call " __ASM_NAME("setup_user_apc_dispatcher_stack") "\n\t" "movq %rax,%rsp\n\t" "leaq 0x30(%rsp),%rcx\n\t" /* context */ - "movq $0xc0,0x78(%rcx)\n\t" /* context.Rax = STATUS_USER_APC */ "movq %r12,%rdx\n\t" /* ctx */ "movq %r13,%r8\n\t" /* arg1 */ "movq %r14,%r9\n" /* arg2 */

1 0

Jacek Caban : configure: Check for linker delayload support on mingw hosts.
by Alexandre Julliard Jan. 8, 2021

Jan. 8, 2021

Module: wine Branch: master Commit: 4b362d016c57c14570efeb9c38dfcc5cf2c0910d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b362d016c57c14570efeb9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 8 14:56:45 2021 +0100 configure: Check for linker delayload support on mingw hosts. Fixes PE-only builds with llvm-mingw. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 27 ++++++++++++++++++++++++++- configure.ac | 3 ++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e6ee28a616d..75fef4144fc 100755 --- a/configure +++ b/configure @@ -17456,7 +17456,32 @@ fi ;; MSVCRTFLAGS="" case $host_os in - mingw32*) ;; + mingw32*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-delayload,autoconftest.dll" >&5 +$as_echo_n "checking whether the compiler supports -Wl,-delayload,autoconftest.dll... " >&6; } +if ${ac_cv_cflags__Wl__delayload_autoconftest_dll+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,-delayload,autoconftest.dll" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wl__delayload_autoconftest_dll=yes +else + ac_cv_cflags__Wl__delayload_autoconftest_dll=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__delayload_autoconftest_dll" >&5 +$as_echo "$ac_cv_cflags__Wl__delayload_autoconftest_dll" >&6; } +if test "x$ac_cv_cflags__Wl__delayload_autoconftest_dll" = xyes; then : + DELAYLOADFLAG="-Wl,-delayload," + +fi ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5 $as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; } if ${ac_cv_cflags__fno_builtin+:} false; then : diff --git a/configure.ac b/configure.ac index beabfeb761c..2c4bd667e8f 100644 --- a/configure.ac +++ b/configure.ac @@ -2060,7 +2060,8 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= dnl Disable gcc builtins except for Mingw AC_SUBST(MSVCRTFLAGS,"") case $host_os in - mingw32*) ;; + mingw32*) dnl Check for delayload linker support + WINE_TRY_CFLAGS([-Wl,-delayload,autoconftest.dll],[AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"])]) ;; *) WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"]) WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;; esac

1 0

Gabriel Ivăncescu : ntdll: Do not override existing context's EAX when dispatching user APC.
by Alexandre Julliard Jan. 8, 2021

Jan. 8, 2021

Module: wine Branch: master Commit: 775dac0238845f6696d9ab5053a9238402b0b8a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=775dac0238845f6696d9ab50… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jan 8 19:29:42 2021 +0200 ntdll: Do not override existing context's EAX when dispatching user APC. Fixes a regression introduced by 175a3649ba04daaad3f2b5b62d6bfe091d6a9e46, which caused Winamp's in_wave module to crash when playing a wav file (the previous behavior only changed EAX when there was no context). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index ff9d8a12c14..f2d58dc654d 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1696,6 +1696,7 @@ struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *conte { c.ContextFlags = CONTEXT_FULL; NtGetContextThread( GetCurrentThread(), &c ); + c.Eax = STATUS_USER_APC; context = &c; } memmove( &stack->context, context, sizeof(stack->context) ); @@ -1704,7 +1705,6 @@ struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *conte stack->arg1 = arg1; stack->arg2 = arg2; stack->func = func; - stack->context.Eax = STATUS_USER_APC; return stack; }

1 0

Francois Gouget : testbot/PatchUtils: Add support for .com program tests.
by Alexandre Julliard Jan. 8, 2021

Jan. 8, 2021

Module: tools Branch: master Commit: deed0b3912a23a72cbd6379870c2f02a6153f39b URL: https://source.winehq.org/git/tools.git/?a=commit;h=deed0b3912a23a72cbd6379… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 8 02:57:04 2021 +0100 testbot/PatchUtils: Add support for .com program tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48090 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index df31a09..dbd14f2 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -177,7 +177,8 @@ sub _CreateTestInfo($$$) { my ($Impacts, $Root, $Dir) = @_; - my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; + # Don't add an extension to programs that have one already + my $Module = ($Root eq "programs" and $Dir !~ /\./) ? "$Dir.exe" : $Dir; $Impacts->{BuildModules}->{$Module} = 1; $Impacts->{IsWinePatch} = 1;

1 0

Zebediah Figura : user32: Send WM_CANCELMODE to the current capture window after initializing a modal dialog.
by Alexandre Julliard Jan. 7, 2021

Jan. 7, 2021

Module: wine Branch: master Commit: 32f5dfde0db785b862af1c8a81152f268c08fa47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32f5dfde0db785b862af1c8a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 6 22:49:48 2021 -0600 user32: Send WM_CANCELMODE to the current capture window after initializing a modal dialog. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48860 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 5 +++++ dlls/user32/tests/dialog.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 9bf3470921d..c48f404eceb 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -667,6 +667,8 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (DIALOG_CreateControls32( hwnd, dlgTemplate, &template, hInst, unicode )) { + HWND capture; + /* Send initialisation messages and set focus */ if (dlgProc) @@ -695,6 +697,9 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, } } + if (modal_owner && (capture = GetCapture())) + SendMessageW( capture, WM_CANCELMODE, 0, 0 ); + if (template.style & WS_VISIBLE && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) { ShowWindow( hwnd, SW_SHOWNORMAL ); /* SW_SHOW doesn't always work */ diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 33469377bcc..fcfaf5c12d6 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -2192,7 +2192,7 @@ static INT_PTR CALLBACK capture_release_proc(HWND dialog, UINT message, WPARAM w HWND child = (HWND)lparam; DWORD style; - todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + ok(!GetCapture(), "got capture %p\n", GetCapture()); style = GetWindowLongA(child, GWL_STYLE); ok(!(style & WS_DISABLED), "child should not be disabled\n"); @@ -2233,12 +2233,12 @@ static void test_capture_release(void) SetCapture(child); ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", NULL, capture_release_proc, (LPARAM)child); ok(ret == 1, "got %#Ix\n", ret); - todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + ok(!GetCapture(), "got capture %p\n", GetCapture()); SetCapture(child); ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", window, capture_release_proc, (LPARAM)child); ok(ret == 1, "got %#Ix\n", ret); - todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + ok(!GetCapture(), "got capture %p\n", GetCapture()); SetCapture(child); dialog = CreateDialogParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG",

1 0

Zebediah Figura : user32/tests: Add some tests for release of capture via modal dialogs.
by Alexandre Julliard Jan. 7, 2021

Jan. 7, 2021

Module: wine Branch: master Commit: c75e06528830fb882f2664d42c1d1802707bc766 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c75e06528830fb882f2664d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 6 22:49:47 2021 -0600 user32/tests: Add some tests for release of capture via modal dialogs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 3f6fe6cfca1..33469377bcc 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -2174,6 +2174,89 @@ static void test_dialog_custom_data(void) DialogBoxA(g_hinst, "CUSTOM_TEST_DIALOG", NULL, custom_test_dialog_proc); } +static INT_PTR CALLBACK capture_release_proc(HWND dialog, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (message == WM_INITDIALOG) + { + HWND child = (HWND)lparam; + DWORD style; + + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + style = GetWindowLongA(child, GWL_STYLE); + ok(!(style & WS_DISABLED), "child should not be disabled\n"); + + PostMessageA(dialog, WM_USER, 0, (LPARAM)child); + } + else if (message == WM_USER) + { + HWND child = (HWND)lparam; + DWORD style; + + todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + style = GetWindowLongA(child, GWL_STYLE); + ok(!(style & WS_DISABLED), "child should not be disabled\n"); + + EndDialog(dialog, 1); + } + return FALSE; +} + +static INT_PTR CALLBACK capture_release_modeless_proc(HWND dialog, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (message == WM_INITDIALOG) + { + HWND child = (HWND)lparam; + DWORD style; + + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + style = GetWindowLongA(child, GWL_STYLE); + ok(!(style & WS_DISABLED), "child should not be disabled\n"); + + PostMessageA(dialog, WM_QUIT, 0, 0); + } + return FALSE; +} + +static void test_capture_release(void) +{ + HWND window, child, dialog; + INT_PTR ret; + MSG msg; + + /* Set the capture to a child window. The main window will receive + * WM_CANCELMODE when being disabled, but the child window will retain + * capture. */ + + window = CreateWindowA("static", "parent", 0, 100, 200, 300, 400, NULL, NULL, NULL, NULL); + child = CreateWindowA("static", "child", WS_CHILD, 10, 20, 100, 100, window, NULL, NULL, NULL); + + SetCapture(child); + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", NULL, capture_release_proc, (LPARAM)child); + ok(ret == 1, "got %#Ix\n", ret); + todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + + SetCapture(child); + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", window, capture_release_proc, (LPARAM)child); + ok(ret == 1, "got %#Ix\n", ret); + todo_wine ok(!GetCapture(), "got capture %p\n", GetCapture()); + + SetCapture(child); + dialog = CreateDialogParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", + window, capture_release_modeless_proc, (LPARAM)child); + ok(!!dialog, "failed to create dialog\n"); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + ShowWindow(dialog, SW_SHOWNORMAL); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + while (GetMessageA(&msg, NULL, 0, 0)) + DispatchMessageA(&msg); + ok(GetCapture() == child, "got capture %p\n", GetCapture()); + + DestroyWindow(dialog); + + DestroyWindow(child); + DestroyWindow(window); +} + START_TEST(dialog) { g_hinst = GetModuleHandleA (0); @@ -2193,4 +2276,5 @@ START_TEST(dialog) test_SaveRestoreFocus(); test_timer_message(); test_MessageBox(); + test_capture_release(); }

1 0

André Hentschel : d3d9/tests: Don't test functions directly when reporting GetLastError().
by Alexandre Julliard Jan. 7, 2021

Jan. 7, 2021

Module: wine Branch: master Commit: f6bb6e987a933bdb8c942649020cc539e7abf5ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6bb6e987a933bdb8c942649… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 6 21:18:26 2021 +0100 d3d9/tests: Don't test functions directly when reporting GetLastError(). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0343fade792..fac9de172bd 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -14159,8 +14159,8 @@ static void test_multi_adapter(void) ok(!!monitor, "Adapter %u: Failed to get monitor.\n", i); monitor_info.cbSize = sizeof(monitor_info); - ok(GetMonitorInfoA(monitor, (MONITORINFO *)&monitor_info), - "Adapter %u: Failed to get monitor info, error %#x.\n", i, GetLastError()); + ret = GetMonitorInfoA(monitor, (MONITORINFO *)&monitor_info); + ok(ret, "Adapter %u: Failed to get monitor info, error %#x.\n", i, GetLastError()); if (!i) ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, @@ -14351,6 +14351,7 @@ static void test_cursor_clipping(void) IDirect3D9 *d3d; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -14377,10 +14378,12 @@ static void test_cursor_clipping(void) "Adapter %u: Failed to find a different mode than %ux%u.\n", adapter_idx, current_mode.Width, current_mode.Height); - ok(ClipCursor(NULL), "Adapter %u: ClipCursor failed, error %#x.\n", adapter_idx, + ret = ClipCursor(NULL); + ok(ret, "Adapter %u: ClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); @@ -14395,7 +14398,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); @@ -14403,7 +14407,8 @@ static void test_cursor_clipping(void) IDirect3DDevice9_Release(device); flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect));

1 0