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@icodeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Francois Gouget 2021-03-29 15:52:59 +02:00 committed by Alexandre Julliard
parent cb749592e7
commit 44222dc9f2
1 changed files with 4 additions and 0 deletions

View File

@ -985,6 +985,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP
break; break;
case STATUS_DLL_NOT_FOUND: case STATUS_DLL_NOT_FOUND:
xprintf (" %s=dll is missing\n", dllname); xprintf (" %s=dll is missing\n", dllname);
/* or it is a side-by-side dll but the test has no manifest */
break; break;
case STATUS_ORDINAL_NOT_FOUND: case STATUS_ORDINAL_NOT_FOUND:
xprintf (" %s=dll is missing an ordinal (%s)\n", dllname, get_file_version(filename)); 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: case STATUS_ENTRYPOINT_NOT_FOUND:
xprintf (" %s=dll is missing an entrypoint (%s)\n", dllname, get_file_version(filename)); xprintf (" %s=dll is missing an entrypoint (%s)\n", dllname, get_file_version(filename));
break; break;
case ERROR_SXS_CANT_GEN_ACTCTX:
xprintf (" %s=dll is missing the requested side-by-side version\n", dllname);
break;
default: default:
xprintf (" %s=load error %u\n", dllname, err); xprintf (" %s=load error %u\n", dllname, err);
break; break;