Commit 44222dc9 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

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: 's avatarFrancois Gouget <fgouget@icodeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent cb749592
...@@ -985,6 +985,7 @@ extract_test_proc (HMODULE hModule, LPCSTR lpszType, LPSTR lpszName, LONG_PTR lP ...@@ -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 ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment