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

dinput: Signal event after we queued an event. Not before.

This commit is contained in:
Vitaliy Margolen 2006-08-06 20:27:40 -06:00 committed by Alexandre Julliard
parent 2fa5806a3a
commit fd6e974d92
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dlls/dinput/mouse.c
View File

@ -426,16 +426,14 @@ static LRESULT CALLBACK dinput_mouse_hook( int code, WPARAM wparam, LPARAM lpara
EnterCriticalSection(&(This->crit)); EnterCriticalSection(&(This->crit));
dwCoop = This->dwCoopLevel; dwCoop = This->dwCoopLevel;
/* Mouse moved -> send event if asked */
if (This->hEvent)
SetEvent(This->hEvent);
if (wparam == WM_MOUSEMOVE) { if (wparam == WM_MOUSEMOVE) {
if (This->absolute) { if (This->absolute) {
if (hook->pt.x != This->prevX) if (hook->pt.x != This->prevX)
GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], hook->pt.x, hook->time, 0); GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], hook->pt.x,
hook->time, This->dinput->evsequence);
if (hook->pt.y != This->prevY) if (hook->pt.y != This->prevY)
GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], hook->pt.y, hook->time, 0); GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], hook->pt.y,
hook->time, This->dinput->evsequence);
} else { } else {
/* Now, warp handling */ /* Now, warp handling */
if ((This->need_warp == WARP_STARTED) && if ((This->need_warp == WARP_STARTED) &&
@ -450,22 +448,22 @@ static LRESULT CALLBACK dinput_mouse_hook( int code, WPARAM wparam, LPARAM lpara
(This->need_warp == WARP_STARTED)) { (This->need_warp == WARP_STARTED)) {
if (hook->pt.x != This->prevX) if (hook->pt.x != This->prevX)
GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], hook->pt.x - This->prevX, GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], hook->pt.x - This->prevX,
hook->time, (This->dinput->evsequence)++); hook->time, This->dinput->evsequence);
if (hook->pt.y != This->prevY) if (hook->pt.y != This->prevY)
GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], hook->pt.y - This->prevY, GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], hook->pt.y - This->prevY,
hook->time, (This->dinput->evsequence)++); hook->time, This->dinput->evsequence);
} else { } else {
/* This is the first time the event handler has been called after a /* This is the first time the event handler has been called after a
GetDeviceData or GetDeviceState. */ GetDeviceData or GetDeviceState. */
if (hook->pt.x != This->mapped_center.x) { if (hook->pt.x != This->mapped_center.x) {
GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], hook->pt.x - This->mapped_center.x, GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], hook->pt.x - This->mapped_center.x,
hook->time, (This->dinput->evsequence)++); hook->time, This->dinput->evsequence);
This->need_warp = WARP_NEEDED; This->need_warp = WARP_NEEDED;
} }
if (hook->pt.y != This->mapped_center.y) { if (hook->pt.y != This->mapped_center.y) {
GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], hook->pt.y - This->mapped_center.y, GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], hook->pt.y - This->mapped_center.y,
hook->time, (This->dinput->evsequence)++); hook->time, This->dinput->evsequence);
This->need_warp = WARP_NEEDED; This->need_warp = WARP_NEEDED;
} }
} }
@ -489,38 +487,38 @@ static LRESULT CALLBACK dinput_mouse_hook( int code, WPARAM wparam, LPARAM lpara
switch(wparam) { switch(wparam) {
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
GEN_EVENT(This->offset_array[WINE_MOUSE_L_POSITION], 0x80, GEN_EVENT(This->offset_array[WINE_MOUSE_L_POSITION], 0x80,
hook->time, This->dinput->evsequence++); hook->time, This->dinput->evsequence);
This->m_state.rgbButtons[0] = 0x80; This->m_state.rgbButtons[0] = 0x80;
break; break;
case WM_LBUTTONUP: case WM_LBUTTONUP:
GEN_EVENT(This->offset_array[WINE_MOUSE_L_POSITION], 0x00, GEN_EVENT(This->offset_array[WINE_MOUSE_L_POSITION], 0x00,
hook->time, This->dinput->evsequence++); hook->time, This->dinput->evsequence);
This->m_state.rgbButtons[0] = 0x00; This->m_state.rgbButtons[0] = 0x00;
break; break;
case WM_RBUTTONDOWN: case WM_RBUTTONDOWN:
GEN_EVENT(This->offset_array[WINE_MOUSE_R_POSITION], 0x80, GEN_EVENT(This->offset_array[WINE_MOUSE_R_POSITION], 0x80,
hook->time, This->dinput->evsequence++); hook->time, This->dinput->evsequence);
This->m_state.rgbButtons[1] = 0x80; This->m_state.rgbButtons[1] = 0x80;
break; break;
case WM_RBUTTONUP: case WM_RBUTTONUP:
GEN_EVENT(This->offset_array[WINE_MOUSE_R_POSITION], 0x00, GEN_EVENT(This->offset_array[WINE_MOUSE_R_POSITION], 0x00,
hook->time, This->dinput->evsequence++); hook->time, This->dinput->evsequence);
This->m_state.rgbButtons[1] = 0x00; This->m_state.rgbButtons[1] = 0x00;
break; break;
case WM_MBUTTONDOWN: case WM_MBUTTONDOWN:
GEN_EVENT(This->offset_array[WINE_MOUSE_M_POSITION], 0x80, GEN_EVENT(This->offset_array[WINE_MOUSE_M_POSITION], 0x80,
hook->time, This->dinput->evsequence++); hook->time, This->dinput->evsequence);
This->m_state.rgbButtons[2] = 0x80; This->m_state.rgbButtons[2] = 0x80;
break; break;
case WM_MBUTTONUP: case WM_MBUTTONUP:
GEN_EVENT(This->offset_array[WINE_MOUSE_M_POSITION], 0x00, GEN_EVENT(This->offset_array[WINE_MOUSE_M_POSITION], 0x00,
hook->time, This->dinput->evsequence++); hook->time, This->dinput->evsequence);
This->m_state.rgbButtons[2] = 0x00; This->m_state.rgbButtons[2] = 0x00;
break; break;
case WM_MOUSEWHEEL: case WM_MOUSEWHEEL:
wdata = (short)HIWORD(hook->mouseData); wdata = (short)HIWORD(hook->mouseData);
GEN_EVENT(This->offset_array[WINE_MOUSE_Z_POSITION], wdata, GEN_EVENT(This->offset_array[WINE_MOUSE_Z_POSITION], wdata,
hook->time, This->dinput->evsequence++); hook->time, This->dinput->evsequence);
This->m_state.lZ += wdata; This->m_state.lZ += wdata;
break; break;
} }
@ -529,7 +527,12 @@ static LRESULT CALLBACK dinput_mouse_hook( int code, WPARAM wparam, LPARAM lpara
This->m_state.lX, This->m_state.lY, This->m_state.lX, This->m_state.lY,
This->m_state.rgbButtons[0], This->m_state.rgbButtons[2], This->m_state.rgbButtons[1]); This->m_state.rgbButtons[0], This->m_state.rgbButtons[2], This->m_state.rgbButtons[1]);
This->dinput->evsequence++;
end: end:
/* Mouse moved -> send event if asked */
if (This->hEvent) SetEvent(This->hEvent);
LeaveCriticalSection(&(This->crit)); LeaveCriticalSection(&(This->crit));
if (dwCoop & DISCL_NONEXCLUSIVE) { if (dwCoop & DISCL_NONEXCLUSIVE) {