Rémi Bernon : dinput8/tests: Relax test results for 3 buttons mouse.
Alexandre Julliard
julliard at winehq.org
Tue Oct 26 16:19:18 CDT 2021
Module: wine
Branch: master
Commit: 2c95bb37047c5ebd3ac0591b8463184add47524a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c95bb37047c5ebd3ac0591b8463184add47524a
Author: Rémi Bernon <rbernon at codeweavers.com>
Date: Tue Oct 26 09:15:34 2021 +0200
dinput8/tests: Relax test results for 3 buttons mouse.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51913
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dinput8/tests/device.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c
index 4492170673e..3cad4ce256c 100644
--- a/dlls/dinput8/tests/device.c
+++ b/dlls/dinput8/tests/device.c
@@ -1278,7 +1278,7 @@ static void test_mouse_info(void)
todo_wine
check_member( caps, expect_caps, "%#x", dwDevType );
check_member( caps, expect_caps, "%d", dwAxes );
- check_member( caps, expect_caps, "%d", dwButtons );
+ ok( caps.dwButtons == 3 || caps.dwButtons == 5, "got dwButtons %d, expected 3 or 5\n", caps.dwButtons );
check_member( caps, expect_caps, "%d", dwPOVs );
check_member( caps, expect_caps, "%d", dwFFSamplePeriod );
check_member( caps, expect_caps, "%d", dwFFMinTimeResolution );
@@ -1384,7 +1384,8 @@ static void test_mouse_info(void)
res = 0;
hr = IDirectInputDevice8_EnumObjects( device, check_object_count, &res, DIDFT_AXIS | DIDFT_PSHBUTTON );
ok( hr == DI_OK, "EnumObjects returned %#x\n", hr );
- ok( res == 8, "got %u expected %u\n", res, 8 );
+ ok( res == 3 + caps.dwButtons, "got %u expected %u\n", res, 3 + caps.dwButtons );
+ check_objects_params.expect_count = 3 + caps.dwButtons;
hr = IDirectInputDevice8_EnumObjects( device, check_objects, &check_objects_params, DIDFT_ALL );
ok( hr == DI_OK, "EnumObjects returned %#x\n", hr );
ok( check_objects_params.index >= check_objects_params.expect_count, "missing %u objects\n",
More information about the wine-cvs
mailing list