Rémi Bernon : dinput: Add object names for simulation HID usages.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ab780cee837f9d80a512a04aaceb7c5f554b5558
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ab780cee837f9d80a512a04aa...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Thu Mar  3 12:01:58 2022 +0100

dinput: Add object names for simulation HID usages.

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/dinput/joystick_hid.c    | 5 +++++
 dlls/dinput/tests/joystick8.c | 9 ---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c
index 80991e8c150..87e343bb47b 100644
--- a/dlls/dinput/joystick_hid.c
+++ b/dlls/dinput/joystick_hid.c
@@ -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(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;
     }
 }
diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c
index e65e3ca9970..8899cbdfecf 100644
--- a/dlls/dinput/tests/joystick8.c
+++ b/dlls/dinput/tests/joystick8.c
@@ -2773,20 +2773,11 @@ static void test_driving_wheel_axes(void)
             .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 =
     {
         .version = DIRECTINPUT_VERSION,
         .expect_count = ARRAY_SIZE(expect_objects),
         .expect_objs = expect_objects,
-        .todo_objs = object_todos,
     };
 
     WCHAR cwd[MAX_PATH], tempdir[MAX_PATH];