dinput: Stop and unload effect when freeing it.

91036a04 · Vitaliy Margolen · Alexandre Julliard · 85e2aa1d · 91036a04
Commit 91036a04 authored Jul 05, 2008 by Vitaliy Margolen Committed by Alexandre Julliard Jul 07, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 11 deletions

effect_linuxinput.c dlls/dinput/effect_linuxinput.c +14 -11

No files found.
--- a/dlls/dinput/effect_linuxinput.c
+++ b/dlls/dinput/effect_linuxinput.c
@@ -724,17 +724,6 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters(
    return DI_OK;
 }   

-static ULONG WINAPI LinuxInputEffectImpl_Release(
-	LPDIRECTINPUTEFFECT iface)
-{
-    LinuxInputEffectImpl *This = (LinuxInputEffectImpl *)iface;
-    ULONG ref = InterlockedDecrement(&(This->ref));
-
-    if (ref == 0)
-        HeapFree(GetProcessHeap(), 0, This);
-    return ref;
-}
-
 static HRESULT WINAPI LinuxInputEffectImpl_Stop(
        LPDIRECTINPUTEFFECT iface)
 {
@@ -768,6 +757,20 @@ static HRESULT WINAPI LinuxInputEffectImpl_Unload(
    return DI_OK;
 }

+static ULONG WINAPI LinuxInputEffectImpl_Release(LPDIRECTINPUTEFFECT iface)
+{
+    LinuxInputEffectImpl *This = (LinuxInputEffectImpl *)iface;
+    ULONG ref = InterlockedDecrement(&(This->ref));
+
+    if (ref == 0)
+    {
+        LinuxInputEffectImpl_Stop(iface);
+        LinuxInputEffectImpl_Unload(iface);
+        HeapFree(GetProcessHeap(), 0, This);
+    }
+    return ref;
+}
+
 /******************************************************************************
 *      LinuxInputEffect
 */