Brendan Shanks : ntdll/tests: Fix thread test failure on Windows.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 95024c31551c35607ce9669b1e22bd9136edf3da
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=95024c31551c35607ce9669b1e22bd9136edf3da

Author: Brendan Shanks <bshanks at codeweavers.com>
Date:   Wed May 11 11:09:48 2022 -0700

ntdll/tests: Fix thread test failure on Windows.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52892
Signed-off-by: Brendan Shanks <bshanks at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntdll/tests/thread.c | 42 +++++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/dlls/ntdll/tests/thread.c b/dlls/ntdll/tests/thread.c
index 7a47486a3b6..3086247d5f4 100644
--- a/dlls/ntdll/tests/thread.c
+++ b/dlls/ntdll/tests/thread.c
@@ -118,16 +118,25 @@ static void test_dbg_hidden_thread_creation(void)
     CloseHandle( thread );
 }
 
+struct unique_teb_thread_args
+{
+    TEB *teb;
+    HANDLE running_event;
+    HANDLE quit_event;
+};
+
 static void CALLBACK test_unique_teb_proc(void *param)
 {
-    TEB **teb = param;
-    *teb = NtCurrentTeb();
+    struct unique_teb_thread_args *args = param;
+    args->teb = NtCurrentTeb();
+    SetEvent( args->running_event );
+    WaitForSingleObject( args->quit_event, INFINITE );
 }
 
 static void test_unique_teb(void)
 {
-    HANDLE threads[2];
-    TEB *teb1, *teb2;
+    HANDLE threads[2], running_events[2];
+    struct unique_teb_thread_args args1, args2;
     NTSTATUS status;
 
     if (!pNtCreateThreadEx)
@@ -136,21 +145,36 @@ static void test_unique_teb(void)
         return;
     }
 
+    args1.running_event = running_events[0] = CreateEventW( NULL, FALSE, FALSE, NULL );
+    ok( args1.running_event != NULL, "CreateEventW failed %lu.\n", GetLastError() );
+
+    args2.running_event = running_events[1] = CreateEventW( NULL, FALSE, FALSE, NULL );
+    ok( args2.running_event != NULL, "CreateEventW failed %lu.\n", GetLastError() );
+
+    args1.quit_event = args2.quit_event = CreateEventW( NULL, TRUE, FALSE, NULL );
+    ok( args1.quit_event != NULL, "CreateEventW failed %lu.\n", GetLastError() );
+
     status = pNtCreateThreadEx( &threads[0], THREAD_ALL_ACCESS, NULL, GetCurrentProcess(), test_unique_teb_proc,
-                                &teb1, 0, 0, 0, 0, NULL );
+                                &args1, 0, 0, 0, 0, NULL );
     ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status );
 
     status = pNtCreateThreadEx( &threads[1], THREAD_ALL_ACCESS, NULL, GetCurrentProcess(), test_unique_teb_proc,
-                                &teb2, 0, 0, 0, 0, NULL );
+                                &args2, 0, 0, 0, 0, NULL );
     ok( status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status );
 
+    WaitForMultipleObjects( 2, running_events, TRUE, INFINITE );
+    SetEvent( args1.quit_event );
+
     WaitForMultipleObjects( 2, threads, TRUE, INFINITE );
     CloseHandle( threads[0] );
     CloseHandle( threads[1] );
+    CloseHandle( args1.running_event );
+    CloseHandle( args2.running_event );
+    CloseHandle( args1.quit_event );
 
-    ok( NtCurrentTeb() != teb1, "Multiple threads have TEB %p.\n", teb1 );
-    ok( NtCurrentTeb() != teb2, "Multiple threads have TEB %p.\n", teb2 );
-    ok( teb1 != teb2, "Multiple threads have TEB %p.\n", teb1 );
+    ok( NtCurrentTeb() != args1.teb, "Multiple threads have TEB %p.\n", args1.teb );
+    ok( NtCurrentTeb() != args2.teb, "Multiple threads have TEB %p.\n", args2.teb );
+    ok( args1.teb != args2.teb, "Multiple threads have TEB %p.\n", args1.teb );
 }
 
 START_TEST(thread)