January 2011 - Wine-commits

Vitaliy Margolen : dinput: Explicitly define ASCII and Unicode methods in mouse.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 30ab6c1749bf1435f70f058b2b727ce681b961a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30ab6c1749bf1435f70f058b2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:44:02 2011 -0700 dinput: Explicitly define ASCII and Unicode methods in mouse. --- dlls/dinput/mouse.c | 116 +++++++++++++++++++++++++++++++++------------------ 1 files changed, 75 insertions(+), 41 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 1b91e84..943c3c8 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -86,6 +86,14 @@ static inline SysMouseImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W { return (SysMouseImpl *) iface; } +static inline IDirectInputDevice8A *IDirectInputDevice8A_from_impl(SysMouseImpl *This) +{ + return (IDirectInputDevice8A *)This; +} +static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysMouseImpl *This) +{ + return (IDirectInputDevice8W *)This; +} static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ); @@ -419,16 +427,16 @@ static BOOL dinput_window_check(SysMouseImpl* This) { /****************************************************************************** * Acquire : gets exclusive control of the mouse */ -static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) +static HRESULT WINAPI SysMouseWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) { - SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); RECT rect; POINT point; HRESULT res; - + TRACE("(this=%p)\n",This); - if ((res = IDirectInputDevice2AImpl_Acquire(iface)) != DI_OK) return res; + if ((res = IDirectInputDevice2WImpl_Acquire(iface)) != DI_OK) return res; /* Init the mouse state */ GetCursorPos( &point ); @@ -486,17 +494,23 @@ static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) return DI_OK; } +static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) +{ + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysMouseWImpl_Acquire(IDirectInputDevice8W_from_impl(This)); +} + /****************************************************************************** * Unacquire : frees the mouse */ -static HRESULT WINAPI SysMouseAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) +static HRESULT WINAPI SysMouseWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) { - SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT res; TRACE("(this=%p)\n",This); - if ((res = IDirectInputDevice2AImpl_Unacquire(iface)) != DI_OK) return res; + if ((res = IDirectInputDevice2WImpl_Unacquire(iface)) != DI_OK) return res; if (This->base.dwCoopLevel & DISCL_EXCLUSIVE) { @@ -510,20 +524,25 @@ static HRESULT WINAPI SysMouseAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) TRACE(" warping mouse back to (%d , %d)\n", This->org_coords.x, This->org_coords.y); SetCursorPos(This->org_coords.x, This->org_coords.y); } - + return DI_OK; } +static HRESULT WINAPI SysMouseAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) +{ + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysMouseWImpl_Unacquire(IDirectInputDevice8W_from_impl(This)); +} + /****************************************************************************** * GetDeviceState : returns the "state" of the mouse. * * For the moment, only the "standard" return structure (DIMOUSESTATE) is * supported. */ -static HRESULT WINAPI SysMouseAImpl_GetDeviceState( - LPDIRECTINPUTDEVICE8A iface,DWORD len,LPVOID ptr -) { - SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); +static HRESULT WINAPI SysMouseWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr) +{ + SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); if(This->base.acquired == 0) return DIERR_NOTACQUIRED; @@ -554,20 +573,26 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceState( This->need_warp = FALSE; } - + return DI_OK; } +static HRESULT WINAPI SysMouseAImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) +{ + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysMouseWImpl_GetDeviceState(IDirectInputDevice8W_from_impl(This), len, ptr); +} + /****************************************************************************** * GetDeviceData : gets buffered input data. */ -static HRESULT WINAPI SysMouseAImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface, +static HRESULT WINAPI SysMouseWImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W iface, DWORD dodsize, LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags) { - SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT res; - res = IDirectInputDevice2AImpl_GetDeviceData(iface, dodsize, dod, entries, flags); + res = IDirectInputDevice2WImpl_GetDeviceData(iface, dodsize, dod, entries, flags); if (FAILED(res)) return res; /* Check if we need to do a mouse warping */ @@ -584,14 +609,19 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface, return res; } +static HRESULT WINAPI SysMouseAImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface, + DWORD dodsize, LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags) +{ + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysMouseWImpl_GetDeviceData(IDirectInputDevice8W_from_impl(This), dodsize, dod, entries, flags); +} + /****************************************************************************** * GetProperty : get input device properties */ -static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, - REFGUID rguid, - LPDIPROPHEADER pdiph) +static HRESULT WINAPI SysMouseWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPDIPROPHEADER pdiph) { - SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); TRACE("(%p) %s,%p\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); @@ -624,21 +654,25 @@ static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, } default: - return IDirectInputDevice2AImpl_GetProperty(iface, rguid, pdiph); + return IDirectInputDevice2WImpl_GetProperty(iface, rguid, pdiph); } } - + return DI_OK; } +static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) +{ + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysMouseWImpl_GetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); +} + /****************************************************************************** * GetCapabilities : get the device capabilities */ -static HRESULT WINAPI SysMouseAImpl_GetCapabilities( - LPDIRECTINPUTDEVICE8A iface, - LPDIDEVCAPS lpDIDevCaps) +static HRESULT WINAPI SysMouseWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, LPDIDEVCAPS lpDIDevCaps) { - SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); DIDEVCAPS devcaps; TRACE("(this=%p,%p)\n",This,lpDIDevCaps); @@ -664,10 +698,16 @@ static HRESULT WINAPI SysMouseAImpl_GetCapabilities( devcaps.dwFFDriverVersion = 0; memcpy(lpDIDevCaps, &devcaps, lpDIDevCaps->dwSize); - + return DI_OK; } +static HRESULT WINAPI SysMouseAImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) +{ + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysMouseWImpl_GetCapabilities(IDirectInputDevice8W_from_impl(This), lpDIDevCaps); +} + /****************************************************************************** * GetObjectInfo : get information about a device object such as a button * or axis @@ -697,12 +737,13 @@ static HRESULT WINAPI SysMouseWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, static HRESULT WINAPI SysMouseAImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEOBJECTINSTANCEA pdidoi, DWORD dwObj, DWORD dwHow) { + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; DIDEVICEOBJECTINSTANCEW didoiW; DWORD dwSize = pdidoi->dwSize; didoiW.dwSize = sizeof(didoiW); - res = SysMouseWImpl_GetObjectInfo((LPDIRECTINPUTDEVICE8W)iface, &didoiW, dwObj, dwHow); + res = SysMouseWImpl_GetObjectInfo(IDirectInputDevice8W_from_impl(This), &didoiW, dwObj, dwHow); if (res != DI_OK) return res; memset(pdidoi, 0, pdidoi->dwSize); @@ -786,25 +827,19 @@ static const IDirectInputDevice8AVtbl SysMouseAvt = IDirectInputDevice8AImpl_GetImageInfo }; -#if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(SysMouseWvt.fun)) -#else -# define XCAST(fun) (void*) -#endif - static const IDirectInputDevice8WVtbl SysMouseWvt = { IDirectInputDevice2WImpl_QueryInterface, IDirectInputDevice2WImpl_AddRef, IDirectInputDevice2WImpl_Release, - XCAST(GetCapabilities)SysMouseAImpl_GetCapabilities, + SysMouseWImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, - XCAST(GetProperty)SysMouseAImpl_GetProperty, + SysMouseWImpl_GetProperty, IDirectInputDevice2WImpl_SetProperty, - XCAST(Acquire)SysMouseAImpl_Acquire, - XCAST(Unacquire)SysMouseAImpl_Unacquire, - XCAST(GetDeviceState)SysMouseAImpl_GetDeviceState, - XCAST(GetDeviceData)SysMouseAImpl_GetDeviceData, + SysMouseWImpl_Acquire, + SysMouseWImpl_Unacquire, + SysMouseWImpl_GetDeviceState, + SysMouseWImpl_GetDeviceData, IDirectInputDevice2WImpl_SetDataFormat, IDirectInputDevice2WImpl_SetEventNotification, IDirectInputDevice2WImpl_SetCooperativeLevel, @@ -827,4 +862,3 @@ static const IDirectInputDevice8WVtbl SysMouseWvt = IDirectInputDevice8WImpl_SetActionMap, IDirectInputDevice8WImpl_GetImageInfo }; -#undef XCAST

1 0

Vitaliy Margolen : dinput: Explicitly define ASCII and Unicode methods in joystick base class. Use new methods in child classes.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 6a07885029beb3b737806b6cff4cbdd3d498663a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a07885029beb3b737806b6cf… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:44:05 2011 -0700 dinput: Explicitly define ASCII and Unicode methods in joystick base class. Use new methods in child classes. --- dlls/dinput/joystick.c | 80 +++++++++++++++++++++++++------------ dlls/dinput/joystick_linux.c | 10 ++-- dlls/dinput/joystick_linuxinput.c | 6 +- dlls/dinput/joystick_osx.c | 17 ++------ dlls/dinput/joystick_private.h | 17 ++++---- 5 files changed, 76 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a07885029beb3b737806…

1 0

Vitaliy Margolen : dinput: Explicitly define ASCII and Unicode methods in evdev joystick.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: d88cbac1c535f79e56eb4474688c8cd5489eac3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d88cbac1c535f79e56eb44746… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:44:08 2011 -0700 dinput: Explicitly define ASCII and Unicode methods in evdev joystick. --- dlls/dinput/joystick_linuxinput.c | 147 +++++++++++++++++++++++------------- 1 files changed, 94 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d88cbac1c535f79e56eb4…

1 0

Vitaliy Margolen : dinput: COM cleanup - use proper DirectInput interface with IUknown calls.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 15216098e0b934c1a342e82edf4ac7d833b9a37f URL: http://source.winehq.org/git/wine.git/?a=commit;h=15216098e0b934c1a342e82ed… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:43:09 2011 -0700 dinput: COM cleanup - use proper DirectInput interface with IUknown calls. --- dlls/dinput/device.c | 2 +- dlls/dinput/dinput_main.c | 2 +- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 2 +- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 807a374..5969698 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -712,7 +712,7 @@ ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface) list_remove( &This->entry ); LeaveCriticalSection( &This->dinput->crit ); - IDirectInput_Release((LPDIRECTINPUTDEVICE8A)This->dinput); + IDirectInput_Release(&This->dinput->IDirectInput7A_iface); This->crit.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->crit); diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index e46f83e..646a4f8 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -153,7 +153,7 @@ HRESULT WINAPI DirectInputCreateEx( if (!check_hook_thread()) { - IUnknown_Release( (LPDIRECTINPUT7A)This ); + IUnknown_Release( &This->IDirectInput7A_iface ); return DIERR_GENERIC; } diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index d489ef3..588a54b 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -368,7 +368,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di newDevice->generic.props[i].lSaturation = 0; } - IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->generic.base.dinput); + IDirectInput_AddRef(&newDevice->generic.base.dinput->IDirectInput7A_iface); newDevice->generic.devcaps.dwSize = sizeof(newDevice->generic.devcaps); newDevice->generic.devcaps.dwFlags = DIDC_ATTACHED; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 1bb3398..75a44ca 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -504,7 +504,7 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm if (newDevice->joydev->has_ff) newDevice->generic.devcaps.dwFlags |= DIDC_FORCEFEEDBACK; - IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->generic.base.dinput); + IDirectInput_AddRef(&newDevice->generic.base.dinput->IDirectInput7A_iface); return newDevice; failed: diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 2b4ea12..7daccd4 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -807,7 +807,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di /* initialize default properties */ get_osx_device_elements_props(newDevice); - IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->generic.base.dinput); + IDirectInput_AddRef(&newDevice->generic.base.dinput->IDirectInput7A_iface); newDevice->generic.devcaps.dwSize = sizeof(newDevice->generic.devcaps); newDevice->generic.devcaps.dwFlags = DIDC_ATTACHED; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 245559f..dda15c1 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -236,7 +236,7 @@ static SysKeyboardImpl *alloc_device(REFGUID rguid, const void *kvt, IDirectInpu df->dwNumObjs = idx; newDevice->base.data_format.wine_df = df; - IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->base.dinput); + IDirectInput_AddRef(&newDevice->base.dinput->IDirectInput7A_iface); return newDevice; failed: diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index c780187..5e0e042 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -223,7 +223,7 @@ static SysMouseImpl *alloc_device(REFGUID rguid, const void *mvt, IDirectInputIm df->rgodf[i].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON; newDevice->base.data_format.wine_df = df; - IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->base.dinput); + IDirectInput_AddRef(&newDevice->base.dinput->IDirectInput7A_iface); return newDevice; failed:

1 0

Vitaliy Margolen : dinput: COM cleanup - return interface instead of typecasting This.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: b66e00cb09b4cadb7a64ae5b0140c128d87c6335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b66e00cb09b4cadb7a64ae5b0… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:43:12 2011 -0700 dinput: COM cleanup - return interface instead of typecasting This. --- dlls/dinput/effect_linuxinput.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index e35a96f..b7c27cd 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -844,7 +844,7 @@ HRESULT linuxinput_create_effect( newEffect->entry = parent_list_entry; - *peff = (LPDIRECTINPUTEFFECT)newEffect; + *peff = &newEffect->IDirectInputEffect_iface; TRACE("Creating linux input system effect (%p) with guid %s\n", *peff, _dump_dinput_GUID(rguid));

1 0

Vitaliy Margolen : dinput: COM cleanup - use proper interface instead of typecasting This when calling queue_event .
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 0b99bf3edbe38bd19dc8e448d9f1ed01451343b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b99bf3edbe38bd19dc8e448d… Author: Vitaliy Margolen <wine-patches(a)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++); }

1 0

Vitaliy Margolen : dinput: COM cleanup - use helper function instead of direct typecast in base device class .
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: fc023b96d22837607b4909a618f1ea419252fdfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc023b96d22837607b4909a61… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:43:21 2011 -0700 dinput: COM cleanup - use helper function instead of direct typecast in base device class. --- dlls/dinput/device.c | 45 +++++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 5969698..12846bf 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -41,6 +41,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); +static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) +{ + return (IDirectInputDeviceImpl *) iface; +} +static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) +{ + return (IDirectInputDeviceImpl *) iface; +} + /****************************************************************************** * Various debugging tools */ @@ -535,7 +544,7 @@ int find_property(const DataFormat *df, LPCDIPROPHEADER ph) void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD time, DWORD seq) { - IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); int next_pos, ofs = id_to_offset(&This->data_format, inst_id); /* Event is being set regardless of the queue state */ @@ -568,7 +577,7 @@ void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD tim HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) { - IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; if (!This->data_format.user_df) return DIERR_INVALIDPARAM; @@ -594,7 +603,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) HRESULT WINAPI IDirectInputDevice2AImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) { - IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; EnterCriticalSection(&This->crit); @@ -614,7 +623,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) HRESULT WINAPI IDirectInputDevice2AImpl_SetDataFormat( LPDIRECTINPUTDEVICE8A iface, LPCDIDATAFORMAT df) { - IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res = DI_OK; if (!df) return E_POINTER; @@ -641,7 +650,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetDataFormat( HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel( LPDIRECTINPUTDEVICE8A iface, HWND hwnd, DWORD dwflags) { - IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(%p) %p,0x%08x\n", This, hwnd, dwflags); _dump_cooperativelevel_DI(dwflags); @@ -679,7 +688,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel( HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification( LPDIRECTINPUTDEVICE8A iface, HANDLE event) { - IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(%p) %p\n", This, event); @@ -691,7 +700,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification( ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface) { - IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); ULONG ref; ref = InterlockedDecrement(&(This->ref)); @@ -725,7 +734,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface( LPDIRECTINPUTDEVICE8A iface,REFIID riid,LPVOID *ppobj ) { - IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); if (IsEqualGUID(&IID_IUnknown,riid)) { @@ -761,8 +770,8 @@ HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface( LPDIRECTINPUTDEVICE8W iface,REFIID riid,LPVOID *ppobj ) { - IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface; - + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); + TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); if (IsEqualGUID(&IID_IUnknown,riid)) { IDirectInputDevice2_AddRef(iface); @@ -796,14 +805,14 @@ HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface( ULONG WINAPI IDirectInputDevice2AImpl_AddRef( LPDIRECTINPUTDEVICE8A iface) { - IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); return InterlockedIncrement(&(This->ref)); } HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects(LPDIRECTINPUTDEVICE8A iface, LPDIENUMDEVICEOBJECTSCALLBACKA lpCallback, LPVOID lpvRef, DWORD dwFlags) { - IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); DIDEVICEOBJECTINSTANCEA ddoi; int i; @@ -833,7 +842,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects(LPDIRECTINPUTDEVICE8A iface, HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface, LPDIENUMDEVICEOBJECTSCALLBACKW lpCallback, LPVOID lpvRef, DWORD dwFlags) { - IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); DIDEVICEOBJECTINSTANCEW ddoi; int i; @@ -867,7 +876,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface, HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty( LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) { - IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); @@ -901,7 +910,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty( HRESULT WINAPI IDirectInputDevice2AImpl_SetProperty( LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPCDIPROPHEADER pdiph) { - IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); @@ -995,7 +1004,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo( DWORD dwObj, DWORD dwHow) { - IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); DWORD dwSize; LPDIOBJECTDATAFORMAT odf; int idx = -1; @@ -1046,7 +1055,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData( LPDIRECTINPUTDEVICE8A iface, DWORD dodsize, LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags) { - IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT ret = DI_OK; int len; @@ -1217,7 +1226,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Escape( HRESULT WINAPI IDirectInputDevice2AImpl_Poll( LPDIRECTINPUTDEVICE8A iface) { - IDirectInputDeviceImpl *This = (IDirectInputDeviceImpl *)iface; + IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); if (!This->acquired) return DIERR_NOTACQUIRED; /* Because wine devices do not need to be polled, just return DI_NOEFFECT */

1 0

Vitaliy Margolen : dinput: COM cleanup - use helper function instead of direct typecast in mouse.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 625fefca61e1dc79b7b6f656ffe3d59f9175cff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=625fefca61e1dc79b7b6f656f… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:43:26 2011 -0700 dinput: COM cleanup - use helper function instead of direct typecast in mouse. --- dlls/dinput/mouse.c | 33 +++++++++++++++++++++------------ 1 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index f32abec..683534f 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -78,6 +78,15 @@ struct SysMouseImpl WARP_MOUSE warp_override; }; +static inline SysMouseImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) +{ + return (SysMouseImpl *) iface; +} +static inline SysMouseImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) +{ + return (SysMouseImpl *) iface; +} + static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ); const GUID DInput_Wine_Mouse_GUID = { /* 9e573ed8-7734-11d2-8d4a-23903fb6bdf7 */ @@ -289,7 +298,7 @@ const struct dinput_device mouse_device = { static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) { MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; - SysMouseImpl* This = (SysMouseImpl*) iface; + SysMouseImpl* This = impl_from_IDirectInputDevice8A(iface); DWORD dwCoop; int wdata = 0, inst_id = -1, ret; @@ -412,7 +421,7 @@ static BOOL dinput_window_check(SysMouseImpl* This) { */ static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) { - SysMouseImpl *This = (SysMouseImpl *)iface; + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); RECT rect; POINT point; HRESULT res; @@ -482,9 +491,9 @@ static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) */ static HRESULT WINAPI SysMouseAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) { - SysMouseImpl *This = (SysMouseImpl *)iface; + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; - + TRACE("(this=%p)\n",This); if ((res = IDirectInputDevice2AImpl_Unacquire(iface)) != DI_OK) return res; @@ -514,7 +523,7 @@ static HRESULT WINAPI SysMouseAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) static HRESULT WINAPI SysMouseAImpl_GetDeviceState( LPDIRECTINPUTDEVICE8A iface,DWORD len,LPVOID ptr ) { - SysMouseImpl *This = (SysMouseImpl *)iface; + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); if(This->base.acquired == 0) return DIERR_NOTACQUIRED; @@ -555,7 +564,7 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceState( static HRESULT WINAPI SysMouseAImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface, DWORD dodsize, LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags) { - SysMouseImpl *This = (SysMouseImpl *)iface; + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; res = IDirectInputDevice2AImpl_GetDeviceData(iface, dodsize, dod, entries, flags); @@ -582,11 +591,11 @@ static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) { - SysMouseImpl *This = (SysMouseImpl *)iface; - + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + TRACE("(%p) %s,%p\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); - + if (IS_DIPROP(rguid)) { switch (LOWORD(rguid)) { case (DWORD_PTR) DIPROP_GRANULARITY: { @@ -629,7 +638,7 @@ static HRESULT WINAPI SysMouseAImpl_GetCapabilities( LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) { - SysMouseImpl *This = (SysMouseImpl *)iface; + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); DIDEVCAPS devcaps; TRACE("(this=%p,%p)\n",This,lpDIDevCaps); @@ -712,7 +721,7 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEINSTANCEA pdidi) { - SysMouseImpl *This = (SysMouseImpl *)iface; + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(this=%p,%p)\n", This, pdidi); if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA)) { @@ -727,7 +736,7 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceInfo( static HRESULT WINAPI SysMouseWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEINSTANCEW pdidi) { - SysMouseImpl *This = (SysMouseImpl *)iface; + SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); TRACE("(this=%p,%p)\n", This, pdidi); if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEW)) {

1 0

Vitaliy Margolen : dinput: COM cleanup - use helper function instead of direct typecast in keyboard.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 31c828ea273a6d76acfb78a860d567f8d9e322bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=31c828ea273a6d76acfb78a86… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:43:32 2011 -0700 dinput: COM cleanup - use helper function instead of direct typecast in keyboard. --- dlls/dinput/keyboard.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 7bd68a1..76563db 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -50,6 +50,15 @@ struct SysKeyboardImpl BYTE DInputKeyState[WINE_DINPUT_KEYBOARD_MAX_KEYS]; }; +static inline SysKeyboardImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) +{ + return (SysKeyboardImpl *) iface; +} +static inline SysKeyboardImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) +{ + return (SysKeyboardImpl *) iface; +} + static BYTE map_dik_code(DWORD scanCode, DWORD vkCode) { static const BYTE asciiCodes[] = @@ -76,7 +85,7 @@ static BYTE map_dik_code(DWORD scanCode, DWORD vkCode) static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ) { - SysKeyboardImpl *This = (SysKeyboardImpl *)iface; + SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); int dik_code, ret = This->base.dwCoopLevel & DISCL_EXCLUSIVE; KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam; BYTE new_diks; @@ -297,7 +306,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceState( LPDIRECTINPUTDEVICE8A iface,DWORD len,LPVOID ptr ) { - SysKeyboardImpl *This = (SysKeyboardImpl *)iface; + SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(%p)->(%d,%p)\n", This, len, ptr); if (!This->base.acquired) return DIERR_NOTACQUIRED; @@ -328,7 +337,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities( LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) { - SysKeyboardImpl *This = (SysKeyboardImpl *)iface; + SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); DIDEVCAPS devcaps; TRACE("(this=%p,%p)\n",This,lpDIDevCaps); @@ -410,7 +419,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEINSTANCEA pdidi) { - SysKeyboardImpl *This = (SysKeyboardImpl *)iface; + SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(this=%p,%p)\n", This, pdidi); if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA)) { @@ -423,9 +432,9 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceInfo( return DI_OK; } -static HRESULT WINAPI SysKeyboardWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEINSTANCEW pdidi) +static HRESULT WINAPI SysKeyboardWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEINSTANCEW pdidi) { - SysKeyboardImpl *This = (SysKeyboardImpl *)iface; + SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); TRACE("(this=%p,%p)\n", This, pdidi); if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEW)) {

1 0

Vitaliy Margolen : dinput: COM cleanup - use helper function instead of direct typecast in base joystick class .
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: de4a9bb3195794f50e7b0a8e3809b36c72401e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de4a9bb3195794f50e7b0a8e3… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:43:37 2011 -0700 dinput: COM cleanup - use helper function instead of direct typecast in base joystick class. --- dlls/dinput/joystick.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index e894dc6..520eb4d 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -32,6 +32,15 @@ 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 */ @@ -40,7 +49,7 @@ HRESULT WINAPI JoystickAGenericImpl_SetProperty( REFGUID rguid, LPCDIPROPHEADER ph) { - JoystickGenericImpl *This = (JoystickGenericImpl *)iface; + JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); DWORD i; TRACE("(%p,%s,%p)\n",This,debugstr_guid(rguid),ph); @@ -144,7 +153,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetCapabilities( LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) { - JoystickGenericImpl *This = (JoystickGenericImpl *)iface; + JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); int size; TRACE("%p->(%p)\n",iface,lpDIDevCaps); @@ -223,7 +232,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetProperty( REFGUID rguid, LPDIPROPHEADER pdiph) { - JoystickGenericImpl *This = (JoystickGenericImpl *)iface; + JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); @@ -283,7 +292,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEINSTANCEA pdidi) { - JoystickGenericImpl *This = (JoystickGenericImpl *)iface; + JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(%p,%p)\n", iface, pdidi); @@ -321,7 +330,7 @@ HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEINSTANCEW pdidi) { - JoystickGenericImpl *This = (JoystickGenericImpl *)iface; + JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); TRACE("(%p,%p)\n", iface, pdidi); @@ -349,7 +358,7 @@ HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( HRESULT WINAPI JoystickAGenericImpl_Poll(LPDIRECTINPUTDEVICE8A iface) { - JoystickGenericImpl *This = (JoystickGenericImpl *)iface; + JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(%p)\n",This); @@ -371,7 +380,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceState( DWORD len, LPVOID ptr) { - JoystickGenericImpl *This = (JoystickGenericImpl *)iface; + JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(%p,0x%08x,%p)\n", This, len, ptr);

1 0