Rather than second-guessing the loader, run 'test.exe --list' with the critical-error handler message box disabled and use the resulting exit codes. But keep the activation context and COM code to improve the chances of getting the dll version.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45032 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50783 Signed-off-by: Francois Gouget fgouget@codeweavers.com --- Note that when a dll is missing (entirely / entry points / ordinals), it's not possible to issue 'skipped' lines because the test unit names are not even known. Also this introduces additional forms of the 'dll is missing' error in the 'Dll info' section, which winetest/dissect should understand in order to produce appropriate summary.txt files (that patch is in since yesterday). --- programs/winetest/main.c | 46 ++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 14 deletions(-)
diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 2e5fdc6ab8c..225e9a2548b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -608,11 +608,12 @@ static void append_path( const char *path) value of WaitForSingleObject. */ static int -run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms, DWORD* pid) +run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms, BOOL nocritical, DWORD* pid) { STARTUPINFOA si; PROCESS_INFORMATION pi; - DWORD wait, status; + DWORD wait, status, flags; + UINT old_errmode;
/* Flush to disk so we know which test caused Windows to crash if it does */ if (out_file) @@ -623,14 +624,24 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms, DWORD* pid) si.hStdInput = GetStdHandle( STD_INPUT_HANDLE ); si.hStdOutput = out_file ? out_file : GetStdHandle( STD_OUTPUT_HANDLE ); si.hStdError = out_file ? out_file : GetStdHandle( STD_ERROR_HANDLE ); + if (nocritical) + { + old_errmode = SetErrorMode(0); + SetErrorMode(old_errmode | SEM_FAILCRITICALERRORS); + flags = 0; + } + else + flags = CREATE_DEFAULT_ERROR_MODE;
- if (!CreateProcessA (NULL, cmd, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, + if (!CreateProcessA (NULL, cmd, NULL, NULL, TRUE, flags, NULL, tempdir, &si, &pi)) { + if (nocritical) SetErrorMode(old_errmode); if (pid) *pid = 0; return -2; }
+ if (nocritical) SetErrorMode(old_errmode); CloseHandle (pi.hThread); if (pid) *pid = pi.dwProcessId; status = wait_process( pi.hProcess, ms ); @@ -716,7 +727,7 @@ get_subtests (const char *tempdir, struct wine_test *test, LPSTR res_name) /* We need to add the path (to the main dll) to PATH */ append_path(test->maindllpath); } - status = run_ex (cmd, subfile, tempdir, 5000, NULL); + status = run_ex (cmd, subfile, tempdir, 5000, TRUE, NULL); err = GetLastError(); if (test->maindllpath) { /* Restore PATH again */ @@ -795,7 +806,7 @@ run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const ch char *cmd = strmake (NULL, "%s %s", test->exename, subtest); report (R_STEP, "Running: %s:%s", test->name, subtest); xprintf ("%s:%s start %s -\n", test->name, subtest, file); - status = run_ex (cmd, out_file, tempdir, 120000, &pid); + status = run_ex (cmd, out_file, tempdir, 120000, FALSE, &pid); heap_free (cmd); xprintf ("%s:%s:%04x done (%d) in %ds\n", test->name, subtest, pid, status, (GetTickCount()-start)/1000); if (status) failures++; @@ -946,12 +957,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP }
run = TRUE; - if (!dll) - { - xprintf (" %s=dll is missing\n", dllname); - run = FALSE; - } - else + if (dll) { if (is_stub_dll(dllname)) { @@ -970,14 +976,26 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP if (run) { err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ); - if (!err) + switch (err) { + case 0: xprintf (" %s=%s\n", dllname, get_file_version(filename)); nr_of_tests += wine_tests[nr_of_files].subtest_count; nr_of_files++; - } - else + break; + case STATUS_DLL_NOT_FOUND: + xprintf (" %s=dll is missing\n", dllname); + break; + case STATUS_ORDINAL_NOT_FOUND: + xprintf (" %s=dll is missing an ordinal (%s)\n", dllname, get_file_version(filename)); + break; + case STATUS_ENTRYPOINT_NOT_FOUND: + xprintf (" %s=dll is missing an entrypoint (%s)\n", dllname, get_file_version(filename)); + break; + default: xprintf (" %s=load error %u\n", dllname, err); + break; + } }
if (actctx != INVALID_HANDLE_VALUE)
Here is an analysis of the new tests that are now run thanks to this patch.
Let's start with the ones that have failures.
* infosoft:infosoft - Has 2 failures on all versions up to Windows 10 1507. https://bugs.winehq.org/show_bug.cgi?id=50843 - Has thousands of failures and crashes on Windows 10 1607+. https://bugs.winehq.org/show_bug.cgi?id=50844
* msado15:msado15 - The 64-bit test crashes systematically. https://bugs.winehq.org/show_bug.cgi?id=50842
* sapi:resource - Has 7 failures on Windows 7+. https://bugs.winehq.org/show_bug.cgi?id=50841
Next, these are still skipped on all/most Windows versions which means either the test or the TestBot VMs need some adjustment:
* atl80:atl Fails to run except on wvistau64 and w8. https://www.winehq.org/pipermail/wine-devel/2021-March/183233.html
* d3drm:d3drm It looks like d3drm.dll is only available on the retired wxppro and w2003std TestBot VMs. I don't know if that's normal or if there is trick to getting this dll on more recent Windows versions. https://testbot.winehq.org/JobDetails.pl?Key=87438&f201=exe32.report
* dplayx:dplayx Systematically skips the tests because of firewall issues, even with elevated privileges, regardless of the Windows version. https://bugs.winehq.org/show_bug.cgi?id=50840
* dpvoice:voice It looks like dpvoice.dll is only available on the retired wxppro and w2003std TestBot VMs. On all the other test configurations the tests are skipped because IDirectPlayVoice{Client,Server} is not supported. I don't know if that's normal or if there is trick to getting this dll on more recent Windows versions. https://testbot.winehq.org/JobDetails.pl?Key=87440
* wintab32:context None of the test configurations has this dll, not even Windows XP. https://testbot.winehq.org/JobDetails.pl?Key=87439
* wlanapi:wlanapi None of the test configurations has WiFi hence the skips. So this makes sense. Maybe we can use USB / PCI passthrough to add a WiFi card to some of the test VMs one day but that's not going to be a priority.
Finally the following tests now both run and succeed (in parentheses you'll find the Windows configurations where they were incorrectly skipped):
* directmanipulation:manipulation (Windows 8) * ndis.sys:ndis * ntoskrnl.exe:ntoskrnl (32-bit test on 64-bit Windows) * qmgr:enum_files (32-bit test on 64-bit Windows) * qmgr:file (32-bit test on 64-bit Windows) * qmgr:job (32-bit test on 64-bit Windows) * qmgr:qmgr (32-bit test on 64-bit Windows) * sapi:token (all) * schedsvc:rpcapi (32-bit test on 64-bit Windows) * vcomp110:vcomp110 (still missing on many VMs) * vcomp:vcomp (still missing on many VMs) * wiaservc:wia (Windows 2008, 32-bit test on 64-bit Windows) * xactengine3_7:xact3 (w2008s64, w7pro64, w10v1507)
-
Francois Gouget