Commit 51f97bb3 authored by Andrew Eikum's avatar Andrew Eikum Committed by Alexandre Julliard

dinput: Support DIPROP_FFGAIN for OSX joysticks.

parent 0ba2a2f7
...@@ -1131,6 +1131,18 @@ static HRESULT osx_set_autocenter(JoystickImpl *This, ...@@ -1131,6 +1131,18 @@ static HRESULT osx_set_autocenter(JoystickImpl *This,
return hr; 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, static HRESULT WINAPI JoystickWImpl_SetProperty(IDirectInputDevice8W *iface,
const GUID *prop, const DIPROPHEADER *header) const GUID *prop, const DIPROPHEADER *header)
{ {
...@@ -1142,6 +1154,8 @@ static HRESULT WINAPI JoystickWImpl_SetProperty(IDirectInputDevice8W *iface, ...@@ -1142,6 +1154,8 @@ static HRESULT WINAPI JoystickWImpl_SetProperty(IDirectInputDevice8W *iface,
{ {
case (DWORD_PTR)DIPROP_AUTOCENTER: case (DWORD_PTR)DIPROP_AUTOCENTER:
return osx_set_autocenter(This, (const DIPROPDWORD *)header); 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); return JoystickWGenericImpl_SetProperty(iface, prop, header);
...@@ -1158,6 +1172,8 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(IDirectInputDevice8A *iface, ...@@ -1158,6 +1172,8 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(IDirectInputDevice8A *iface,
{ {
case (DWORD_PTR)DIPROP_AUTOCENTER: case (DWORD_PTR)DIPROP_AUTOCENTER:
return osx_set_autocenter(This, (const DIPROPDWORD *)header); 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); return JoystickAGenericImpl_SetProperty(iface, prop, header);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment