Andrew Eikum : dinput: Support DIPROP_FFGAIN for OSX joysticks.

Alexandre Julliard julliard at winehq.org
Fri May 24 11:12:44 CDT 2013


Module: wine
Branch: master
Commit: 51f97bb3f9213c0934e1dcb8c25ddc9d1e8c41e4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=51f97bb3f9213c0934e1dcb8c25ddc9d1e8c41e4

Author: Andrew Eikum <aeikum at codeweavers.com>
Date:   Thu May 23 14:58:27 2013 -0500

dinput: Support DIPROP_FFGAIN for OSX joysticks.

---

 dlls/dinput/joystick_osx.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c
index 555cbf4..66b020e 100644
--- a/dlls/dinput/joystick_osx.c
+++ b/dlls/dinput/joystick_osx.c
@@ -1131,6 +1131,18 @@ static HRESULT osx_set_autocenter(JoystickImpl *This,
     return hr;
 }
 
+static HRESULT osx_set_ffgain(JoystickImpl *This, const DIPROPDWORD *header)
+{
+    UInt32 v;
+    HRESULT hr;
+    if(!This->ff)
+        return DIERR_UNSUPPORTED;
+    v = header->dwData;
+    hr = osx_to_win32_hresult(FFDeviceSetForceFeedbackProperty(This->ff, FFPROP_FFGAIN, &v));
+    TRACE("returning: %08x\n", hr);
+    return hr;
+}
+
 static HRESULT WINAPI JoystickWImpl_SetProperty(IDirectInputDevice8W *iface,
         const GUID *prop, const DIPROPHEADER *header)
 {
@@ -1142,6 +1154,8 @@ static HRESULT WINAPI JoystickWImpl_SetProperty(IDirectInputDevice8W *iface,
     {
     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 JoystickWGenericImpl_SetProperty(iface, prop, header);
@@ -1158,6 +1172,8 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(IDirectInputDevice8A *iface,
     {
     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);




More information about the wine-cvs mailing list