dinput: Fix infinite effect length handling.

Based on ideas by Elias Vanderstuyft. Signed-off-by: Bruno Jesus <00cpxxx@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dinput: Fix infinite effect length handling.
d0070935 · Bruno Jesus · Alexandre Julliard · 7d88a12d · d0070935
Commit d0070935 authored Aug 24, 2016 by Bruno Jesus Committed by Alexandre Julliard Aug 25, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 3 deletions

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

No files found.
--- a/dlls/dinput/effect_linuxinput.c
+++ b/dlls/dinput/effect_linuxinput.c
@@ -302,8 +302,12 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetParameters(
 	}
    }

-    if (dwFlags & DIEP_DURATION) {
-	peff->dwDuration = (DWORD)This->effect.replay.length * 1000;
+    if (dwFlags & DIEP_DURATION)
+    {
+        if (!This->effect.replay.length) /* infinite for the linux driver */
+            peff->dwDuration = INFINITE;
+        else
+            peff->dwDuration = (DWORD)This->effect.replay.length * 1000;
    }

    if (dwFlags & DIEP_ENVELOPE) {
@@ -535,7 +539,14 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters(
    }

    if (dwFlags & DIEP_DURATION)
-	This->effect.replay.length = peff->dwDuration / 1000;
+    {
+        if (peff->dwDuration == INFINITE)
+            This->effect.replay.length = 0; /* infinite for the linux driver */
+        else if(peff->dwDuration > 1000)
+            This->effect.replay.length = peff->dwDuration / 1000;
+        else
+            This->effect.replay.length = 1;
+    }

    if (dwFlags & DIEP_ENVELOPE) {
        struct ff_envelope* env;