March 2020 - Wine-devel - list.winehq.org

[PATCH] tests: Fix the wait_child_process_() macro in the no-line-number case.
by Francois Gouget 19 Mar '20

19 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- include/wine/test.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 1bf178339fd..99670946714 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -110,7 +110,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINT # define skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_skip # define win_skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_win_skip # define trace_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_trace -# define wait_process_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_wait_process +# define wait_child_process_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_wait_child_process #else # define subtest_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_subtest # define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok -- 2.20.1

1 0

[PATCH] tests: Report all errors when failing to wait for a child process.
by Francois Gouget 19 Mar '20

19 Mar '20

Report the line number where the test failed to wait for the child so one can identify which child process did not behave as expected. Also wait_child_process() is meant for the general case so report all non-crash error cases as test failures so they are accounted for. Omit the "winetest_" prefix to match the other Wine test functions and so the underlying winetest_wait_child_process() function can be wrapped with the usual line-capturing macros. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48651 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/advapi32/tests/security.c | 4 ++-- dlls/dbgeng/tests/dbgeng.c | 4 ++-- dlls/gdi32/tests/font.c | 2 +- dlls/kernel32/tests/actctx.c | 4 ++-- dlls/kernel32/tests/console.c | 2 +- dlls/kernel32/tests/heap.c | 2 +- dlls/kernel32/tests/pipe.c | 6 +++--- dlls/kernel32/tests/toolhelp.c | 2 +- dlls/kernel32/tests/virtual.c | 4 ++-- dlls/mfplat/tests/mfplat.c | 4 ++-- dlls/mscoree/tests/comtest.c | 2 +- dlls/msvcrt/tests/data.c | 2 +- dlls/msvcrt/tests/file.c | 4 ++-- dlls/ntdll/tests/exception.c | 4 ++-- dlls/ole32/tests/marshal.c | 2 +- dlls/oleacc/tests/main.c | 2 +- dlls/qmgr/tests/qmgr.c | 2 +- dlls/rpcrt4/tests/server.c | 6 +++--- dlls/shell32/tests/shellpath.c | 2 +- dlls/shlwapi/tests/ordinal.c | 2 +- dlls/sxs/tests/sxs.c | 2 +- dlls/ucrtbase/tests/misc.c | 2 +- dlls/urlmon/tests/misc.c | 2 +- dlls/urlmon/tests/sec_mgr.c | 2 +- dlls/user32/tests/class.c | 2 +- dlls/user32/tests/clipboard.c | 2 +- dlls/user32/tests/cursoricon.c | 2 +- dlls/user32/tests/msg.c | 2 +- dlls/user32/tests/win.c | 6 +++--- include/wine/test.h | 32 ++++++++++++++++++++++---------- 30 files changed, 64 insertions(+), 52 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d003a7f1a0d..c6f5d4690ae 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3050,7 +3050,7 @@ static void test_process_security(void) STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); TEST_GRANTED_ACCESS2( info.hThread, THREAD_ALL_ACCESS_NT4, STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); - winetest_wait_child_process( info.hProcess ); + wait_child_process( info.hProcess ); FreeSid(EveryoneSid); CloseHandle( info.hProcess ); @@ -7189,7 +7189,7 @@ static void test_token_security_descriptor(void) sprintf(buffer, "%s security test_token_sd", myARGV[0]); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info); ok(ret, "CreateProcess failed with error %u\n", GetLastError()); - winetest_wait_child_process(info.hProcess); + wait_child_process(info.hProcess); CloseHandle(info.hProcess); CloseHandle(info.hThread); diff --git a/dlls/dbgeng/tests/dbgeng.c b/dlls/dbgeng/tests/dbgeng.c index 498ecd4de69..572d96e405b 100644 --- a/dlls/dbgeng/tests/dbgeng.c +++ b/dlls/dbgeng/tests/dbgeng.c @@ -308,7 +308,7 @@ todo_wine SetEvent(event); - winetest_wait_child_process(info.hProcess); + wait_child_process(info.hProcess); CloseHandle(info.hProcess); CloseHandle(info.hThread); @@ -473,7 +473,7 @@ static void test_module_information(void) ok(hr == S_OK, "Failed to detach, hr %#x.\n", hr); SetEvent(event); - winetest_wait_child_process(info.hProcess); + wait_child_process(info.hProcess); CloseHandle(info.hProcess); CloseHandle(info.hThread); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 7e90a50d844..ae4a643aa54 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -7268,7 +7268,7 @@ START_TEST(font) sprintf(path_name, "%s font %s", argv[0], test_names[i]); ok(CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), "CreateProcess failed.\n"); - winetest_wait_child_process(info.hProcess); + wait_child_process(info.hProcess); CloseHandle(info.hProcess); CloseHandle(info.hThread); } diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 4b7096276e8..01c6c1e627c 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2506,7 +2506,7 @@ static void run_child_process(void) sprintf(cmdline, "\"%s\" %s manifest1", argv[0], argv[1]); ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "Could not create process: %u\n", GetLastError()); - winetest_wait_child_process( pi.hProcess ); + wait_child_process( pi.hProcess ); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); DeleteFileA(path); @@ -3470,7 +3470,7 @@ static void run_child_process_two_dll(int run) ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "Could not create process: %u\n", GetLastError()); - winetest_wait_child_process( pi.hProcess ); + wait_child_process( pi.hProcess ); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 9698f11779e..5e35f101d5a 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3272,7 +3272,7 @@ static void test_AttachConsole(HANDLE console) ok(res, "CreateProcess failed: %u\n", GetLastError()); CloseHandle(info.hThread); - winetest_wait_child_process(info.hProcess); + wait_child_process(info.hProcess); CloseHandle(info.hProcess); res = ReadConsoleOutputCharacterA(console, buf, 5, c, &len); diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 3c697f31952..bc57498bf91 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1102,7 +1102,7 @@ static void test_debug_heap( const char *argv0, DWORD flags ) ok( ret, "failed to create child process error %u\n", GetLastError() ); if (ret) { - winetest_wait_child_process( info.hProcess ); + wait_child_process( info.hProcess ); CloseHandle( info.hThread ); CloseHandle( info.hProcess ); } diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 20f3450c6d0..3c7ca06a045 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3258,7 +3258,7 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) ok(!res && GetLastError() == ERROR_MORE_DATA, "ReadFile returned: %x %u\n", res, GetLastError()); ok(read_bytes == 10, "read_bytes = %u\n", read_bytes); TerminateProcess(process, 0); - winetest_wait_child_process(process); + wait_child_process(process); /* after terminating process, there is no pending write and pipe buffer is empty */ overlapped_read_async(server, buf, 10, &overlapped); overlapped_write_sync(client, buf, 1); @@ -3524,7 +3524,7 @@ static void test_namedpipe_process_id(void) ok(server != INVALID_HANDLE_VALUE, "got %u\n", GetLastError()); process = create_check_id_process("checkpid", GetProcessId(GetCurrentProcess())); - winetest_wait_child_process(process); + wait_child_process(process); CloseHandle(overlapped.hEvent); CloseHandle(process); @@ -3667,7 +3667,7 @@ static void test_namedpipe_session_id(void) ok(server != INVALID_HANDLE_VALUE, "got %u\n", GetLastError()); process = create_check_id_process("checksessionid", current); - winetest_wait_child_process(process); + wait_child_process(process); CloseHandle(overlapped.hEvent); CloseHandle(process); diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index 159d71a20cd..9250f8dc549 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -343,5 +343,5 @@ START_TEST(toolhelp) test_module(info.dwProcessId, sub_expected_modules, ARRAY_SIZE(sub_expected_modules)); SetEvent(ev2); - winetest_wait_child_process( info.hProcess ); + wait_child_process( info.hProcess ); } diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index c534e310efe..99dde34396f 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -4154,7 +4154,7 @@ static void test_shared_memory(BOOL is_child) sprintf(cmdline, "\"%s\" virtual sharedmem", argv[0]); ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); - winetest_wait_child_process(pi.hProcess); + wait_child_process(pi.hProcess); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); } @@ -4194,7 +4194,7 @@ static void test_shared_memory_ro(BOOL is_child, DWORD child_access) sprintf(cmdline, "\"%s\" virtual sharedmemro %x", argv[0], child_access); ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); - winetest_wait_child_process(pi.hProcess); + wait_child_process(pi.hProcess); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index bf63337b60f..008aa05c302 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -4434,7 +4434,7 @@ static void test_queue_com(void) sprintf(path_name, "%s mfplat s%d", argv[0], system_queues[i]); ok(CreateProcessA( NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), "CreateProcess failed.\n" ); - winetest_wait_child_process(info.hProcess); + wait_child_process(info.hProcess); CloseHandle(info.hProcess); CloseHandle(info.hThread); } @@ -4446,7 +4446,7 @@ static void test_queue_com(void) sprintf(path_name, "%s mfplat u%d", argv[0], user_queues[i]); ok(CreateProcessA( NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), "CreateProcess failed.\n" ); - winetest_wait_child_process(info.hProcess); + wait_child_process(info.hProcess); CloseHandle(info.hProcess); CloseHandle(info.hThread); } diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 69e24494e6d..12b112417d5 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -315,7 +315,7 @@ static void run_child_process(const char *dll_source, run_type run) ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "Could not create process: %u\n", GetLastError()); - winetest_wait_child_process(pi.hProcess); + wait_child_process(pi.hProcess); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index 050a234ce87..52742ba4994 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -217,7 +217,7 @@ static void test___getmainargs_parent(char *name) memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE|NORMAL_PRIORITY_CLASS, NULL, NULL, &startup, &proc); - winetest_wait_child_process(proc.hProcess); + wait_child_process(proc.hProcess); _unlink(filepath); sprintf(filepath, "%swine_test\\a", tmppath); diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 0c4e024a8ec..8c6df2e8e2b 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1430,7 +1430,7 @@ static void test_stdout_handle( STARTUPINFOA *startup, char *cmdline, HANDLE hst CreateProcessA( NULL, cmdline, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE | NORMAL_PRIORITY_CLASS, NULL, NULL, startup, &proc ); - winetest_wait_child_process( proc.hProcess ); + wait_child_process( proc.hProcess ); data = read_file( hErrorFile ); if (expect_stdout) @@ -1647,7 +1647,7 @@ static void test_invalid_stdin( const char* selfname ) sprintf(cmdline, "%s file stdin", selfname); CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE|NORMAL_PRIORITY_CLASS, NULL, NULL, &startup, &proc); - winetest_wait_child_process(proc.hProcess); + wait_child_process(proc.hProcess); ret = RegCloseKey(key); ok(!ret, "RegCloseKey failed: %x\n", ret); diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 07e05e45c90..4003b0a4805 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1182,7 +1182,7 @@ static void test_debugger(void) } while (de.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT); - winetest_wait_child_process( pi.hProcess ); + wait_child_process( pi.hProcess ); ret = CloseHandle(pi.hThread); ok(ret, "error %u\n", GetLastError()); ret = CloseHandle(pi.hProcess); @@ -3402,7 +3402,7 @@ static void test_suspend_process(void) SetEvent(event); - winetest_wait_child_process(info.hProcess); + wait_child_process(info.hProcess); CloseHandle(info.hProcess); CloseHandle(info.hThread); diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index ea224994e55..e2608ecb768 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -3894,7 +3894,7 @@ static void test_local_server(void) quit_event = CreateEventA(NULL, FALSE, FALSE, "Wine COM Test Quit Event"); SetEvent(quit_event); - winetest_wait_child_process( process ); + wait_child_process( process ); CloseHandle(quit_event); CloseHandle(process); } diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 685e9b76f56..c1e7d93ba3f 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -547,7 +547,7 @@ static void test_LresultFromObject(const char *name) memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &proc); - winetest_wait_child_process(proc.hProcess); + wait_child_process(proc.hProcess); ok(Object_ref == 1, "Object_ref = %d\n", Object_ref); } diff --git a/dlls/qmgr/tests/qmgr.c b/dlls/qmgr/tests/qmgr.c index 4ab12d3360a..d000fd6f36d 100644 --- a/dlls/qmgr/tests/qmgr.c +++ b/dlls/qmgr/tests/qmgr.c @@ -117,7 +117,7 @@ static void run_child(WCHAR *secret) wsprintfW(cmdline, format, progname, secret); ok(CreateProcessW(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); - winetest_wait_child_process(info.hProcess); + wait_child_process(info.hProcess); ok(CloseHandle(info.hProcess), "CloseHandle\n"); ok(CloseHandle(info.hThread), "CloseHandle\n"); } diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 0a76c96d589..2400143eefe 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1112,7 +1112,7 @@ run_client(const char *test) make_cmdline(cmdline, test); ok(CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); - winetest_wait_child_process( info.hProcess ); + wait_child_process( info.hProcess ); ok(CloseHandle(info.hProcess), "CloseHandle\n"); ok(CloseHandle(info.hThread), "CloseHandle\n"); } @@ -2337,7 +2337,7 @@ static void test_reconnect(void) stop(); - winetest_wait_child_process(server_process); + wait_child_process(server_process); ok(CloseHandle(server_process), "CloseHandle\n"); /* create new server, rpcrt4 will connect to it once sending to existing connection fails @@ -2346,7 +2346,7 @@ static void test_reconnect(void) basic_tests(); stop(); - winetest_wait_child_process(server_process); + wait_child_process(server_process); ok(CloseHandle(server_process), "CloseHandle\n"); ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index f3a634dc298..4c9b9693983 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1786,7 +1786,7 @@ static void test_NonExistentPath(void) startup.wShowWindow = SW_SHOWNORMAL; CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); - winetest_wait_child_process( info.hProcess ); + wait_child_process( info.hProcess ); /* restore original values: */ trace("Restoring CSIDL_FAVORITES to %s\n", originalPath); diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index f1527eb6b83..8c5e3e261e2 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -481,7 +481,7 @@ static void test_alloc_shared(int argc, char **argv) ok(ret, "could not create child process error: %u\n", GetLastError()); if (ret) { - winetest_wait_child_process(pi.hProcess); + wait_child_process(pi.hProcess); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); diff --git a/dlls/sxs/tests/sxs.c b/dlls/sxs/tests/sxs.c index eb54c6fa1d4..6b1a9952f36 100644 --- a/dlls/sxs/tests/sxs.c +++ b/dlls/sxs/tests/sxs.c @@ -192,7 +192,7 @@ static void run_child_process(void) ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "Could not create process: %u\n", GetLastError()); - winetest_wait_child_process(pi.hProcess); + wait_child_process(pi.hProcess); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 79f3dc9af8c..ada3a52eb64 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -476,7 +476,7 @@ static void test__get_narrow_winmain_command_line(char *path) CreateProcessA(path, cmd, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE|NORMAL_PRIORITY_CLASS, NULL, NULL, &startup, &proc); - winetest_wait_child_process(proc.hProcess); + wait_child_process(proc.hProcess); CloseHandle(proc.hProcess); CloseHandle(proc.hThread); } diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 4c5c6aea10b..abe77ac7eaf 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1916,7 +1916,7 @@ static void test_internet_features(void) { sprintf(cmdline, "\"%s\" %s internet_features", argv[0], argv[1]); ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "Could not create process: %u\n", GetLastError()); - winetest_wait_child_process( pi.hProcess ); + wait_child_process( pi.hProcess ); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 54dc67bdeed..0577af4ecc9 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -848,7 +848,7 @@ static void run_child_process(void) sprintf(cmdline, "\"%s\" %s domain_tests", argv[0], argv[1]); ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "Failed to spawn child process: %u\n", GetLastError()); - winetest_wait_child_process(pi.hProcess); + wait_child_process(pi.hProcess); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); } diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 51bc1169081..606a29a257f 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1280,7 +1280,7 @@ static void test_comctl32_classes(void) sprintf( path_name, "%s class %s", argv[0], classes[i] ); ok( CreateProcessA( NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ), "CreateProcess failed.\n" ); - winetest_wait_child_process( info.hProcess ); + wait_child_process( info.hProcess ); CloseHandle( info.hProcess ); CloseHandle( info.hThread ); } diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index df23bb28946..6fc4325e985 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -171,7 +171,7 @@ static void run_process( const char *args ) ok( CreateProcessA( NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info ), "CreateProcess %s failed\n", cmd ); - winetest_wait_child_process( info.hProcess ); + wait_child_process( info.hProcess ); CloseHandle( info.hProcess ); CloseHandle( info.hThread ); } diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 7a5f9551615..ff4ab5d8755 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -446,7 +446,7 @@ static void do_parent(void) static void finish_child_process(void) { SendMessageA(child, WM_CLOSE, 0, 0); - winetest_wait_child_process( child_process ); + wait_child_process( child_process ); CloseHandle(child_process); } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 423157b623d..303a026cda1 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16305,7 +16305,7 @@ static void test_WaitForInputIdle( char *argv0 ) WaitForSingleObject( pi.hProcess, 1000 ); /* give it a chance to exit on its own */ } TerminateProcess( pi.hProcess, 0 ); /* just in case */ - winetest_wait_child_process( pi.hProcess ); + wait_child_process( pi.hProcess ); ret = WaitForInputIdle( pi.hProcess, 100 ); ok( ret == WAIT_FAILED, "%u: WaitForInputIdle after exit error %08x\n", i, ret ); CloseHandle( pi.hProcess ); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 0f683f858a1..56072bebf71 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9451,7 +9451,7 @@ static void test_window_from_point(const char *argv0) ok(win == child, "WindowFromPoint returned %p, expected %p\n", win, child); SetEvent(end_event); - winetest_wait_child_process(info.hProcess); + wait_child_process(info.hProcess); CloseHandle(start_event); CloseHandle(end_event); CloseHandle(info.hProcess); @@ -10302,7 +10302,7 @@ static void test_winproc_handles(const char *argv0) startup.cb = sizeof(startup); ok(CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), "CreateProcess failed.\n"); - winetest_wait_child_process(info.hProcess); + wait_child_process(info.hProcess); CloseHandle(info.hProcess); CloseHandle(info.hThread); } @@ -11825,7 +11825,7 @@ static void test_other_process_window(const char *argv0) ret = WaitForSingleObject(test_done_event, 5000); ok(ret == WAIT_OBJECT_0, "Unexpected ret %x.\n", ret); - winetest_wait_child_process(info.hProcess); + wait_child_process(info.hProcess); CloseHandle(window_ready_event); CloseHandle(test_done_event); CloseHandle(info.hProcess); diff --git a/include/wine/test.h b/include/wine/test.h index 3af3ffd2a91..1bf178339fd 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -110,12 +110,14 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINT # define skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_skip # define win_skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_win_skip # define trace_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_trace +# define wait_process_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_wait_process #else # define subtest_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_subtest # define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok # define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip # define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip # define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace +# define wait_child_process_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_wait_child_process #endif #define subtest subtest_(__FILE__, __LINE__) @@ -123,6 +125,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINT #define skip skip_(__FILE__, __LINE__) #define win_skip win_skip_(__FILE__, __LINE__) #define trace trace_(__FILE__, __LINE__) +#define wait_child_process wait_child_process_(__FILE__, __LINE__) #define todo_if(is_todo) for (winetest_start_todo(is_todo); \ winetest_loop_todo(); \ @@ -477,24 +480,33 @@ void winetest_add_failures( LONG new_failures ) void winetest_wait_child_process( HANDLE process ) { - DWORD exit_code = 1; + DWORD ret; - if (WaitForSingleObject( process, 30000 )) - printf( "%s: child process wait failed\n", current_test->name ); - else - GetExitCodeProcess( process, &exit_code ); + winetest_ok( process != NULL, "No child process handle (CreateProcess failed?)\n" ); + if (!process) return; - if (exit_code) + ret = WaitForSingleObject( process, 30000 ); + if (ret == WAIT_TIMEOUT) + winetest_ok( 0, "Timed out waiting for the child process\n" ); + else if (ret != WAIT_OBJECT_0) + winetest_ok( 0, "Could not wait for the child process: %d le=%u\n", + ret, GetLastError() ); + else { + DWORD exit_code; + struct tls_data *data = get_tls_data(); + GetExitCodeProcess( process, &exit_code ); if (exit_code > 255) { - printf( "%s: exception 0x%08x in child process\n", current_test->name, exit_code ); + DWORD pid = GetProcessId( process ); + printf( "%s:%d: unhandled exception %08x in child process %04x\n", + current_test->name, data->current_line, exit_code, pid ); InterlockedIncrement( &failures ); } - else + else if (exit_code) { - printf( "%s: %u failures in child process\n", - current_test->name, exit_code ); + printf( "%s:%d: %u failures in child process\n", + current_test->name, data->current_line, exit_code ); while (exit_code-- > 0) InterlockedIncrement(&failures); } -- 2.20.1

3 4

Re: [PATCH] winex11: Don't unmap the clip window more than once
by Myah Caron 19 Mar '20

19 Mar '20

>As stated in the bug, the specification says: > >"If the window is already unmapped, this request has no effect." > >In which case, isn't this a bug in the xorg server? Maybe, I'm not sure what exactly is the root cause of the issues with the cursor, but this does significantly improve (though not completely fix) the pointer warp issues with that game. It could be a timing-related issue.

1 0

[PATCH 1/2] rpcrt4: Handle bare interfaces as top-level parameters.
by Zebediah Figura 19 Mar '20

19 Mar '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/oleaut32/tests/tmarshal.c | 22 ++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 4 ++++ dlls/rpcrt4/ndr_typelib.c | 11 +++++++++++ 3 files changed, 37 insertions(+) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 8710645c61..18e4b1b180 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1291,6 +1291,12 @@ static HRESULT WINAPI Widget_iface_ptr(IWidget *iface, ISomethingFromDispatch ** return S_OK; } +static HRESULT WINAPI Widget_iface_noptr(IWidget *iface, IUnknown unk, IDispatch disp, ISomethingFromDispatch sfd) +{ + check_iface_marshal((IUnknown *)unk.lpVtbl, (IDispatch *)disp.lpVtbl, (ISomethingFromDispatch *)sfd.lpVtbl); + return S_OK; +} + static HRESULT WINAPI Widget_bstr(IWidget *iface, BSTR in, BSTR *out, BSTR *in_ptr, BSTR *in_out) { UINT len; @@ -1623,6 +1629,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_iface_in, Widget_iface_out, Widget_iface_ptr, + Widget_iface_noptr, Widget_bstr, Widget_variant, Widget_safearray, @@ -2169,6 +2176,9 @@ static void test_marshal_iface(IWidget *widget, IDispatch *disp) ISomethingFromDispatch *sfd1, *sfd2, *sfd3, *proxy_sfd, *sfd_in, *sfd_out, *sfd_in_out; IUnknown *proxy_unk, *proxy_unk2, *unk_in, *unk_out, *unk_in_out; IDispatch *proxy_disp; + IUnknown unk_noptr; + IDispatch disp_noptr; + ISomethingFromDispatch sfd_noptr; HRESULT hr; testmode = 0; @@ -2251,6 +2261,18 @@ static void test_marshal_iface(IWidget *widget, IDispatch *disp) ok(!sfd_in_out, "Got [in, out] %p.\n", sfd_in_out); release_iface(sfd3); + sfd1 = create_disp_obj(); + sfd2 = create_disp_obj(); + sfd3 = create_disp_obj(); + unk_noptr.lpVtbl = (IUnknownVtbl *)sfd1; + disp_noptr.lpVtbl = (IDispatchVtbl *)sfd2; + sfd_noptr.lpVtbl = (ISomethingFromDispatchVtbl *)sfd3; + hr = IWidget_iface_noptr(widget, unk_noptr, disp_noptr, sfd_noptr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + release_iface(sfd1); + release_iface(sfd2); + release_iface(sfd3); + /* Test with Invoke(). Note that since we pass VT_UNKNOWN, we don't get our * interface back, but rather an IUnknown. */ diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index f1e040ed4d..1344aa4912 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -58,6 +58,7 @@ enum IWidget_dispids DISPID_TM_IFACE_IN, DISPID_TM_IFACE_OUT, DISPID_TM_IFACE_PTR, + DISPID_TM_IFACE_NOPTR, DISPID_TM_BSTR, DISPID_TM_VARIANT, DISPID_TM_SAFEARRAY, @@ -312,6 +313,9 @@ library TestTypelib [id(DISPID_TM_IFACE_PTR)] HRESULT iface_ptr([in] ISomethingFromDispatch **in, [out] ISomethingFromDispatch **out, [in, out] ISomethingFromDispatch **in_out); + [id(DISPID_TM_IFACE_NOPTR)] + HRESULT iface_noptr([in] IUnknown unk, [in] IDispatch disp, [in] ISomethingFromDispatch sfd); + [id(DISPID_TM_BSTR)] HRESULT bstr([in] BSTR in, [out] BSTR *out, [in] BSTR *in_ptr, [in, out] BSTR *in_out); diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index c90c60c7b8..462b235d33 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -810,6 +810,10 @@ static size_t write_type_tfs(ITypeInfo *typeinfo, unsigned char *str, break; case TKIND_INTERFACE: case TKIND_DISPATCH: + /* These are treated as if they were interface pointers. */ + off = *len; + write_ip_tfs(str, len, &attr->guid); + break; case TKIND_COCLASS: assert(0); break; @@ -1000,6 +1004,13 @@ static HRESULT get_param_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int is_in, hr = get_param_info(refinfo, &attr->tdescAlias, is_in, is_out, server_size, flags, basetype, tfs_tdesc); break; + + case TKIND_INTERFACE: + case TKIND_DISPATCH: + /* These are treated as if they were interface pointers. */ + *flags |= MustFree; + break; + default: FIXME("unhandled kind %#x\n", attr->typekind); hr = E_NOTIMPL; -- 2.25.1

1 1

[PATCH 1/2] rpcrt4: Add support for TKIND_INTERFACE, TKIND_DISPATCH, TKIND_COCLASS to write_type_tfs.
by Dmitry Timoshkov 19 Mar '20

19 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/rpcrt4/ndr_typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index c90c60c7b8..c2eb660cc1 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -811,7 +811,7 @@ static size_t write_type_tfs(ITypeInfo *typeinfo, unsigned char *str, case TKIND_INTERFACE: case TKIND_DISPATCH: case TKIND_COCLASS: - assert(0); + off = write_pointer_tfs(refinfo, str, len, &attr->tdescAlias, toplevel, onstack); break; case TKIND_ALIAS: off = write_type_tfs(refinfo, str, len, &attr->tdescAlias, toplevel, onstack); -- 2.25.1

2 2

RtlIpv6StringToAddress fuzzer
by Alex Henrie 19 Mar '20

19 Mar '20

For anyone who is interested, I am attaching the fuzzer I wrote to find bugs in my RtlIpv6StringToAddress implementation. It has two parts, both of which can be compiled with mingw-w64: First, ipv6-fuzzer-wine is run on Wine. It creates the file ipv6-test-cases.txt which says how Wine thinks each string should be interpreted. Then, ipv6-fuzzer-windows is run on Windows. It reads ipv6-test-cases.txt and compares the output from Wine to the output on Windows and prints any test cases that do not match to stdout. I have run the fuzzer numerous times and the failing test cases that it identified have already been accepted into Wine's test suite. Nonetheless, if you find a new failing test case, please send it! -Alex

1 0

[PATCH 2/2] rpcrt4: Add support for TKIND_INTERFACE, TKIND_DISPATCH, TKIND_COCLASS to get_param_info.
by Dmitry Timoshkov 19 Mar '20

19 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/rpcrt4/ndr_typelib.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index c2eb660cc1..6570195053 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -1000,6 +1000,14 @@ static HRESULT get_param_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int is_in, hr = get_param_info(refinfo, &attr->tdescAlias, is_in, is_out, server_size, flags, basetype, tfs_tdesc); break; + + case TKIND_INTERFACE: + case TKIND_DISPATCH: + case TKIND_COCLASS: + hr = get_param_pointer_info(refinfo, &attr->tdescAlias, is_in, is_out, + server_size, flags, basetype, tfs_tdesc); + break; + default: FIXME("unhandled kind %#x\n", attr->typekind); hr = E_NOTIMPL; -- 2.25.1

1 0

[PATCH] include: Remove now useless forced WINVER defines.
by Serge Gautherie 19 Mar '20

19 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Please, check whether the 2 .h parts are wanted. --- dlls/d3d8/tests/device.c | 1 - dlls/d3d9/tests/device.c | 1 - dlls/gdi32/tests/dc.c | 2 -- dlls/user32/tests/dialog.c | 2 -- dlls/user32/tests/msg.c | 3 --- dlls/user32/tests/sysparams.c | 4 ---- include/windef.h | 4 ---- include/winresrc.h | 4 ---- 8 files changed, 21 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 42eee28..2e182e6 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -21,7 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINVER 0x0602 /* for CURSOR_SUPPRESSED */ #include <stdlib.h> #define COBJMACROS #include <initguid.h> diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 16f4221..afbd13a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -22,7 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINVER 0x0602 /* for CURSOR_SUPPRESSED */ #define COBJMACROS #include <d3d9.h> #include "utils.h" diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index c8a903e..6640134 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#define WINVER 0x0501 /* request latest DEVMODE */ #define NONAMELESSSTRUCT #define NONAMELESSUNION diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 2a7d71f..5a6a0bf 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -29,8 +29,6 @@ * normally be met. */ -#define WINVER 0x0600 /* For NONCLIENTMETRICS with padding */ - #include <assert.h> #include <stdio.h> #include <stdarg.h> diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 303a026..07f2160 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x0600 /* For WM_CHANGEUISTATE,QS_RAWINPUT,WM_DWMxxxx */ -#define WINVER 0x0600 /* for WM_GETTITLEBARINFOEX */ - #include <assert.h> #include <limits.h> #include <stdarg.h> diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index cf12725..b37af4d 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -17,10 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define _WIN32_WINNT 0x0600 /* For SPI_GETMOUSEHOVERWIDTH and more */ -#define _WIN32_IE 0x0700 -#define WINVER 0x0600 /* For COLOR_MENUBAR, NONCLIENTMETRICS with padding */ - #include <assert.h> #include <stdlib.h> #include <stdarg.h> diff --git a/include/windef.h b/include/windef.h index 0074d5c..326cdba 100644 --- a/include/windef.h +++ b/include/windef.h @@ -21,10 +21,6 @@ #ifndef _WINDEF_ #define _WINDEF_ -#ifndef WINVER -#define WINVER 0x0500 -#endif - #ifndef NO_STRICT # ifndef STRICT # define STRICT diff --git a/include/winresrc.h b/include/winresrc.h index 2f99661..275fc1d 100644 --- a/include/winresrc.h +++ b/include/winresrc.h @@ -19,10 +19,6 @@ #ifndef _WINRESRC_ #define _WINRESRC_ -#ifndef WINVER -#define WINVER 0x0500 -#endif - #ifndef _WIN32_IE #define _WIN32_IE 0x0501 #endif -- 2.10.0.windows.1

2 1

[PATCH v3] user32: Also scan for mouse devices in GetRawInputDeviceList().
by Zebediah Figura 19 Mar '20

19 Mar '20

Halo: Spartan Strike attempts to discover input devices using rawinput. It expects to be able to open at least one device file with a zero access mask. It does not perform any other operations on the file. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/rawinput.c | 116 +++++++++++++++++++++++--------------- dlls/user32/tests/input.c | 5 +- 2 files changed, 71 insertions(+), 50 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 85ff0c5e809..8d1048beb93 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -37,27 +37,30 @@ #include "user_private.h" +#include "initguid.h" +#include "ntddmou.h" + WINE_DEFAULT_DEBUG_CHANNEL(rawinput); -struct hid_device +struct device { WCHAR *path; HANDLE file; - RID_DEVICE_INFO_HID info; + RID_DEVICE_INFO info; PHIDP_PREPARSED_DATA data; }; -static struct hid_device *hid_devices; -static unsigned int hid_devices_count, hid_devices_max; +static struct device *rawinput_devices; +static unsigned int rawinput_devices_count, rawinput_devices_max; -static CRITICAL_SECTION hid_devices_cs; -static CRITICAL_SECTION_DEBUG hid_devices_cs_debug = +static CRITICAL_SECTION rawinput_devices_cs; +static CRITICAL_SECTION_DEBUG rawinput_devices_cs_debug = { - 0, 0, &hid_devices_cs, - { &hid_devices_cs_debug.ProcessLocksList, &hid_devices_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": hid_devices_cs") } + 0, 0, &rawinput_devices_cs, + { &rawinput_devices_cs_debug.ProcessLocksList, &rawinput_devices_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": rawinput_devices_cs") } }; -static CRITICAL_SECTION hid_devices_cs = { &hid_devices_cs_debug, -1, 0, 0, 0, 0 }; +static CRITICAL_SECTION rawinput_devices_cs = { &rawinput_devices_cs_debug, -1, 0, 0, 0, 0 }; static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int count, unsigned int size) { @@ -86,10 +89,10 @@ static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int return TRUE; } -static struct hid_device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) +static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) { SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; - struct hid_device *device; + struct device *device; HANDLE file; WCHAR *path; DWORD size; @@ -127,7 +130,8 @@ static struct hid_device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *ifa return NULL; } - if (!array_reserve((void **)&hid_devices, &hid_devices_max, hid_devices_count + 1, sizeof(*hid_devices))) + if (!array_reserve((void **)&rawinput_devices, &rawinput_devices_max, + rawinput_devices_count + 1, sizeof(*rawinput_devices))) { ERR("Failed to allocate memory.\n"); CloseHandle(file); @@ -135,19 +139,20 @@ static struct hid_device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *ifa return NULL; } - device = &hid_devices[hid_devices_count++]; + device = &rawinput_devices[rawinput_devices_count++]; device->path = path; device->file = file; + device->info.cbSize = sizeof(RID_DEVICE_INFO); return device; } -static void find_hid_devices(void) +static void find_devices(void) { static ULONGLONG last_check; SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; - struct hid_device *device; + struct device *device; HIDD_ATTRIBUTES attr; HIDP_CAPS caps; GUID hid_guid; @@ -160,18 +165,18 @@ static void find_hid_devices(void) HidD_GetHidGuid(&hid_guid); - set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); - - EnterCriticalSection(&hid_devices_cs); + EnterCriticalSection(&rawinput_devices_cs); /* destroy previous list */ - for (idx = 0; idx < hid_devices_count; ++idx) + for (idx = 0; idx < rawinput_devices_count; ++idx) { - CloseHandle(hid_devices[idx].file); - heap_free(hid_devices[idx].path); + CloseHandle(rawinput_devices[idx].file); + heap_free(rawinput_devices[idx].path); } + rawinput_devices_count = 0; + + set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); - hid_devices_count = 0; for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &hid_guid, idx, &iface); ++idx) { if (!(device = add_device(set, &iface))) @@ -180,9 +185,11 @@ static void find_hid_devices(void) attr.Size = sizeof(HIDD_ATTRIBUTES); if (!HidD_GetAttributes(device->file, &attr)) WARN("Failed to get attributes.\n"); - device->info.dwVendorId = attr.VendorID; - device->info.dwProductId = attr.ProductID; - device->info.dwVersionNumber = attr.VersionNumber; + + device->info.dwType = RIM_TYPEHID; + device->info.u.hid.dwVendorId = attr.VendorID; + device->info.u.hid.dwProductId = attr.ProductID; + device->info.u.hid.dwVersionNumber = attr.VersionNumber; if (!HidD_GetPreparsedData(device->file, &device->data)) WARN("Failed to get preparsed data.\n"); @@ -190,12 +197,28 @@ static void find_hid_devices(void) if (!HidP_GetCaps(device->data, &caps)) WARN("Failed to get caps.\n"); - device->info.usUsagePage = caps.UsagePage; - device->info.usUsage = caps.Usage; + device->info.u.hid.usUsagePage = caps.UsagePage; + device->info.u.hid.usUsage = caps.Usage; + } + + SetupDiDestroyDeviceInfoList(set); + + set = SetupDiGetClassDevsW(&GUID_DEVINTERFACE_MOUSE, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + + for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &GUID_DEVINTERFACE_MOUSE, idx, &iface); ++idx) + { + static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; + + if (!(device = add_device(set, &iface))) + continue; + + device->info.dwType = RIM_TYPEMOUSE; + device->info.u.mouse = mouse_info; } - LeaveCriticalSection(&hid_devices_cs); SetupDiDestroyDeviceInfoList(set); + + LeaveCriticalSection(&rawinput_devices_cs); } /*********************************************************************** @@ -219,18 +242,18 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun return ~0U; } - find_hid_devices(); + find_devices(); if (!devices) { - *device_count = 2 + hid_devices_count; + *device_count = 2 + rawinput_devices_count; return 0; } - if (*device_count < 2 + hid_devices_count) + if (*device_count < 2 + rawinput_devices_count) { SetLastError(ERROR_INSUFFICIENT_BUFFER); - *device_count = 2 + hid_devices_count; + *device_count = 2 + rawinput_devices_count; return ~0U; } @@ -239,13 +262,13 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun devices[1].hDevice = WINE_KEYBOARD_HANDLE; devices[1].dwType = RIM_TYPEKEYBOARD; - for (i = 0; i < hid_devices_count; ++i) + for (i = 0; i < rawinput_devices_count; ++i) { - devices[2 + i].hDevice = &hid_devices[i]; - devices[2 + i].dwType = RIM_TYPEHID; + devices[2 + i].hDevice = &rawinput_devices[i]; + devices[2 + i].dwType = rawinput_devices[i].info.dwType; } - return 2 + hid_devices_count; + return 2 + rawinput_devices_count; } /*********************************************************************** @@ -398,7 +421,7 @@ UINT WINAPI GetRawInputDeviceInfoA(HANDLE device, UINT command, void *data, UINT /*********************************************************************** * GetRawInputDeviceInfoW (USER32.@) */ -UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT *data_size) +UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT *data_size) { /* FIXME: Most of this is made up. */ static const WCHAR keyboard_name[] = {'\\','\\','?','\\','W','I','N','E','_','K','E','Y','B','O','A','R','D',0}; @@ -406,8 +429,8 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT static const RID_DEVICE_INFO_KEYBOARD keyboard_info = {0, 0, 1, 12, 3, 101}; static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; + struct device *device = handle; RID_DEVICE_INFO info; - struct hid_device *hid_device = device; const void *to_copy; UINT to_copy_bytes, avail_bytes; @@ -427,20 +450,20 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT case RIDI_DEVICENAME: /* for RIDI_DEVICENAME, data_size is in characters, not bytes */ avail_bytes = *data_size * sizeof(WCHAR); - if (device == WINE_MOUSE_HANDLE) + if (handle == WINE_MOUSE_HANDLE) { *data_size = ARRAY_SIZE(mouse_name); to_copy = mouse_name; } - else if (device == WINE_KEYBOARD_HANDLE) + else if (handle == WINE_KEYBOARD_HANDLE) { *data_size = ARRAY_SIZE(keyboard_name); to_copy = keyboard_name; } else { - *data_size = strlenW(hid_device->path) + 1; - to_copy = hid_device->path; + *data_size = strlenW(device->path) + 1; + to_copy = device->path; } to_copy_bytes = *data_size * sizeof(WCHAR); break; @@ -460,8 +483,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT } else { - info.dwType = RIM_TYPEHID; - info.u.hid = hid_device->info; + info = device->info; } to_copy_bytes = sizeof(info); *data_size = to_copy_bytes; @@ -479,9 +501,9 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT } else { - to_copy_bytes = ((WINE_HIDP_PREPARSED_DATA*)hid_device->data)->dwSize; + to_copy_bytes = ((WINE_HIDP_PREPARSED_DATA *)device->data)->dwSize; *data_size = to_copy_bytes; - to_copy = hid_device->data; + to_copy = device->data; } break; diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index ddaf7541e48..2b6a4974f17 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1689,7 +1689,7 @@ static void test_GetRawInputDeviceList(void) * understand that; so use the \\?\ prefix instead */ name[1] = '\\'; file = CreateFileW(name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); - todo_wine_if(info.dwType != RIM_TYPEHID) + todo_wine_if(i == 0 || i == 1) ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); sz = 0; @@ -1719,8 +1719,7 @@ static void test_GetRawInputDeviceList(void) { /* succeeds on hardware, fails in some VMs */ br = HidD_GetPreparsedData(file, &preparsed); - todo_wine - ok(br == TRUE || broken(br == FALSE), "HidD_GetPreparsedData failed\n"); + ok(br == TRUE || broken(br == FALSE), "HidD_GetPreparsedData failed\n"); } if (br) -- 2.25.1

2 1

[PATCH 1/6] quartz/vmr9: Zero-initialize the VMR9PresentationInfo struct.
by Zebediah Figura 19 Mar '20

19 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/quartz/vmr9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index e7a588e28a0..d1110572303 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -262,10 +262,10 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi { struct quartz_vmr *This = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); const HANDLE events[2] = {This->run_event, This->renderer.flush_event}; + VMR9PresentationInfo info = {}; LPBYTE pbSrcStream = NULL; long cbSrcStream = 0; REFERENCE_TIME tStart, tStop; - VMR9PresentationInfo info; HRESULT hr; TRACE("%p %p\n", iface, pSample); -- 2.25.1

2 8