[PATCH v2 0/1] MR8162: kernel32/tests: Don't import NtCompareObjects on Windows 7.

[Alfred Agrell (＠Alcaro)]

@epo regression from !8136

--
  v2: kernel32/tests: Don't import NtCompareObjects before Windows 10.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8162

[PATCH v2 1/1] kernel32/tests: Don't import NtCompareObjects before Windows 10.

[Alfred Agrell]

From: Alfred Agrell <floating(a)muncher.se>

Fixes: 3a768e6d1cbed037b32e08a386f242a1b6234aa3
---
 dlls/kernel32/tests/console.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index 744482e40c1..9bccf9d290e 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -35,6 +35,7 @@ static DWORD (WINAPI *pGetConsoleProcessList)(LPDWORD, DWORD);
 static HANDLE (WINAPI *pOpenConsoleW)(LPCWSTR,DWORD,BOOL,DWORD);
 static BOOL (WINAPI *pSetConsoleInputExeNameA)(LPCSTR);
 static BOOL (WINAPI *pVerifyConsoleIoHandle)(HANDLE handle);
+static NTSTATUS (WINAPI *pNtCompareObjects)(HANDLE,HANDLE);
 
 static BOOL skip_nt;
 
@@ -83,6 +84,8 @@ static void init_function_pointers(void)
     KERNEL32_GET_PROC(VerifyConsoleIoHandle);
 
 #undef KERNEL32_GET_PROC
+    pNtCompareObjects = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtCompareObjects");
+    if(!pNtCompareObjects) trace("GetProcAddress(hNtdll, 'NtCompareObjects') failed\n");
 }
 
 static HANDLE create_unbound_handle(BOOL output, BOOL test_status)
@@ -5640,7 +5643,7 @@ static void test_child_free_console(void)
     }
     AllocConsole(); /* need a new console so that the unbound handles point to something */
 
-    if (std && std != INVALID_HANDLE_VALUE && !NtCompareObjects(std_clone, GetStdHandle(STD_ERROR_HANDLE)))
+    if (std && std != INVALID_HANDLE_VALUE && !pNtCompareObjects(std_clone, GetStdHandle(STD_ERROR_HANDLE)))
         exit_code |= CFC_SAME_OBJECTS;
 
     CloseHandle(std_clone);
@@ -5675,7 +5678,7 @@ static void test_FreeConsoleStd(void)
         {DETACHED_PROCESS,      with_none,        0},
     };
 
-    if (!pVerifyConsoleIoHandle)
+    if (!pVerifyConsoleIoHandle || skip_nt)
     {
         win_skip("Can't run test\n");
         return;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8162