[APPSHIM_APITEST] Windows 10 test update

diff --git a/modules/rostests/apitests/appshim/versionlie.c b/modules/rostests/apitests/appshim/versionlie.c
index b36bfe5..aaac992 100644 (file)
--- a/modules/rostests/apitests/appshim/versionlie.c
+++ b/modules/rostests/apitests/appshim/versionlie.c
@@ -333,8 +333,20 @@ BOOL LoadShimDLL(PCWSTR ShimDll, HMODULE* module, tGETHOOKAPIS* ppGetHookAPIs)
     dll = LoadLibraryW(buf);
     if (!dll)
     {
     dll = LoadLibraryW(buf);
     if (!dll)
     {

-        skip("Unable to load shim dll\n");
-        return FALSE;
+        skip("Unable to load shim dll from AppPatch\n");
+        GetSystemWindowsDirectoryW(buf, _countof(buf));
+
+        if (SUCCEEDED(StringCchCatW(buf, _countof(buf), L"\\System32\\")) &&
+            SUCCEEDED(StringCchCatW(buf, _countof(buf), ShimDll)))
+        {
+            dll = LoadLibraryW(buf);
+        }
+
+        if (!dll)
+        {
+            skip("Unable to load shim dll from System32 (Recent Win10)\n");
+            return FALSE;
+        }

     }
     *module = dll;
     *ppGetHookAPIs = (tGETHOOKAPIS)GetProcAddress(dll, "GetHookAPIs");
     }
     *module = dll;
     *ppGetHookAPIs = (tGETHOOKAPIS)GetProcAddress(dll, "GetHookAPIs");