Rémi Bernon : windows.gaming.input: Implement IForceFeedbackMotor_TryUnloadEffectAsync.
Alexandre Julliard
julliard at winehq.org
Mon May 16 15:37:57 CDT 2022
Module: wine
Branch: master
Commit: ee937e8e4bd63f1fa4139438f669b2ffe1fc0b56
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee937e8e4bd63f1fa4139438f669b2ffe1fc0b56
Author: Rémi Bernon <rbernon at codeweavers.com>
Date: Thu May 12 10:32:30 2022 +0200
windows.gaming.input: Implement IForceFeedbackMotor_TryUnloadEffectAsync.
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/windows.gaming.input/force_feedback.c | 36 ++++++++++++++++++++++++++++--
1 file changed, 34 insertions(+), 2 deletions(-)
diff --git a/dlls/windows.gaming.input/force_feedback.c b/dlls/windows.gaming.input/force_feedback.c
index 027ef459a1a..7ac69bcec1b 100644
--- a/dlls/windows.gaming.input/force_feedback.c
+++ b/dlls/windows.gaming.input/force_feedback.c
@@ -464,11 +464,43 @@ static HRESULT WINAPI motor_TryResetAsync( IForceFeedbackMotor *iface, IAsyncOpe
return async_operation_boolean_create( (IUnknown *)iface, NULL, motor_try_reset_async, async_op );
}
+static HRESULT WINAPI motor_unload_effect_async( IUnknown *iface, IUnknown *param, PROPVARIANT *result )
+{
+ struct effect *effect = impl_from_IForceFeedbackEffect( (IForceFeedbackEffect *)param );
+ IDirectInputEffect *dinput_effect;
+ HRESULT hr;
+
+ EnterCriticalSection( &effect->cs );
+ dinput_effect = effect->effect;
+ effect->effect = NULL;
+ LeaveCriticalSection( &effect->cs );
+
+ if (!dinput_effect) hr = S_OK;
+ else
+ {
+ hr = IDirectInputEffect_Unload( dinput_effect );
+ IDirectInputEffect_Release( dinput_effect );
+ }
+
+ result->vt = VT_BOOL;
+ result->boolVal = SUCCEEDED(hr);
+ return hr;
+}
+
static HRESULT WINAPI motor_TryUnloadEffectAsync( IForceFeedbackMotor *iface, IForceFeedbackEffect *effect,
IAsyncOperation_boolean **async_op )
{
- FIXME( "iface %p, effect %p, async_op %p stub!\n", iface, effect, async_op );
- return E_NOTIMPL;
+ struct effect *impl = impl_from_IForceFeedbackEffect( (IForceFeedbackEffect *)effect );
+ HRESULT hr = S_OK;
+
+ TRACE( "iface %p, effect %p, async_op %p.\n", iface, effect, async_op );
+
+ EnterCriticalSection( &impl->cs );
+ if (!impl->effect) hr = E_FAIL;
+ LeaveCriticalSection( &impl->cs );
+ if (FAILED(hr)) return hr;
+
+ return async_operation_boolean_create( (IUnknown *)iface, (IUnknown *)effect, motor_unload_effect_async, async_op );
}
static const struct IForceFeedbackMotorVtbl motor_vtbl =
More information about the wine-cvs
mailing list