From 90ef30828ee6ae958ccbd55803a758f8213be1ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Tue, 25 May 2021 18:48:54 +0200 Subject: [PATCH] dinput: Use generic WtoA wrappers when possible. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémi Bernon Signed-off-by: Alexandre Julliard --- dlls/dinput/device.c | 20 ++++----- dlls/dinput/joystick.c | 18 -------- dlls/dinput/joystick_linux.c | 33 +++----------- dlls/dinput/joystick_linuxinput.c | 75 ++++--------------------------- dlls/dinput/joystick_osx.c | 61 +++---------------------- dlls/dinput/joystick_private.h | 3 -- dlls/dinput/keyboard.c | 17 +------ dlls/dinput/mouse.c | 33 ++------------ 8 files changed, 35 insertions(+), 225 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c645e033677..d1c198d1807 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1070,7 +1070,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - return IDirectInputDevice2WImpl_Acquire(IDirectInputDevice8W_from_impl(This)); + return IDirectInputDevice_Acquire(IDirectInputDevice8W_from_impl(This)); } @@ -1100,7 +1100,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) HRESULT WINAPI IDirectInputDevice2AImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - return IDirectInputDevice2WImpl_Unacquire(IDirectInputDevice8W_from_impl(This)); + return IDirectInputDevice_Unacquire(IDirectInputDevice8W_from_impl(This)); } /****************************************************************************** @@ -1417,7 +1417,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - return IDirectInputDevice2WImpl_GetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); + return IDirectInputDevice_GetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); } /****************************************************************************** @@ -1534,7 +1534,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetProperty( LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPCDIPROPHEADER pdiph) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - return IDirectInputDevice2WImpl_SetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); + return IDirectInputDevice_SetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); } HRESULT WINAPI IDirectInputDevice2AImpl_GetObjectInfo( @@ -1682,7 +1682,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A ifac LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - return IDirectInputDevice2WImpl_GetDeviceData(IDirectInputDevice8W_from_impl(This), dodsize, dod, entries, flags); + return IDirectInputDevice_GetDeviceData(IDirectInputDevice8W_from_impl(This), dodsize, dod, entries, flags); } HRESULT WINAPI IDirectInputDevice2WImpl_RunControlPanel(LPDIRECTINPUTDEVICE8W iface, HWND hwndOwner, DWORD dwFlags) @@ -1733,7 +1733,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_CreateEffect(LPDIRECTINPUTDEVICE8A iface LPDIRECTINPUTEFFECT *ppdef, LPUNKNOWN pUnkOuter) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - return IDirectInputDevice2WImpl_CreateEffect(IDirectInputDevice8W_from_impl(This), rguid, lpeff, ppdef, pUnkOuter); + return IDirectInputDevice2_CreateEffect(IDirectInputDevice8W_from_impl(This), rguid, lpeff, ppdef, pUnkOuter); } HRESULT WINAPI IDirectInputDevice2AImpl_EnumEffects( @@ -1790,7 +1790,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetForceFeedbackState(LPDIRECTINPUTDEVIC HRESULT WINAPI IDirectInputDevice2AImpl_GetForceFeedbackState(LPDIRECTINPUTDEVICE8A iface, LPDWORD pdwOut) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - return IDirectInputDevice2WImpl_GetForceFeedbackState(IDirectInputDevice8W_from_impl(This), pdwOut); + return IDirectInputDevice2_GetForceFeedbackState(IDirectInputDevice8W_from_impl(This), pdwOut); } HRESULT WINAPI IDirectInputDevice2WImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8W iface, DWORD dwFlags) @@ -1803,7 +1803,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SendForceFeedbackCommand(LPDIRECTINPUTDE HRESULT WINAPI IDirectInputDevice2AImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8A iface, DWORD dwFlags) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - return IDirectInputDevice2WImpl_SendForceFeedbackCommand(IDirectInputDevice8W_from_impl(This), dwFlags); + return IDirectInputDevice2_SendForceFeedbackCommand(IDirectInputDevice8W_from_impl(This), dwFlags); } HRESULT WINAPI IDirectInputDevice2WImpl_EnumCreatedEffectObjects(LPDIRECTINPUTDEVICE8W iface, @@ -1818,7 +1818,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_EnumCreatedEffectObjects(LPDIRECTINPUTDE LPDIENUMCREATEDEFFECTOBJECTSCALLBACK lpCallback, LPVOID lpvRef, DWORD dwFlags) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - return IDirectInputDevice2WImpl_EnumCreatedEffectObjects(IDirectInputDevice8W_from_impl(This), lpCallback, lpvRef, dwFlags); + return IDirectInputDevice2_EnumCreatedEffectObjects(IDirectInputDevice8W_from_impl(This), lpCallback, lpvRef, dwFlags); } HRESULT WINAPI IDirectInputDevice2WImpl_Escape(LPDIRECTINPUTDEVICE8W iface, LPDIEFFESCAPE lpDIEEsc) @@ -1847,7 +1847,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Poll(LPDIRECTINPUTDEVICE8W iface) HRESULT WINAPI IDirectInputDevice2AImpl_Poll(LPDIRECTINPUTDEVICE8A iface) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - return IDirectInputDevice2WImpl_Poll(IDirectInputDevice8W_from_impl(This)); + return IDirectInputDevice2_Poll(IDirectInputDevice8W_from_impl(This)); } HRESULT WINAPI IDirectInputDevice2WImpl_SendDeviceData(LPDIRECTINPUTDEVICE8W iface, DWORD cbObjectData, diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 68428ac0ddd..3749eed7efe 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -467,12 +467,6 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF return DI_OK; } -HRESULT WINAPI JoystickAGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPCDIPROPHEADER ph) -{ - JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickWGenericImpl_SetProperty(IDirectInputDevice8W_from_impl(This), rguid, ph); -} - #define DEBUG_TYPE(x) case (x): str = #x; break void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps) { @@ -674,12 +668,6 @@ HRESULT WINAPI JoystickWGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF return DI_OK; } -HRESULT WINAPI JoystickAGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) -{ - JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickWGenericImpl_GetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); -} - /****************************************************************************** * GetDeviceInfo : get information about a device's identity */ @@ -788,12 +776,6 @@ HRESULT WINAPI JoystickWGenericImpl_Poll(LPDIRECTINPUTDEVICE8W iface) return DI_OK; } -HRESULT WINAPI JoystickAGenericImpl_Poll(LPDIRECTINPUTDEVICE8A iface) -{ - JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickWGenericImpl_Poll(IDirectInputDevice8W_from_impl(This)); -} - /****************************************************************************** * GetDeviceState : returns the "state" of the joystick. * diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index ee7ad53db11..ec4cb94c034 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -114,11 +114,6 @@ static inline JoystickImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W JoystickGenericImpl, base), JoystickImpl, generic); } -static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(JoystickImpl *This) -{ - return &This->generic.base.IDirectInputDevice8W_iface; -} - static const GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903fb6bdf7 */ 0x9e573ed9, 0x7734, @@ -703,12 +698,6 @@ static HRESULT WINAPI JoystickLinuxWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) return DI_OK; } -static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) -{ - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickLinuxWImpl_Acquire(IDirectInputDevice8W_from_impl(This)); -} - /****************************************************************************** * GetProperty : get input device properties */ @@ -772,12 +761,6 @@ static HRESULT WINAPI JoystickLinuxWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface return DI_OK; } -static HRESULT WINAPI JoystickLinuxAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) -{ - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickLinuxWImpl_GetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); -} - /****************************************************************************** * GetDeviceInfo : get information about a device's identity */ @@ -844,12 +827,6 @@ static HRESULT WINAPI JoystickLinuxWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) return DI_NOEFFECT; } -static HRESULT WINAPI JoystickLinuxAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) -{ - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickLinuxWImpl_Unacquire(IDirectInputDevice8W_from_impl(This)); -} - static void joy_polldev( IDirectInputDevice8W *iface ) { struct pollfd plfd; @@ -932,10 +909,10 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_Release, JoystickAGenericImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, - JoystickLinuxAImpl_GetProperty, - JoystickAGenericImpl_SetProperty, - JoystickLinuxAImpl_Acquire, - JoystickLinuxAImpl_Unacquire, + IDirectInputDevice2AImpl_GetProperty, + IDirectInputDevice2AImpl_SetProperty, + IDirectInputDevice2AImpl_Acquire, + IDirectInputDevice2AImpl_Unacquire, JoystickAGenericImpl_GetDeviceState, IDirectInputDevice2AImpl_GetDeviceData, IDirectInputDevice2AImpl_SetDataFormat, @@ -952,7 +929,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_SendForceFeedbackCommand, IDirectInputDevice2AImpl_EnumCreatedEffectObjects, IDirectInputDevice2AImpl_Escape, - JoystickAGenericImpl_Poll, + IDirectInputDevice2AImpl_Poll, IDirectInputDevice2AImpl_SendDeviceData, IDirectInputDevice7AImpl_EnumEffectsInFile, IDirectInputDevice7AImpl_WriteEffectToFile, diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index b3ad195bbef..14acbb5cd8c 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -148,11 +148,6 @@ static inline JoystickImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W JoystickGenericImpl, base), JoystickImpl, generic); } -static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(JoystickImpl *This) -{ - return &This->generic.base.IDirectInputDevice8W_iface; -} - static void fake_current_js_state(JoystickImpl *ji); static void find_joydevs(void); static void joy_polldev( IDirectInputDevice8W *iface ); @@ -741,12 +736,6 @@ static HRESULT WINAPI JoystickWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) return DI_OK; } -static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) -{ - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickWImpl_Acquire(IDirectInputDevice8W_from_impl(This)); -} - /****************************************************************************** * Unacquire : frees the joystick */ @@ -779,12 +768,6 @@ static HRESULT WINAPI JoystickWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) return res; } -static HRESULT WINAPI JoystickAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) -{ - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickWImpl_Unacquire(IDirectInputDevice8W_from_impl(This)); -} - /* * set the current state of the js device as it would be with the middle * values on the axes @@ -966,12 +949,6 @@ static HRESULT WINAPI JoystickWImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF return DI_OK; } -static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPCDIPROPHEADER ph) -{ - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickWImpl_SetProperty(IDirectInputDevice8W_from_impl(This), rguid, ph); -} - /****************************************************************************** * GetProperty : get input device properties */ @@ -1052,12 +1029,6 @@ static HRESULT WINAPI JoystickWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF return DI_OK; } -static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) -{ - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickWImpl_GetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); -} - /****************************************************************************** * CreateEffect - Create a new FF effect with the specified params */ @@ -1120,14 +1091,6 @@ static HRESULT WINAPI JoystickWImpl_CreateEffect(LPDIRECTINPUTDEVICE8W iface, RE #endif /* HAVE_STRUCT_FF_EFFECT_DIRECTION */ } -static HRESULT WINAPI JoystickAImpl_CreateEffect(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, - LPCDIEFFECT lpeff, LPDIRECTINPUTEFFECT *ppdef, - LPUNKNOWN pUnkOuter) -{ - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickWImpl_CreateEffect(IDirectInputDevice8W_from_impl(This), rguid, lpeff, ppdef, pUnkOuter); -} - /******************************************************************************* * EnumEffects - Enumerate available FF effects */ @@ -1338,12 +1301,6 @@ static HRESULT WINAPI JoystickWImpl_GetForceFeedbackState(LPDIRECTINPUTDEVICE8W return DI_OK; } -static HRESULT WINAPI JoystickAImpl_GetForceFeedbackState(LPDIRECTINPUTDEVICE8A iface, LPDWORD pdwOut) -{ - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickWImpl_GetForceFeedbackState(IDirectInputDevice8W_from_impl(This), pdwOut); -} - /******************************************************************************* * SendForceFeedbackCommand - Send a command to the device's FF system */ @@ -1397,12 +1354,6 @@ static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE #endif } -static HRESULT WINAPI JoystickAImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8A iface, DWORD dwFlags) -{ - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickWImpl_SendForceFeedbackCommand(IDirectInputDevice8W_from_impl(This), dwFlags); -} - /******************************************************************************* * EnumCreatedEffectObjects - Enumerate all the effects that have been * created for this device. @@ -1429,14 +1380,6 @@ static HRESULT WINAPI JoystickWImpl_EnumCreatedEffectObjects(LPDIRECTINPUTDEVICE return DI_OK; } -static HRESULT WINAPI JoystickAImpl_EnumCreatedEffectObjects(LPDIRECTINPUTDEVICE8A iface, - LPDIENUMCREATEDEFFECTOBJECTSCALLBACK lpCallback, - LPVOID pvRef, DWORD dwFlags) -{ - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickWImpl_EnumCreatedEffectObjects(IDirectInputDevice8W_from_impl(This), lpCallback, pvRef, dwFlags); -} - /****************************************************************************** * GetDeviceInfo : get information about a device's identity */ @@ -1487,10 +1430,10 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_Release, JoystickAGenericImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, - JoystickAImpl_GetProperty, - JoystickAImpl_SetProperty, - JoystickAImpl_Acquire, - JoystickAImpl_Unacquire, + IDirectInputDevice2AImpl_GetProperty, + IDirectInputDevice2AImpl_SetProperty, + IDirectInputDevice2AImpl_Acquire, + IDirectInputDevice2AImpl_Unacquire, JoystickAGenericImpl_GetDeviceState, IDirectInputDevice2AImpl_GetDeviceData, IDirectInputDevice2AImpl_SetDataFormat, @@ -1500,14 +1443,14 @@ static const IDirectInputDevice8AVtbl JoystickAvt = JoystickAImpl_GetDeviceInfo, IDirectInputDevice2AImpl_RunControlPanel, IDirectInputDevice2AImpl_Initialize, - JoystickAImpl_CreateEffect, + IDirectInputDevice2AImpl_CreateEffect, JoystickAImpl_EnumEffects, JoystickAImpl_GetEffectInfo, - JoystickAImpl_GetForceFeedbackState, - JoystickAImpl_SendForceFeedbackCommand, - JoystickAImpl_EnumCreatedEffectObjects, + IDirectInputDevice2AImpl_GetForceFeedbackState, + IDirectInputDevice2AImpl_SendForceFeedbackCommand, + IDirectInputDevice2AImpl_EnumCreatedEffectObjects, IDirectInputDevice2AImpl_Escape, - JoystickAGenericImpl_Poll, + IDirectInputDevice2AImpl_Poll, IDirectInputDevice2AImpl_SendDeviceData, IDirectInputDevice7AImpl_EnumEffectsInFile, IDirectInputDevice7AImpl_WriteEffectToFile, diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index a2f9e936746..174a78b7fd4 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -127,11 +127,6 @@ static inline JoystickImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W JoystickGenericImpl, base), JoystickImpl, generic); } -static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(JoystickImpl *This) -{ - return &This->generic.base.IDirectInputDevice8W_iface; -} - typedef struct _EffectImpl { IDirectInputEffect IDirectInputEffect_iface; LONG ref; @@ -1444,12 +1439,6 @@ static HRESULT WINAPI JoystickWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF return DI_OK; } -static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) -{ - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickWImpl_GetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); -} - static HRESULT osx_set_autocenter(JoystickImpl *This, const DIPROPDWORD *header) { @@ -1493,24 +1482,6 @@ static HRESULT WINAPI JoystickWImpl_SetProperty(IDirectInputDevice8W *iface, return JoystickWGenericImpl_SetProperty(iface, prop, header); } -static HRESULT WINAPI JoystickAImpl_SetProperty(IDirectInputDevice8A *iface, - const GUID *prop, const DIPROPHEADER *header) -{ - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); - - TRACE("%p %s %p\n", This, debugstr_guid(prop), header); - - switch(LOWORD(prop)) - { - case (DWORD_PTR)DIPROP_AUTOCENTER: - return osx_set_autocenter(This, (const DIPROPDWORD *)header); - case (DWORD_PTR)DIPROP_FFGAIN: - return osx_set_ffgain(This, (const DIPROPDWORD *)header); - } - - return JoystickAGenericImpl_SetProperty(iface, prop, header); -} - static CFUUIDRef effect_win_to_mac(const GUID *effect) { #define DO_MAP(X) \ @@ -1576,18 +1547,6 @@ static HRESULT WINAPI JoystickWImpl_CreateEffect(IDirectInputDevice8W *iface, return S_OK; } -static HRESULT WINAPI JoystickAImpl_CreateEffect(IDirectInputDevice8A *iface, - const GUID *type, const DIEFFECT *params, IDirectInputEffect **out, - IUnknown *outer) -{ - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); - - TRACE("(%p)->(%s %p %p %p)\n", This, debugstr_guid(type), params, out, outer); - - return JoystickWImpl_CreateEffect(&This->generic.base.IDirectInputDevice8W_iface, - type, params, out, outer); -} - static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(IDirectInputDevice8W *iface, DWORD flags) { @@ -1608,16 +1567,6 @@ static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(IDirectInputDevice8 return S_OK; } -static HRESULT WINAPI JoystickAImpl_SendForceFeedbackCommand(IDirectInputDevice8A *iface, - DWORD flags) -{ - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); - - TRACE("%p 0x%x\n", This, flags); - - return JoystickWImpl_SendForceFeedbackCommand(&This->generic.base.IDirectInputDevice8W_iface, flags); -} - const struct dinput_device joystick_osx_device = { "Wine OS X joystick driver", joydev_enum_deviceA, @@ -1632,8 +1581,8 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_Release, JoystickAGenericImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, - JoystickAImpl_GetProperty, - JoystickAImpl_SetProperty, + IDirectInputDevice2AImpl_GetProperty, + IDirectInputDevice2AImpl_SetProperty, IDirectInputDevice2AImpl_Acquire, IDirectInputDevice2AImpl_Unacquire, JoystickAGenericImpl_GetDeviceState, @@ -1645,14 +1594,14 @@ static const IDirectInputDevice8AVtbl JoystickAvt = JoystickAGenericImpl_GetDeviceInfo, IDirectInputDevice2AImpl_RunControlPanel, IDirectInputDevice2AImpl_Initialize, - JoystickAImpl_CreateEffect, + IDirectInputDevice2AImpl_CreateEffect, IDirectInputDevice2AImpl_EnumEffects, IDirectInputDevice2AImpl_GetEffectInfo, IDirectInputDevice2AImpl_GetForceFeedbackState, - JoystickAImpl_SendForceFeedbackCommand, + IDirectInputDevice2AImpl_SendForceFeedbackCommand, IDirectInputDevice2AImpl_EnumCreatedEffectObjects, IDirectInputDevice2AImpl_Escape, - JoystickAGenericImpl_Poll, + IDirectInputDevice2AImpl_Poll, IDirectInputDevice2AImpl_SendDeviceData, IDirectInputDevice7AImpl_EnumEffectsInFile, IDirectInputDevice7AImpl_WriteEffectToFile, diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index ae382047fb4..0f191787158 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -65,7 +65,6 @@ HRESULT WINAPI JoystickWGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, HRESULT WINAPI JoystickAGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEOBJECTINSTANCEA pdidoi, DWORD dwObj, DWORD dwHow) DECLSPEC_HIDDEN; -HRESULT WINAPI JoystickAGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) DECLSPEC_HIDDEN; HRESULT WINAPI JoystickWGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPDIPROPHEADER pdiph) DECLSPEC_HIDDEN; HRESULT WINAPI JoystickAGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) DECLSPEC_HIDDEN; @@ -73,7 +72,6 @@ HRESULT WINAPI JoystickWGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps) DECLSPEC_HIDDEN; -HRESULT WINAPI JoystickAGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPCDIPROPHEADER ph) DECLSPEC_HIDDEN; HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPCDIPROPHEADER ph) DECLSPEC_HIDDEN; HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8A iface, @@ -82,7 +80,6 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8A iface, HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEINSTANCEW pdidi) DECLSPEC_HIDDEN; -HRESULT WINAPI JoystickAGenericImpl_Poll(LPDIRECTINPUTDEVICE8A iface) DECLSPEC_HIDDEN; HRESULT WINAPI JoystickWGenericImpl_Poll(LPDIRECTINPUTDEVICE8W iface) DECLSPEC_HIDDEN; HRESULT WINAPI JoystickAGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 4a3606d2c43..ca3b1dad669 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -577,13 +577,6 @@ static HRESULT WINAPI SysKeyboardWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, return DI_OK; } -static HRESULT WINAPI SysKeyboardAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, - REFGUID rguid, LPDIPROPHEADER pdiph) -{ - SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); - return SysKeyboardWImpl_GetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); -} - static HRESULT WINAPI SysKeyboardWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) { SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); @@ -601,12 +594,6 @@ static HRESULT WINAPI SysKeyboardWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) return res; } -static HRESULT WINAPI SysKeyboardAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) -{ - SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); - return SysKeyboardWImpl_Acquire(IDirectInputDevice8W_from_impl(This)); -} - static HRESULT WINAPI SysKeyboardWImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, @@ -695,9 +682,9 @@ static const IDirectInputDevice8AVtbl SysKeyboardAvt = IDirectInputDevice2AImpl_Release, SysKeyboardAImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, - SysKeyboardAImpl_GetProperty, + IDirectInputDevice2AImpl_GetProperty, IDirectInputDevice2AImpl_SetProperty, - SysKeyboardAImpl_Acquire, + IDirectInputDevice2AImpl_Acquire, IDirectInputDevice2AImpl_Unacquire, SysKeyboardAImpl_GetDeviceState, IDirectInputDevice2AImpl_GetDeviceData, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 46844ffa28d..65f173daa81 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -584,12 +584,6 @@ static HRESULT WINAPI SysMouseWImpl_Acquire(LPDIRECTINPUTDEVICE8W 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 */ @@ -619,12 +613,6 @@ static HRESULT WINAPI SysMouseWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) 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. * @@ -679,13 +667,6 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W 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 */ @@ -745,12 +726,6 @@ static HRESULT WINAPI SysMouseWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF 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 */ @@ -959,12 +934,12 @@ static const IDirectInputDevice8AVtbl SysMouseAvt = IDirectInputDevice2AImpl_Release, SysMouseAImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, - SysMouseAImpl_GetProperty, + IDirectInputDevice2AImpl_GetProperty, IDirectInputDevice2AImpl_SetProperty, - SysMouseAImpl_Acquire, - SysMouseAImpl_Unacquire, + IDirectInputDevice2AImpl_Acquire, + IDirectInputDevice2AImpl_Unacquire, SysMouseAImpl_GetDeviceState, - SysMouseAImpl_GetDeviceData, + IDirectInputDevice2AImpl_GetDeviceData, IDirectInputDevice2AImpl_SetDataFormat, IDirectInputDevice2AImpl_SetEventNotification, IDirectInputDevice2AImpl_SetCooperativeLevel,