From b627a4289888c4f1e6370dfe193ae32dfecb0c3a Mon Sep 17 00:00:00 2001 From: "Carl J. Bialorucki" Date: Tue, 27 May 2025 16:11:42 -0600 Subject: [PATCH] [APPSHIM_APITEST] Fix test for x86 Vista and 7 (#8042) On x86 builds, accept the sentinel hmodule instead of the 111 hmodule and 0 hmodule for Vista and 7. --- modules/rostests/apitests/appshim/ignoreloadlib.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/rostests/apitests/appshim/ignoreloadlib.c b/modules/rostests/apitests/appshim/ignoreloadlib.c index 9895faf4efb..ecf83b1d1b7 100644 --- a/modules/rostests/apitests/appshim/ignoreloadlib.c +++ b/modules/rostests/apitests/appshim/ignoreloadlib.c @@ -270,6 +270,14 @@ START_TEST(ignoreloadlib) dwErrorMode = GetErrorMode(); trace("Error mode: 0x%x\n", dwErrorMode); +#ifdef _M_IX86 + if (g_WinVersion > _WIN32_WINNT_WS03 && g_WinVersion < _WIN32_WINNT_WIN8) + { + g_h111 = g_hSentinelModule; + g_h0 = g_hSentinelModule; + } +#endif + for (n = 0; n < num_shims; ++n) { ok_str(hook[n].LibraryName, "KERNEL32.DLL");