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

dinput: COM cleanup - use helper function instead of direct typecast in Linux joystick.

This commit is contained in:
Vitaliy Margolen 2011-01-09 15:43:41 -07:00 committed by Alexandre Julliard
parent de4a9bb319
commit a1b08e5d04
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/dinput/joystick_linux.c
View File

@ -99,6 +99,15 @@ struct JoystickImpl
POINTL povs[4]; POINTL povs[4];
}; };
static inline JoystickImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface)
{
return (JoystickImpl *) iface;
}
static inline JoystickImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface)
{
return (JoystickImpl *) iface;
}
static const GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903fb6bdf7 */ static const GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903fb6bdf7 */
0x9e573ed9, 0x9e573ed9,
0x7734, 0x7734,
@ -495,7 +504,7 @@ const struct dinput_device joystick_linux_device = {
*/ */
static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
{ {
JoystickImpl *This = (JoystickImpl *)iface; JoystickImpl *This = impl_from_IDirectInputDevice8A(iface);
HRESULT res; HRESULT res;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -524,7 +533,7 @@ static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
*/ */
static HRESULT WINAPI JoystickLinuxAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) static HRESULT WINAPI JoystickLinuxAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
{ {
JoystickImpl *This = (JoystickImpl *)iface; JoystickImpl *This = impl_from_IDirectInputDevice8A(iface);
HRESULT res; HRESULT res;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -548,7 +557,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface)
{ {
struct pollfd plfd; struct pollfd plfd;
struct js_event jse; struct js_event jse;
JoystickImpl *This = (JoystickImpl*) iface; JoystickImpl *This = impl_from_IDirectInputDevice8A(iface);
TRACE("(%p)\n", This); TRACE("(%p)\n", This);