Module: wine Branch: master Commit: 6d8a19def43e11bb3c0e459f4ed9377882999108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d8a19def43e11bb3c0e459f4e...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Dec 10 12:13:41 2010 +0100
winetest: Sill output an entry for a dll when it's skipped entirely.
---
programs/winetest/main.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/programs/winetest/main.c b/programs/winetest/main.c index c1ee938..7caf9f9 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -708,19 +708,20 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, ULONG_PTR cookie;
if (aborting) return TRUE; + + /* Check if the main dll is present on this system */ + CharLowerA(lpszName); + strcpy(dllname, lpszName); + *strstr(dllname, testexe) = 0; + if (test_filtered_out( lpszName, NULL )) { nr_of_skips++; + xprintf (" %s=skipped\n", dllname); return TRUE; } - - CharLowerA(lpszName); extract_test (&wine_tests[nr_of_files], tempdir, lpszName);
- /* Check if the main dll is present on this system */ - strcpy(dllname, lpszName); - *strstr(dllname, testexe) = 0; - if (pCreateActCtxA != NULL && pActivateActCtx != NULL && pDeactivateActCtx != NULL && pReleaseActCtx != NULL) {