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 OS/X joystick.

This commit is contained in:
Vitaliy Margolen 2011-01-09 15:43:48 -07:00 committed by Alexandre Julliard
parent f09ace0d83
commit 399be3455a
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/dinput/joystick_osx.c
View File

@ -135,6 +135,15 @@ struct JoystickImpl
ObjProps **propmap; ObjProps **propmap;
}; };
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_OsX_Joystick_GUID = { /* 59CAD8F6-E617-41E2-8EB7-47B23EEEDC5A */ static const GUID DInput_Wine_OsX_Joystick_GUID = { /* 59CAD8F6-E617-41E2-8EB7-47B23EEEDC5A */
0x59CAD8F6, 0xE617, 0x41E2, {0x8E, 0xB7, 0x47, 0xB2, 0x3E, 0xEE, 0xDC, 0x5A} 0x59CAD8F6, 0xE617, 0x41E2, {0x8E, 0xB7, 0x47, 0xB2, 0x3E, 0xEE, 0xDC, 0x5A}
}; };
@ -519,7 +528,7 @@ static void get_osx_device_elements_props(JoystickImpl *device)
static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface)
{ {
JoystickImpl *device = (JoystickImpl*)iface; JoystickImpl *device = impl_from_IDirectInputDevice8A(iface);
IOHIDElementRef tIOHIDTopElementRef; IOHIDElementRef tIOHIDTopElementRef;
IOHIDDeviceRef tIOHIDDeviceRef; IOHIDDeviceRef tIOHIDDeviceRef;
CFArrayRef gElementCFArrayRef = device->elementCFArrayRef; CFArrayRef gElementCFArrayRef = device->elementCFArrayRef;