ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Bruno Jesus 2016-08-15 19:11:38 -03:00 committed by Alexandre Julliard
parent 62876f3fc5
commit f2fa2448aa
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/winmm/tests/joystick.c
View File

@ -82,7 +82,9 @@ static void test_api(void)
ret = joyGetDevCapsA(JOYSTICKID1 + i, &jc, sizeof(jc)); ret = joyGetDevCapsA(JOYSTICKID1 + i, &jc, sizeof(jc));
if (ret == JOYERR_NOERROR) 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", 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); JOYSTICKID1 + i, jc.szPname, jc.wNumAxes, jc.wNumButtons, jc.wPeriodMin, jc.wPeriodMax);
ret = joyGetDevCapsW(JOYSTICKID1 + i, &jcw, sizeof(jcw)); 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); ok(jc.wNumButtons == jcw.wNumButtons, "Expected %d == %d\n", jc.wNumButtons, jcw.wNumButtons);
} }
else win98++; else win98++;
break;
} }
else else
{ {