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

dinput: COM cleanup - use proper interface instead of typecasting This when calling queue_event.

This commit is contained in:
Vitaliy Margolen 2011-01-09 15:43:17 -07:00 committed by Alexandre Julliard
parent b66e00cb09
commit 0b99bf3edb
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/dinput/joystick_linux.c
View File

@ -615,7 +615,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface)
} }
} }
if (inst_id >= 0) if (inst_id >= 0)
queue_event((LPDIRECTINPUTDEVICE8A)This, inst_id, queue_event(iface, inst_id,
value, jse.time, This->generic.base.dinput->evsequence++); value, jse.time, This->generic.base.dinput->evsequence++);
} }
} }

2
dlls/dinput/joystick_linuxinput.c
View File

@ -824,7 +824,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface)
break; break;
} }
if (inst_id >= 0) if (inst_id >= 0)
queue_event((LPDIRECTINPUTDEVICE8A)This, inst_id, queue_event(iface, inst_id,
value, ie.time.tv_usec, This->generic.base.dinput->evsequence++); value, ie.time.tv_usec, This->generic.base.dinput->evsequence++);
} }
} }

2
dlls/dinput/keyboard.c
View File

@ -108,7 +108,7 @@ static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM
TRACE(" setting %02X to %02X\n", dik_code, This->DInputKeyState[dik_code]); TRACE(" setting %02X to %02X\n", dik_code, This->DInputKeyState[dik_code]);
EnterCriticalSection(&This->base.crit); EnterCriticalSection(&This->base.crit);
queue_event((LPDIRECTINPUTDEVICE8A)This, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON, queue_event(iface, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON,
new_diks, hook->time, This->base.dinput->evsequence++); new_diks, hook->time, This->base.dinput->evsequence++);
LeaveCriticalSection(&This->base.crit); LeaveCriticalSection(&This->base.crit);

4
dlls/dinput/mouse.c
View File

@ -324,7 +324,7 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM
{ {
/* Already have X, need to queue it */ /* Already have X, need to queue it */
if (inst_id != -1) if (inst_id != -1)
queue_event((LPDIRECTINPUTDEVICE8A)This, inst_id, queue_event(iface, inst_id,
wdata, GetCurrentTime(), This->base.dinput->evsequence); wdata, GetCurrentTime(), This->base.dinput->evsequence);
inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_Y_AXIS_INSTANCE) | DIDFT_RELAXIS; inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_Y_AXIS_INSTANCE) | DIDFT_RELAXIS;
wdata = pt1.y; wdata = pt1.y;
@ -379,7 +379,7 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM
if (inst_id != -1) if (inst_id != -1)
{ {
_dump_mouse_state(&This->m_state); _dump_mouse_state(&This->m_state);
queue_event((LPDIRECTINPUTDEVICE8A)This, inst_id, queue_event(iface, inst_id,
wdata, GetCurrentTime(), This->base.dinput->evsequence++); wdata, GetCurrentTime(), This->base.dinput->evsequence++);
} }