mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9772 from DuMOHsmol/xbox_one_bluetooth_fix

Browse Source 
Get rid of 128 byte device name limit for XInput device discover
This commit is contained in:
Twinaphex 2019-11-22 19:50:58 +01:00 committed by GitHub
commit 4aa936ce33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
input/drivers_joypad/dinput_joypad.c
View File

@ -255,9 +255,9 @@ static bool guid_is_xinput_device(const GUID* product_guid)
for (i = 0; i < num_raw_devs; i++) for (i = 0; i < num_raw_devs; i++)
{ {
RID_DEVICE_INFO rdi; RID_DEVICE_INFO rdi;
char devName[128] = {0}; char *devName = NULL;
UINT rdiSize = sizeof(rdi); UINT rdiSize = sizeof(rdi);
UINT nameSize = sizeof(devName); UINT nameSize = 0;
rdi.cbSize = sizeof (rdi); rdi.cbSize = sizeof (rdi);
@ -266,13 +266,20 @@ static bool guid_is_xinput_device(const GUID* product_guid)
RIDI_DEVICEINFO, &rdi, &rdiSize) != ((UINT)-1)) && RIDI_DEVICEINFO, &rdi, &rdiSize) != ((UINT)-1)) &&
(MAKELONG(rdi.hid.dwVendorId, rdi.hid.dwProductId) (MAKELONG(rdi.hid.dwVendorId, rdi.hid.dwProductId)
== ((LONG)product_guid->Data1)) && == ((LONG)product_guid->Data1)) &&
(GetRawInputDeviceInfoA(raw_devs[i].hDevice, RIDI_DEVICENAME, NULL, &nameSize) != ((UINT)-1)) &&
((devName = malloc(nameSize)) != NULL) &&
(GetRawInputDeviceInfoA(raw_devs[i].hDevice, RIDI_DEVICENAME, devName, &nameSize) != ((UINT)-1)) && (GetRawInputDeviceInfoA(raw_devs[i].hDevice, RIDI_DEVICENAME, devName, &nameSize) != ((UINT)-1)) &&
(strstr(devName, "IG_") != NULL) ) (strstr(devName, "IG_") != NULL) )
{ {
free(devName);
free(raw_devs); free(raw_devs);
raw_devs = NULL; raw_devs = NULL;
return true; return true;
} }
if (devName) {
free(devName);
}
} }
free(raw_devs); free(raw_devs);