dinput: Set correct object names for dials and sliders.

dlls/dinput/joystick_hid.c

@@ -354,6 +354,8 @@ static const WCHAR *object_usage_to_string( DIDEVICEOBJECTINSTANCEW *instance )
     case MAKELONG(HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC): return L"X Axis";
     case MAKELONG(HID_USAGE_GENERIC_Y, HID_USAGE_PAGE_GENERIC): return L"Y Axis";
     case MAKELONG(HID_USAGE_GENERIC_Z, HID_USAGE_PAGE_GENERIC): return L"Z Axis";
+    case MAKELONG(HID_USAGE_GENERIC_SLIDER, HID_USAGE_PAGE_GENERIC): return L"Slider";
+    case MAKELONG(HID_USAGE_GENERIC_DIAL, HID_USAGE_PAGE_GENERIC): return L"Dial";
 
     case MAKELONG(PID_USAGE_ATTACK_LEVEL, HID_USAGE_PAGE_PID): return L"Attack Level";
     case MAKELONG(PID_USAGE_ATTACK_TIME, HID_USAGE_PAGE_PID): return L"Attack Time";

dlls/dinput/tests/joystick8.c

@@ -2992,8 +2992,8 @@ static void test_many_axes_joystick(void)
         {0},
         {0},
         {0},
-        {.name = TRUE},
-        {.name = TRUE, .guid = TRUE},
+        {0},
+        {.guid = TRUE},
         {.flags = TRUE},
         {.flags = TRUE},
         {.flags = TRUE},
@@ -3120,7 +3120,7 @@ static void test_many_axes_joystick(void)
     check_member( objinst, expect_objects[8], "%#lx", dwOfs );
     check_member( objinst, expect_objects[8], "%#lx", dwType );
     check_member( objinst, expect_objects[8], "%#lx", dwFlags );
-    if (!localized) todo_wine check_member_wstr( objinst, expect_objects[8], tszName );
+    if (!localized) check_member_wstr( objinst, expect_objects[8], tszName );
     check_member( objinst, expect_objects[8], "%lu", dwFFMaxForce );
     check_member( objinst, expect_objects[8], "%lu", dwFFForceResolution );
     check_member( objinst, expect_objects[8], "%u", wCollectionNumber );