Vitaliy Margolen : dinput: COM cleanup - use proper interface instead of typecasting This when calling queue_event .
Alexandre Julliard
julliard at winehq.org
Mon Jan 10 10:55:19 CST 2011
Module: wine
Branch: master
Commit: 0b99bf3edbe38bd19dc8e448d9f1ed01451343b1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b99bf3edbe38bd19dc8e448d9f1ed01451343b1
Author: Vitaliy Margolen <wine-patches at kievinfo.com>
Date: Sun Jan 9 15:43:17 2011 -0700
dinput: COM cleanup - use proper interface instead of typecasting This when calling queue_event.
---
dlls/dinput/joystick_linux.c | 2 +-
dlls/dinput/joystick_linuxinput.c | 2 +-
dlls/dinput/keyboard.c | 2 +-
dlls/dinput/mouse.c | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c
index 588a54b..1eb71ff 100644
--- a/dlls/dinput/joystick_linux.c
+++ b/dlls/dinput/joystick_linux.c
@@ -615,7 +615,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface)
}
}
if (inst_id >= 0)
- queue_event((LPDIRECTINPUTDEVICE8A)This, inst_id,
+ queue_event(iface, inst_id,
value, jse.time, This->generic.base.dinput->evsequence++);
}
}
diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c
index 75a44ca..e571a65 100644
--- a/dlls/dinput/joystick_linuxinput.c
+++ b/dlls/dinput/joystick_linuxinput.c
@@ -824,7 +824,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface)
break;
}
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++);
}
}
diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
index dda15c1..7bd68a1 100644
--- a/dlls/dinput/keyboard.c
+++ b/dlls/dinput/keyboard.c
@@ -108,7 +108,7 @@ static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM
TRACE(" setting %02X to %02X\n", dik_code, This->DInputKeyState[dik_code]);
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++);
LeaveCriticalSection(&This->base.crit);
diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c
index 5e0e042..f32abec 100644
--- a/dlls/dinput/mouse.c
+++ b/dlls/dinput/mouse.c
@@ -324,7 +324,7 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM
{
/* Already have X, need to queue it */
if (inst_id != -1)
- queue_event((LPDIRECTINPUTDEVICE8A)This, inst_id,
+ queue_event(iface, inst_id,
wdata, GetCurrentTime(), This->base.dinput->evsequence);
inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_Y_AXIS_INSTANCE) | DIDFT_RELAXIS;
wdata = pt1.y;
@@ -379,7 +379,7 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM
if (inst_id != -1)
{
_dump_mouse_state(&This->m_state);
- queue_event((LPDIRECTINPUTDEVICE8A)This, inst_id,
+ queue_event(iface, inst_id,
wdata, GetCurrentTime(), This->base.dinput->evsequence++);
}
More information about the wine-cvs
mailing list