Commit ab780cee authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard

dinput: Add object names for simulation HID usages.

parent 3b45b4d5
...@@ -414,6 +414,11 @@ static const WCHAR *object_usage_to_string( DIDEVICEOBJECTINSTANCEW *instance ) ...@@ -414,6 +414,11 @@ static const WCHAR *object_usage_to_string( DIDEVICEOBJECTINSTANCEW *instance )
case MAKELONG(PID_USAGE_TRIGGER_BUTTON, HID_USAGE_PAGE_PID): return L"Trigger Button"; case MAKELONG(PID_USAGE_TRIGGER_BUTTON, HID_USAGE_PAGE_PID): return L"Trigger Button";
case MAKELONG(HID_USAGE_SIMULATION_RUDDER, HID_USAGE_PAGE_SIMULATION): return L"Rudder"; case MAKELONG(HID_USAGE_SIMULATION_RUDDER, HID_USAGE_PAGE_SIMULATION): return L"Rudder";
case MAKELONG(HID_USAGE_SIMULATION_THROTTLE, HID_USAGE_PAGE_SIMULATION): return L"Throttle";
case MAKELONG(HID_USAGE_SIMULATION_ACCELERATOR, HID_USAGE_PAGE_SIMULATION): return L"Accelerator";
case MAKELONG(HID_USAGE_SIMULATION_BRAKE, HID_USAGE_PAGE_SIMULATION): return L"Brake";
case MAKELONG(HID_USAGE_SIMULATION_CLUTCH, HID_USAGE_PAGE_SIMULATION): return L"Clutch";
case MAKELONG(HID_USAGE_SIMULATION_STEERING, HID_USAGE_PAGE_SIMULATION): return L"Steering";
default: return NULL; default: return NULL;
} }
} }
......
...@@ -2773,20 +2773,11 @@ static void test_driving_wheel_axes(void) ...@@ -2773,20 +2773,11 @@ static void test_driving_wheel_axes(void)
.wUsage = HID_USAGE_GENERIC_JOYSTICK, .wUsage = HID_USAGE_GENERIC_JOYSTICK,
}, },
}; };
struct check_objects_todos object_todos[ARRAY_SIZE(expect_objects)] =
{
{.name = TRUE},
{.name = TRUE},
{.name = TRUE},
{.name = TRUE},
{.name = TRUE},
};
struct check_objects_params check_objects_params = struct check_objects_params check_objects_params =
{ {
.version = DIRECTINPUT_VERSION, .version = DIRECTINPUT_VERSION,
.expect_count = ARRAY_SIZE(expect_objects), .expect_count = ARRAY_SIZE(expect_objects),
.expect_objs = expect_objects, .expect_objs = expect_objects,
.todo_objs = object_todos,
}; };
WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; WCHAR cwd[MAX_PATH], tempdir[MAX_PATH];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment