[ros-diffs] 06/06: [APPSHIM_APITEST] Windows 10 test update

[Mark Jansen]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eec2e288be0369451a896…

commit eec2e288be0369451a8961c762c86edf0533a0bc
Author:     Mark Jansen <mark.jansen(a)reactos.org>
AuthorDate: Sat Jan 20 22:53:41 2018 +0100
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sun Jan 21 21:13:08 2018 +0100

    [APPSHIM_APITEST] Windows 10 test update
---
 modules/rostests/apitests/appshim/versionlie.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/modules/rostests/apitests/appshim/versionlie.c
b/modules/rostests/apitests/appshim/versionlie.c
index b36bfe5cf7..aaac992c1e 100644
--- 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)
     {
-        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");