winmm/tests: Enumerate all joystick devices during the test.

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

winmm/tests: Enumerate all joystick devices during the test.
f2fa2448 · Bruno Jesus · Alexandre Julliard · 62876f3f · f2fa2448
Commit f2fa2448 authored Aug 15, 2016 by Bruno Jesus Committed by Alexandre Julliard Aug 16, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

joystick.c dlls/winmm/tests/joystick.c +3 -2

No files found.
--- a/dlls/winmm/tests/joystick.c
+++ b/dlls/winmm/tests/joystick.c
@@ -82,7 +82,9 @@ static void test_api(void)
        ret = joyGetDevCapsA(JOYSTICKID1 + i, &jc, sizeof(jc));
        if (ret == JOYERR_NOERROR)
        {
-            joyid = JOYSTICKID1 + i;
+            if (joyid == -1) /* Cache the first found joystick to run advanced tests below */
+              joyid = JOYSTICKID1 + i;
+
            trace("Joystick[%d] - name: '%s', axes: %d, buttons: %d, period range: %d - %d\n",
                  JOYSTICKID1 + i, jc.szPname, jc.wNumAxes, jc.wNumButtons, jc.wPeriodMin, jc.wPeriodMax);
            ret = joyGetDevCapsW(JOYSTICKID1 + i, &jcw, sizeof(jcw));
@@ -93,7 +95,6 @@ static void test_api(void)
                ok(jc.wNumButtons == jcw.wNumButtons, "Expected %d == %d\n", jc.wNumButtons, jcw.wNumButtons);
            }
            else win98++;
-            break;
        }
        else
        {