ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't call WaitForMultipleObjectsEx if we are just polling for pending 

X events.
This commit is contained in:
Alexandre Julliard 2005-08-03 15:47:30 +00:00
parent bd127b0338
commit 4fa411fa07
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/x11drv/event.c
View File

@ -274,33 +274,40 @@ static int process_events( Display *display, DWORD mask )
DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles,
DWORD timeout, DWORD mask, DWORD flags ) DWORD timeout, DWORD mask, DWORD flags )
{ {
HANDLE new_handles[MAXIMUM_WAIT_OBJECTS+1]; /* FIXME! */
DWORD i, ret; DWORD i, ret;
struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index );
if (!data || data->process_event_count) if (!data || data->process_event_count)
{
if (!count && !timeout) return WAIT_TIMEOUT;
return WaitForMultipleObjectsEx( count, handles, flags & MWMO_WAITALL, return WaitForMultipleObjectsEx( count, handles, flags & MWMO_WAITALL,
timeout, flags & MWMO_ALERTABLE ); timeout, flags & MWMO_ALERTABLE );
}
/* check whether only server queue handle was passed in */ /* check whether only server queue handle was passed in */
if (count < 2) flags &= ~MWMO_WAITALL; if (count < 2) flags &= ~MWMO_WAITALL;
for (i = 0; i < count; i++) new_handles[i] = handles[i];
new_handles[count] = data->display_fd;
wine_tsx11_lock(); wine_tsx11_lock();
XFlush( gdi_display ); XFlush( gdi_display );
XFlush( data->display ); XFlush( data->display );
wine_tsx11_unlock(); wine_tsx11_unlock();
data->process_event_count++; data->process_event_count++;
if (process_events( data->display, mask )) ret = count; if (process_events( data->display, mask )) ret = count;
else else if (count || timeout)
{ {
HANDLE new_handles[MAXIMUM_WAIT_OBJECTS+1]; /* FIXME! */
for (i = 0; i < count; i++) new_handles[i] = handles[i];
new_handles[count] = data->display_fd;
ret = WaitForMultipleObjectsEx( count+1, new_handles, flags & MWMO_WAITALL, ret = WaitForMultipleObjectsEx( count+1, new_handles, flags & MWMO_WAITALL,
timeout, flags & MWMO_ALERTABLE ); timeout, flags & MWMO_ALERTABLE );
if (ret == count) process_events( data->display, mask ); if (ret == count) process_events( data->display, mask );
} }
else ret = WAIT_TIMEOUT;
data->process_event_count--; data->process_event_count--;
return ret; return ret;
} }