Francois Gouget : winetest: Detect and report the missing side-by-side version errors.
Alexandre Julliard
julliard at winehq.org
Mon Mar 29 16:00:05 CDT 2021
Module: wine
Branch: master
Commit: 44222dc9f24edb095dfafb8759e201c3b5680934
URL: https://source.winehq.org/git/wine.git/?a=commit;h=44222dc9f24edb095dfafb8759e201c3b5680934
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Mon Mar 29 15:52:59 2021 +0200
winetest: Detect and report the missing side-by-side version errors.
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>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/winetest/main.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/programs/winetest/main.c b/programs/winetest/main.c
index eaf83a48f62..75996d88147 100644
--- a/programs/winetest/main.c
+++ b/programs/winetest/main.c
@@ -985,6 +985,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));
@@ -992,6 +993,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;
More information about the wine-cvs
mailing list