Rémi Bernon : dinput: Move GetForceFeedbackState stub to device.c.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4ddd257f06aeb42f51e34211cc9ee267f5e5c536
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4ddd257f06aeb42f51e34211c...

Author: Rémi Bernon 
Date:   Thu Oct 21 09:53:44 2021 +0200

dinput: Move GetForceFeedbackState stub to device.c.

Signed-off-by: Rémi Bernon 
Signed-off-by: Alexandre Julliard

---

dlls/dinput/device.c       |  8 ++++----
 dlls/dinput/joystick_hid.c | 11 +----------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index ce163660e6c..2a9b9aa596e 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -1746,11 +1746,11 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetEffectInfo( IDirectInputDevice8W *ifa
     return impl->vtbl->get_effect_info( iface, info, guid );
 }

-HRESULT WINAPI IDirectInputDevice2WImpl_GetForceFeedbackState(LPDIRECTINPUTDEVICE8W iface, LPDWORD pdwOut)
+HRESULT WINAPI IDirectInputDevice2WImpl_GetForceFeedbackState( IDirectInputDevice8W *iface, DWORD *out )
 {
-    IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface);
-    FIXME("(%p)->(%p): stub!\n", This, pdwOut);
-    return DI_OK;
+    FIXME( "iface %p, out %p stub!\n", iface, out );
+    if (!out) return E_POINTER;
+    return DIERR_UNSUPPORTED;
 }

HRESULT WINAPI IDirectInputDevice2WImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8W iface, DWORD dwFlags)
diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c
index 1e1f8c05e3f..2788f138216 100644
--- a/dlls/dinput/joystick_hid.c
+++ b/dlls/dinput/joystick_hid.c
@@ -973,15 +973,6 @@ static HRESULT hid_joystick_internal_get_effect_info( IDirectInputDevice8W *ifac
     return DI_OK;
 }

-static HRESULT WINAPI hid_joystick_GetForceFeedbackState( IDirectInputDevice8W *iface, DWORD *out )
-{
-    FIXME( "iface %p, out %p stub!\n", iface, out );
-
-    if (!out) return E_POINTER;
-
-    return DIERR_UNSUPPORTED;
-}
-
 static BOOL CALLBACK unload_effect_object( IDirectInputEffect *effect, void *context )
 {
     IDirectInputEffect_Unload( effect );
@@ -1080,7 +1071,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl =
     hid_joystick_CreateEffect,
     IDirectInputDevice2WImpl_EnumEffects,
     IDirectInputDevice2WImpl_GetEffectInfo,
-    hid_joystick_GetForceFeedbackState,
+    IDirectInputDevice2WImpl_GetForceFeedbackState,
     hid_joystick_SendForceFeedbackCommand,
     hid_joystick_EnumCreatedEffectObjects,
     IDirectInputDevice2WImpl_Escape,