From a11de67bf2748cf647c26392bb13f63375ba3a42 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Sat, 22 May 1999 19:01:37 +0000 Subject: [PATCH] Removed EVENT_WaitNetEvent() calls. --- windows/dinput.c | 6 +++++- windows/message.c | 13 ------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/windows/dinput.c b/windows/dinput.c index 05514b34a2f..35e2d3f8408 100644 --- a/windows/dinput.c +++ b/windows/dinput.c @@ -429,7 +429,11 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceData( TRACE(dinput,"(this=%p,%ld,%p,%p(%ld)),0x%08lx)\n", This,dodsize,dod,entries,entries?*entries:0,flags); - EVENT_WaitNetEvent(FALSE,TRUE); + + /* FIXME !!! */ + + EVENT_Synchronize( FALSE ); + if (entries) xentries = *entries; else diff --git a/windows/message.c b/windows/message.c index 41681a3a4b7..9059185756a 100644 --- a/windows/message.c +++ b/windows/message.c @@ -571,17 +571,6 @@ static BOOL MSG_PeekHardwareMsg( MSG *msg, HWND hwnd, DWORD first, DWORD last, EnterCriticalSection(&sysMsgQueue->cSection); - /* If the queue is empty, attempt to fill it */ - if (!sysMsgQueue->msgCount && THREAD_IsWin16( THREAD_Current() ) - && EVENT_Pending()) - { - LeaveCriticalSection(&sysMsgQueue->cSection); - - EVENT_WaitNetEvent( FALSE, TRUE ); - - EnterCriticalSection(&sysMsgQueue->cSection); - } - /* Loop through the Q and translate the message we wish to process * while we own the lock. Based on the translation status (abandon/cont/accept) * we then process the message accordingly @@ -1946,8 +1935,6 @@ DWORD WINAPI MsgWaitForMultipleObjects( DWORD nCount, HANDLE *pHandles, handles[i] = pHandles[i]; handles[nCount] = msgQueue->hEvent; - EVENT_Pending(); - ret = WaitForMultipleObjects( nCount+1, handles, fWaitAll, dwMilliseconds ); }