diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index e90d8c9d6d2..eb875e3dc45 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -45,13 +45,15 @@ static void flush_events(void) { MSG msg; int diff = default_timeout; + int min_timeout = 50; DWORD time = GetTickCount() + diff; while (diff > 0) { - if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min(10,diff), QS_ALLINPUT ) == WAIT_TIMEOUT) break; + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); diff = time - GetTickCount(); + min_timeout = 10; } } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7d5dffa335d..69bba8bce7a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1543,14 +1543,16 @@ static void add_message(const struct message *msg) static void flush_events(void) { MSG msg; - int diff = 100; + int diff = 200; + int min_timeout = 50; DWORD time = GetTickCount() + diff; while (diff > 0) { - if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min(10,diff), QS_ALLINPUT ) == WAIT_TIMEOUT) break; + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); diff = time - GetTickCount(); + min_timeout = 10; } } diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index bf8e4fe6651..661a7e8625b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -63,13 +63,15 @@ static void flush_events(void) { MSG msg; int diff = 200; + int min_timeout = 50; DWORD time = GetTickCount() + diff; while (diff > 0) { - if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min(10,diff), QS_ALLINPUT ) == WAIT_TIMEOUT) break; + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); diff = time - GetTickCount(); + min_timeout = 10; } }