Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-16 11:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed rare crash when unplugging Xbox controller on Windows

Browse Source
This commit is contained in:
Sam Lantinga 2020-04-13 12:33:29 -07:00
parent 952bac7c47
commit bf87604ef1
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/joystick/windows/SDL_rawinputjoystick.c
View File

@ -222,6 +222,22 @@ RAWINPUT_JoystickGetCount(void)
return SDL_RAWINPUT_numjoysticks; return SDL_RAWINPUT_numjoysticks;
} }
static SDL_RAWINPUT_Device *
RAWINPUT_AcquireDevice(SDL_RAWINPUT_Device *device)
{
SDL_AtomicIncRef(&device->refcount);
return device;
}
static void
RAWINPUT_ReleaseDevice(SDL_RAWINPUT_Device *device)
{
if (SDL_AtomicDecRef(&device->refcount)) {
SDL_free(device->name);
SDL_free(device);
}
}
static SDL_RAWINPUT_Device * static SDL_RAWINPUT_Device *
RAWINPUT_DeviceFromHandle(HANDLE hDevice) RAWINPUT_DeviceFromHandle(HANDLE hDevice)
{ {
@ -360,6 +376,7 @@ RAWINPUT_AddDevice(HANDLE hDevice)
#endif #endif
/* Add it to the list */ /* Add it to the list */
RAWINPUT_AcquireDevice(device);
for (curr = SDL_RAWINPUT_devices, last = NULL; curr; last = curr, curr = curr->next) { for (curr = SDL_RAWINPUT_devices, last = NULL; curr; last = curr, curr = curr->next) {
continue; continue;
} }
@ -391,7 +408,6 @@ RAWINPUT_DelDevice(SDL_RAWINPUT_Device *device, SDL_bool send_event)
SDL_RAWINPUT_Device *curr, *last; SDL_RAWINPUT_Device *curr, *last;
for (curr = SDL_RAWINPUT_devices, last = NULL; curr; last = curr, curr = curr->next) { for (curr = SDL_RAWINPUT_devices, last = NULL; curr; last = curr, curr = curr->next) {
if (curr == device) { if (curr == device) {
SDL_Joystick *joystick;
if (last) { if (last) {
last->next = curr->next; last->next = curr->next;
} else { } else {
@ -399,19 +415,13 @@ RAWINPUT_DelDevice(SDL_RAWINPUT_Device *device, SDL_bool send_event)
} }
--SDL_RAWINPUT_numjoysticks; --SDL_RAWINPUT_numjoysticks;
joystick = device->joystick;
if (joystick) {
/* Detach from joystick */
RAWINPUT_JoystickClose(joystick);
}
/* Calls SDL_PrivateJoystickRemoved() */ /* Calls SDL_PrivateJoystickRemoved() */
HIDAPI_JoystickDisconnected(&device->hiddevice, device->joystick_id, SDL_TRUE); HIDAPI_JoystickDisconnected(&device->hiddevice, device->joystick_id, SDL_TRUE);
#ifdef DEBUG_RAWINPUT #ifdef DEBUG_RAWINPUT
SDL_Log("Removing RAWINPUT device '%s' VID 0x%.4x, PID 0x%.4x, version %d, handle 0x%.8x\n", device->name, device->vendor_id, device->product_id, device->version, device->hDevice); SDL_Log("Removing RAWINPUT device '%s' VID 0x%.4x, PID 0x%.4x, version %d, handle 0x%.8x\n", device->name, device->vendor_id, device->product_id, device->version, device->hDevice);
#endif #endif
SDL_free(device->name); RAWINPUT_ReleaseDevice(device);
SDL_free(device);
return; return;
} }
} }
@ -575,7 +585,6 @@ RAWINPUT_JoystickOpen(SDL_Joystick * joystick, int device_index)
{ {
SDL_RAWINPUT_Device *device = RAWINPUT_GetJoystickByIndex(device_index, NULL); SDL_RAWINPUT_Device *device = RAWINPUT_GetJoystickByIndex(device_index, NULL);
struct joystick_hwdata *hwdata = SDL_callocStruct(struct joystick_hwdata); struct joystick_hwdata *hwdata = SDL_callocStruct(struct joystick_hwdata);
SDL_assert(!device->joystick);
if (!hwdata) { if (!hwdata) {
return SDL_OutOfMemory(); return SDL_OutOfMemory();
@ -587,7 +596,7 @@ RAWINPUT_JoystickOpen(SDL_Joystick * joystick, int device_index)
} }
hwdata->reserved = (void*)-1; /* crash if some code slips by that tries to use this */ hwdata->reserved = (void*)-1; /* crash if some code slips by that tries to use this */
hwdata->device = device; hwdata->device = RAWINPUT_AcquireDevice(device);
device->joystick = joystick; device->joystick = joystick;
joystick->hwdata = hwdata; joystick->hwdata = hwdata;
@ -630,6 +639,7 @@ RAWINPUT_JoystickClose(SDL_Joystick * joystick)
SDL_assert(device->joystick == joystick); SDL_assert(device->joystick == joystick);
device->driver->CloseJoystick(&device->hiddevice, joystick); device->driver->CloseJoystick(&device->hiddevice, joystick);
device->joystick = NULL; device->joystick = NULL;
RAWINPUT_ReleaseDevice(device);
} }
SDL_free(hwdata); SDL_free(hwdata);