Skip to content

W
wine-cw
Commit c51ef12b authored by Christian Costa's avatar Christian Costa Committed by Alexandre Julliard
Browse files
Options

mciavi: Don't wait for events we don't handle.

parent d2a383b6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
dlls/mciavi32/mciavi.c
View file @ c51ef12b
...@@ -506,8 +506,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms ...@@ -506,8 +506,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms
delta = GetTickCount() - tc; delta = GetTickCount() - tc;
LeaveCriticalSection(&wma->cs); LeaveCriticalSection(&wma->cs);
ret = MsgWaitForMultipleObjectsEx(2, events, ret = WaitForMultipleObjects(2, events, FALSE, (delta >= frameTime) ? 0 : frameTime - delta);
(delta >= frameTime) ? 0 : frameTime - delta, QS_ALLINPUT, MWMO_INPUTAVAILABLE);
EnterCriticalSection(&wma->cs); EnterCriticalSection(&wma->cs);
if (ret == WAIT_OBJECT_0 || wma->dwStatus != MCI_MODE_PLAY) break; if (ret == WAIT_OBJECT_0 || wma->dwStatus != MCI_MODE_PLAY) break;
...@@ -520,8 +519,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms ...@@ -520,8 +519,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms
delta = 0; delta = 0;
LeaveCriticalSection(&wma->cs); LeaveCriticalSection(&wma->cs);
ret = MsgWaitForMultipleObjectsEx(1, &wma->hStopEvent, delta, ret = WaitForMultipleObjects(1, &wma->hStopEvent, FALSE, delta);
QS_ALLINPUT, MWMO_INPUTAVAILABLE);
EnterCriticalSection(&wma->cs); EnterCriticalSection(&wma->cs);
if (ret == WAIT_OBJECT_0) break; if (ret == WAIT_OBJECT_0) break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment