[PATCH v2 2/3] copymsg merge 1

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/user32/tests/dialog.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c
index 647abf5a779..41572b29ecc 100644
--- a/dlls/user32/tests/dialog.c
+++ b/dlls/user32/tests/dialog.c
@@ -2193,43 +2193,43 @@ static void test_MessageBox_WM_COPY_Test(void)
     expected = create_msgbox_message(102 /* OK */, 0, 0);
     hthread = CreateThread(NULL, 0, WorkerThread, expected, 0, &tid);
     MessageBoxA(NULL, "Message", msgbox_title, MB_OK);
-    ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
+    ok(WaitForSingleObject(hthread, 2000) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
     CloseHandle(hthread);

expected = create_msgbox_message(102 /* OK */, 105 /* Cancel */, 0);
     hthread = CreateThread(NULL, 0, WorkerThread, expected, 0, &tid);
     MessageBoxA(NULL, "Message", msgbox_title, MB_OKCANCEL);
-    ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
+    ok(WaitForSingleObject(hthread, 2000) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
     CloseHandle(hthread);

expected = create_msgbox_message(103 /* Abort */, 104 /* Retry */, 106 /* Ignore */);
     hthread = CreateThread(NULL, 0, WorkerThread, expected, 0, &tid);
     MessageBoxA(NULL, "Message", msgbox_title, MB_ABORTRETRYIGNORE);
-    ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
+    ok(WaitForSingleObject(hthread, 2000) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
     CloseHandle(hthread);

expected = create_msgbox_message(100 /* Yes */, 101 /* No */, 0);
     hthread = CreateThread(NULL, 0, WorkerThread, expected, 0, &tid);
     MessageBoxA(NULL, "Message", msgbox_title, MB_YESNO);
-    ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
+    ok(WaitForSingleObject(hthread, 2000) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
     CloseHandle(hthread);

expected = create_msgbox_message(100 /* Yes */, 101 /* No */, 105 /* Cancel */);
     hthread = CreateThread(NULL, 0, WorkerThread, expected, 0, &tid);
     MessageBoxA(NULL, "Message", msgbox_title, MB_YESNOCANCEL);
-    ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
+    ok(WaitForSingleObject(hthread, 2000) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
     CloseHandle(hthread);

expected = create_msgbox_message(104 /* Retry */, 105 /* Cancel */, 0);
     hthread = CreateThread(NULL, 0, WorkerThread, expected, 0, &tid);
     MessageBoxA(NULL, "Message", msgbox_title, MB_RETRYCANCEL);
-    ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
+    ok(WaitForSingleObject(hthread, 2000) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
     CloseHandle(hthread);

expected = create_msgbox_message(105 /* Cancel */, 107 /* Try again */, 108 /* Continue */);
     hthread = CreateThread(NULL, 0, WorkerThread, expected, 0, &tid);
     MessageBoxA(NULL, "Message", msgbox_title, MB_CANCELTRYCONTINUE);
-    ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
+    ok(WaitForSingleObject(hthread, 2000) == WAIT_OBJECT_0, "WaitForSingleObject failed\n");
     CloseHandle(hthread);
 }