[PATCH] winetest: Detect and report the missing side-by-side version errors.
Francois Gouget
fgouget at codeweavers.com
Mon Mar 29 08:52:59 CDT 2021
This replaces the 'load error 14001' error message with a clearer 'dll
is missing' information message.
Signed-off-by: Francois Gouget <fgouget at icodeweavers.com>
---
Not having the expected dll version is more a test environment issue
than a bug in the test, even if in some cases we may want to adjust the
test to be less picky.
See the following wtbsuite test:
WTBS Missing side-by-side version (atl80:atl).
---
programs/winetest/main.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/programs/winetest/main.c b/programs/winetest/main.c
index 0571c797666..107151c927f 100644
--- a/programs/winetest/main.c
+++ b/programs/winetest/main.c
@@ -987,6 +987,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP
break;
case STATUS_DLL_NOT_FOUND:
xprintf (" %s=dll is missing\n", dllname);
+ /* or it is a side-by-side dll but the test has no manifest */
break;
case STATUS_ORDINAL_NOT_FOUND:
xprintf (" %s=dll is missing an ordinal (%s)\n", dllname, get_file_version(filename));
@@ -994,6 +995,9 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP
case STATUS_ENTRYPOINT_NOT_FOUND:
xprintf (" %s=dll is missing an entrypoint (%s)\n", dllname, get_file_version(filename));
break;
+ case ERROR_SXS_CANT_GEN_ACTCTX:
+ xprintf (" %s=dll is missing the requested side-by-side version\n", dllname);
+ break;
default:
xprintf (" %s=load error %u\n", dllname, err);
break;
--
2.20.1
More information about the wine-devel
mailing list