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 base joystick class.

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

23
dlls/dinput/joystick.c
View File

@ -32,6 +32,15 @@
WINE_DEFAULT_DEBUG_CHANNEL(dinput); WINE_DEFAULT_DEBUG_CHANNEL(dinput);
static inline JoystickGenericImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface)
{
return (JoystickGenericImpl *) iface;
}
static inline JoystickGenericImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface)
{
return (JoystickGenericImpl *) iface;
}
/****************************************************************************** /******************************************************************************
* SetProperty : change input device properties * SetProperty : change input device properties
*/ */
@ -40,7 +49,7 @@ HRESULT WINAPI JoystickAGenericImpl_SetProperty(
REFGUID rguid, REFGUID rguid,
LPCDIPROPHEADER ph) LPCDIPROPHEADER ph)
{ {
JoystickGenericImpl *This = (JoystickGenericImpl *)iface; JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface);
DWORD i; DWORD i;
TRACE("(%p,%s,%p)\n",This,debugstr_guid(rguid),ph); TRACE("(%p,%s,%p)\n",This,debugstr_guid(rguid),ph);
@ -144,7 +153,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetCapabilities(
LPDIRECTINPUTDEVICE8A iface, LPDIRECTINPUTDEVICE8A iface,
LPDIDEVCAPS lpDIDevCaps) LPDIDEVCAPS lpDIDevCaps)
{ {
JoystickGenericImpl *This = (JoystickGenericImpl *)iface; JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface);
int size; int size;
TRACE("%p->(%p)\n",iface,lpDIDevCaps); TRACE("%p->(%p)\n",iface,lpDIDevCaps);
@ -223,7 +232,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetProperty(
REFGUID rguid, REFGUID rguid,
LPDIPROPHEADER pdiph) LPDIPROPHEADER pdiph)
{ {
JoystickGenericImpl *This = (JoystickGenericImpl *)iface; JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface);
TRACE("(%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph);
@ -283,7 +292,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo(
LPDIRECTINPUTDEVICE8A iface, LPDIRECTINPUTDEVICE8A iface,
LPDIDEVICEINSTANCEA pdidi) LPDIDEVICEINSTANCEA pdidi)
{ {
JoystickGenericImpl *This = (JoystickGenericImpl *)iface; JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface);
TRACE("(%p,%p)\n", iface, pdidi); TRACE("(%p,%p)\n", iface, pdidi);
@ -321,7 +330,7 @@ HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo(
LPDIRECTINPUTDEVICE8W iface, LPDIRECTINPUTDEVICE8W iface,
LPDIDEVICEINSTANCEW pdidi) LPDIDEVICEINSTANCEW pdidi)
{ {
JoystickGenericImpl *This = (JoystickGenericImpl *)iface; JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface);
TRACE("(%p,%p)\n", iface, pdidi); TRACE("(%p,%p)\n", iface, pdidi);
@ -349,7 +358,7 @@ HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo(
HRESULT WINAPI JoystickAGenericImpl_Poll(LPDIRECTINPUTDEVICE8A iface) HRESULT WINAPI JoystickAGenericImpl_Poll(LPDIRECTINPUTDEVICE8A iface)
{ {
JoystickGenericImpl *This = (JoystickGenericImpl *)iface; JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface);
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -371,7 +380,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceState(
DWORD len, DWORD len,
LPVOID ptr) LPVOID ptr)
{ {
JoystickGenericImpl *This = (JoystickGenericImpl *)iface; JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface);
TRACE("(%p,0x%08x,%p)\n", This, len, ptr); TRACE("(%p,0x%08x,%p)\n", This, len, ptr);