system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-08 04:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

winebus: Properly identify SDL joysticks index when hot-plugged.

Browse source 
Signed-off-by: Aric Stewart <aric@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Aric Stewart 2018-05-08 10:57:29 -05:00 committed by Alexandre Julliard
parent 17574518d6
commit 5631402651
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dlls/winebus.sys/bus_sdl.c
View file

@ -817,7 +817,7 @@ static void try_add_device(SDL_JoystickID index)
if (map_controllers && pSDL_IsGameController(index))
controller = pSDL_GameControllerOpen(index);
id = index;
id = pSDL_JoystickInstanceID(joystick);
if (controller)
{
vid = VID_MICROSOFT;
@ -846,7 +846,7 @@ static void try_add_device(SDL_JoystickID index)
if (controller)
{
TRACE("Found sdl game controller %i (vid %04x, pid %04x, version %u, serial %s)\n",
index, vid, pid, version, debugstr_w(serial));
id, vid, pid, version, debugstr_w(serial));
is_xbox_gamepad = TRUE;
}
else
@ -854,14 +854,14 @@ static void try_add_device(SDL_JoystickID index)
int button_count, axis_count;
TRACE("Found sdl device %i (vid %04x, pid %04x, version %u, serial %s)\n",
index, vid, pid, version, debugstr_w(serial));
id, vid, pid, version, debugstr_w(serial));
axis_count = pSDL_JoystickNumAxes(joystick);
button_count = pSDL_JoystickNumAxes(joystick);
is_xbox_gamepad = (axis_count == 6 && button_count >= 14);
}
device = bus_create_hid_device(sdl_driver_obj, sdl_busidW, vid, pid, version, 0, serial, is_xbox_gamepad, &GUID_DEVCLASS_SDL, &sdl_vtbl, sizeof(struct platform_private));
device = bus_create_hid_device(sdl_driver_obj, sdl_busidW, vid, pid, version, id, serial, is_xbox_gamepad, &GUID_DEVCLASS_SDL, &sdl_vtbl, sizeof(struct platform_private));
if (device)
{
@ -885,7 +885,7 @@ static void try_add_device(SDL_JoystickID index)
}
else
{
WARN("Ignoring device %i\n", index);
WARN("Ignoring device %i\n", id);
}
}