Commit a11de67b authored by Ulrich Weigand's avatar Ulrich Weigand Committed by Alexandre Julliard

Removed EVENT_WaitNetEvent() calls.

parent 5cd47378
...@@ -429,7 +429,11 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceData( ...@@ -429,7 +429,11 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceData(
TRACE(dinput,"(this=%p,%ld,%p,%p(%ld)),0x%08lx)\n", TRACE(dinput,"(this=%p,%ld,%p,%p(%ld)),0x%08lx)\n",
This,dodsize,dod,entries,entries?*entries:0,flags); This,dodsize,dod,entries,entries?*entries:0,flags);
EVENT_WaitNetEvent(FALSE,TRUE);
/* FIXME !!! */
EVENT_Synchronize( FALSE );
if (entries) if (entries)
xentries = *entries; xentries = *entries;
else else
......
...@@ -571,17 +571,6 @@ static BOOL MSG_PeekHardwareMsg( MSG *msg, HWND hwnd, DWORD first, DWORD last, ...@@ -571,17 +571,6 @@ static BOOL MSG_PeekHardwareMsg( MSG *msg, HWND hwnd, DWORD first, DWORD last,
EnterCriticalSection(&sysMsgQueue->cSection); 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 /* 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) * while we own the lock. Based on the translation status (abandon/cont/accept)
* we then process the message accordingly * we then process the message accordingly
...@@ -1946,8 +1935,6 @@ DWORD WINAPI MsgWaitForMultipleObjects( DWORD nCount, HANDLE *pHandles, ...@@ -1946,8 +1935,6 @@ DWORD WINAPI MsgWaitForMultipleObjects( DWORD nCount, HANDLE *pHandles,
handles[i] = pHandles[i]; handles[i] = pHandles[i];
handles[nCount] = msgQueue->hEvent; handles[nCount] = msgQueue->hEvent;
EVENT_Pending();
ret = WaitForMultipleObjects( nCount+1, handles, fWaitAll, dwMilliseconds ); ret = WaitForMultipleObjects( nCount+1, handles, fWaitAll, dwMilliseconds );
} }
......
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