[PATCH 0/1] MR8301: kernel32/tests: Re-enable console handle test in Windows 8 with broken.

[Bernhard Übelacker]

My previous commit disabled the whole test in Windows 8
while some tests would still be able to run.

Followup to be9bd74cde.

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

[PATCH 1/1] kernel32/tests: Re-enable console handle test in Windows 8 with broken.

[Bernhard Übelacker]

From: Bernhard Übelacker <bernhardu(a)mailbox.org>

My previous commit disabled the whole test in Windows 8
while some tests would still be able to run.

Followup to be9bd74cde.

Co-Authored-By: Alfred Agrell <floating(a)muncher.se>
---
 dlls/kernel32/tests/console.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index 10d93faaf0f..02c34a3aa3b 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -5643,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 && !pNtCompareObjects(std_clone, GetStdHandle(STD_ERROR_HANDLE)))
+    if (std && std != INVALID_HANDLE_VALUE && pNtCompareObjects && !pNtCompareObjects(std_clone, GetStdHandle(STD_ERROR_HANDLE)))
         exit_code |= CFC_SAME_OBJECTS;
 
     CloseHandle(std_clone);
@@ -5678,7 +5678,7 @@ static void test_FreeConsoleStd(void)
         {DETACHED_PROCESS,      with_none,        0},
     };
 
-    if (!pVerifyConsoleIoHandle || !pNtCompareObjects)
+    if (!pVerifyConsoleIoHandle || skip_nt)
     {
         win_skip("Can't run test\n");
         return;
@@ -5710,7 +5710,9 @@ static void test_FreeConsoleStd(void)
         status = WaitForSingleObject(info.hProcess, INFINITE);
         ok(status == WAIT_OBJECT_0, "Unexpected wait status\n");
         ret = GetExitCodeProcess(info.hProcess, &status);
-        ok(status == tests[i].expected_bits, "Expected %x but got %lx\n", tests[i].expected_bits, status);
+        ok(status == tests[i].expected_bits ||
+            broken(!pNtCompareObjects && status == (tests[i].expected_bits & ~CFC_SAME_OBJECTS)),
+            "Expected %x but got %lx\n", tests[i].expected_bits, status);
         switch (tests[i].with)
         {
         case with_global:
-- 
GitLab

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

[Jinoh Kang (＠iamahuman)]

Jinoh Kang (@iamahuman) commented about dlls/kernel32/tests/console.c:
> {DETACHED_PROCESS,      with_none,        0},
>      };
>
> -    if (!pVerifyConsoleIoHandle || !pNtCompareObjects)
> +    if (!pVerifyConsoleIoHandle || skip_nt)

```suggestion:-0+0
    if (!pVerifyConsoleIoHandle)
```

I guess this was the original state?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8301#note_106406

[Bernhard Übelacker]

On Thu Jun 12 21:01:35 2025 +0000, Jinoh Kang wrote:
> ```suggestion:-0+0
>     if (!pVerifyConsoleIoHandle)
> ```
> I guess this was the original state?

The original state from @Alcaro's bab2ccbb was `if (!pVerifyConsoleIoHandle)`, but
the original state from my last be9bd74c was `if (!pVerifyConsoleIoHandle || skip_nt)`.

So I really wanted just to revert my patch and then fix the failure with Windows 8 the way @epo  described in !8271.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8301#note_106408

[Jinoh Kang (＠iamahuman)]

On Thu Jun 12 21:01:35 2025 +0000, Bernhard Übelacker wrote:
> The original state from @Alcaro's bab2ccbb was `if
> (!pVerifyConsoleIoHandle)`, but
> the original state from my last be9bd74c was `if
> (!pVerifyConsoleIoHandle || skip_nt)`.
> So I really wanted just to revert my patch and then fix the failure with
> Windows 8 the way @epo  described in !8271.
> Alright, cool.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8301#note_106411

[PATCH 0/1] MR8301: kernel32/tests: Re-enable console handle test in Windows 8 with broken. - approved

[eric pouech (＠epo)]

This merge request was approved by eric pouech.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8301