diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
index 9ed1abf1481..36628da0fcc 100644
--- a/dlls/dinput/keyboard.c
+++ b/dlls/dinput/keyboard.c
@@ -397,7 +397,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceState(
     if (len != 256)
       return DIERR_INVALIDPARAM;
 
-    MsgWaitForMultipleObjectsEx(0, NULL, 0, 0, 0);
+    MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_ALLINPUT, 0);
 
     if (TRACE_ON(dinput)) {
 	int i;
@@ -432,7 +432,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceData(
         if (dodsize < sizeof(DIDEVICEOBJECTDATA_DX3))
           return DIERR_INVALIDPARAM;
 
-        MsgWaitForMultipleObjectsEx(0, NULL, 0, 0, 0);
+        MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_ALLINPUT, 0);
 
         EnterCriticalSection(&(This->crit));
 
diff --git a/dlls/user/message.c b/dlls/user/message.c
index 762f4ee8ef9..be999b72994 100644
--- a/dlls/user/message.c
+++ b/dlls/user/message.c
@@ -1777,7 +1777,7 @@ static void wait_message_reply( UINT flags )
 
         if (USER_Driver.pMsgWaitForMultipleObjectsEx)
             res = USER_Driver.pMsgWaitForMultipleObjectsEx( 1, &queue->server_queue,
-                                                            INFINITE, 0, 0 );
+                                                            INFINITE, QS_ALLINPUT, 0 );
         else
             res = WaitForSingleObject( queue->server_queue, INFINITE );
 
@@ -2338,7 +2338,7 @@ BOOL WINAPI PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, UINT last, UINT f
 
     /* check for graphics events */
     if (USER_Driver.pMsgWaitForMultipleObjectsEx)
-        USER_Driver.pMsgWaitForMultipleObjectsEx( 0, NULL, 0, 0, 0 );
+        USER_Driver.pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 );
 
     hwnd = WIN_GetFullHandle( hwnd );
     locks = WIN_SuspendWndsLock();
@@ -2444,7 +2444,8 @@ BOOL WINAPI GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT last )
 
         ReleaseThunkLock( &dwlc );
         if (USER_Driver.pMsgWaitForMultipleObjectsEx)
-            USER_Driver.pMsgWaitForMultipleObjectsEx( 1, &queue->server_queue, INFINITE, 0, 0 );
+            USER_Driver.pMsgWaitForMultipleObjectsEx( 1, &queue->server_queue, INFINITE,
+                                                      QS_ALLINPUT, 0 );
         else
             WaitForSingleObject( queue->server_queue, INFINITE );
         if (dwlc) RestoreThunkLock( dwlc );
diff --git a/dlls/winmm/mciavi/mciavi.c b/dlls/winmm/mciavi/mciavi.c
index 6eb844c7ef9..cff2650d1d2 100644
--- a/dlls/winmm/mciavi/mciavi.c
+++ b/dlls/winmm/mciavi/mciavi.c
@@ -514,8 +514,8 @@ static	DWORD	MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms
 	    delta = GetTickCount() - tc;
 
             LeaveCriticalSection(&wma->cs);
-            ret = MsgWaitForMultipleObjects(2, events, FALSE,
-                (delta >= frameTime) ? 0 : frameTime - delta, MWMO_INPUTAVAILABLE);
+            ret = MsgWaitForMultipleObjectsEx(2, events,
+                (delta >= frameTime) ? 0 : frameTime - delta, QS_ALLINPUT, MWMO_INPUTAVAILABLE);
             EnterCriticalSection(&wma->cs);
 
             if (ret == WAIT_OBJECT_0 || wma->dwStatus != MCI_MODE_PLAY) break;
@@ -527,7 +527,8 @@ static	DWORD	MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms
             DWORD ret;
 
             LeaveCriticalSection(&wma->cs);
-            ret = MsgWaitForMultipleObjects(1, &wma->hStopEvent, FALSE, frameTime - delta, MWMO_INPUTAVAILABLE);
+            ret = MsgWaitForMultipleObjectsEx(1, &wma->hStopEvent, frameTime - delta,
+                                              QS_ALLINPUT, MWMO_INPUTAVAILABLE);
             EnterCriticalSection(&wma->cs);
             if (ret == WAIT_OBJECT_0) break;
         }
diff --git a/windows/queue.c b/windows/queue.c
index aa703739fab..810a77ea57c 100644
--- a/windows/queue.c
+++ b/windows/queue.c
@@ -146,7 +146,7 @@ DWORD WINAPI GetQueueStatus( UINT flags )
 
     /* check for pending X events */
     if (USER_Driver.pMsgWaitForMultipleObjectsEx)
-        USER_Driver.pMsgWaitForMultipleObjectsEx( 0, NULL, 0, 0, 0 );
+        USER_Driver.pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 );
 
     SERVER_START_REQ( get_queue_status )
     {
@@ -168,7 +168,7 @@ BOOL WINAPI GetInputState(void)
 
     /* check for pending X events */
     if (USER_Driver.pMsgWaitForMultipleObjectsEx)
-        USER_Driver.pMsgWaitForMultipleObjectsEx( 0, NULL, 0, 0, 0 );
+        USER_Driver.pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_INPUT, 0 );
 
     SERVER_START_REQ( get_queue_status )
     {