geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure we match the same way when adding a mapping and looking up a mapping 

Fixes https://github.com/libsdl-org/SDL/issues/6898
main
Sam Lantinga 2022-12-27 12:14:43 -08:00
parent 04f2820e07
commit 3db9112ef4
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/joystick/SDL_gamepad.c
View File

@ -754,10 +754,13 @@ static ControllerMapping_t *SDL_PrivateMatchControllerMappingForGUID(SDL_Joystic
if (SDL_memcmp(&guid, &mapping_guid, sizeof(guid)) == 0) { if (SDL_memcmp(&guid, &mapping_guid, sizeof(guid)) == 0) {
Uint16 mapping_crc = 0; Uint16 mapping_crc = 0;
if (match_crc) {
const char *crc_string = SDL_strstr(mapping->mapping, SDL_GAMEPAD_CRC_FIELD); const char *crc_string = SDL_strstr(mapping->mapping, SDL_GAMEPAD_CRC_FIELD);
if (crc_string) { if (crc_string) {
mapping_crc = (Uint16)SDL_strtol(crc_string + SDL_GAMEPAD_CRC_FIELD_SIZE, NULL, 16); mapping_crc = (Uint16)SDL_strtol(crc_string + SDL_GAMEPAD_CRC_FIELD_SIZE, NULL, 16);
} }
}
if (crc == mapping_crc) { if (crc == mapping_crc) {
return mapping; return mapping;
} }
@ -769,7 +772,7 @@ static ControllerMapping_t *SDL_PrivateMatchControllerMappingForGUID(SDL_Joystic
/* /*
* Helper function to scan the mappings database for a gamepad with the specified GUID * Helper function to scan the mappings database for a gamepad with the specified GUID
*/ */
static ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickGUID guid) static ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickGUID guid, SDL_bool create_mapping)
{ {
ControllerMapping_t *mapping; ControllerMapping_t *mapping;
Uint16 vendor, product, crc; Uint16 vendor, product, crc;
@ -804,6 +807,10 @@ static ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickG
} }
} }
if (!create_mapping) {
return NULL;
}
#if SDL_JOYSTICK_XINPUT #if SDL_JOYSTICK_XINPUT
if (SDL_IsJoystickXInput(guid)) { if (SDL_IsJoystickXInput(guid)) {
/* This is an XInput device */ /* This is an XInput device */
@ -1274,7 +1281,7 @@ static ControllerMapping_t *SDL_PrivateAddMappingForGUID(SDL_JoystickGUID jGUID,
} }
} }
pControllerMapping = SDL_PrivateMatchControllerMappingForGUID(jGUID, SDL_TRUE, SDL_TRUE); pControllerMapping = SDL_PrivateGetControllerMappingForGUID(jGUID, SDL_FALSE);
if (pControllerMapping) { if (pControllerMapping) {
/* Only overwrite the mapping if the priority is the same or higher. */ /* Only overwrite the mapping if the priority is the same or higher. */
if (pControllerMapping->priority <= priority) { if (pControllerMapping->priority <= priority) {
@ -1336,7 +1343,7 @@ static ControllerMapping_t *SDL_PrivateGetControllerMappingForNameAndGUID(const
SDL_AssertJoysticksLocked(); SDL_AssertJoysticksLocked();
mapping = SDL_PrivateGetControllerMappingForGUID(guid); mapping = SDL_PrivateGetControllerMappingForGUID(guid, SDL_TRUE);
#ifdef __LINUX__ #ifdef __LINUX__
if (mapping == NULL && name) { if (mapping == NULL && name) {
if (SDL_strstr(name, "Xbox 360 Wireless Receiver")) { if (SDL_strstr(name, "Xbox 360 Wireless Receiver")) {
@ -1773,7 +1780,7 @@ char *SDL_GetGamepadMappingForGUID(SDL_JoystickGUID guid)
SDL_LockJoysticks(); SDL_LockJoysticks();
{ {
ControllerMapping_t *mapping = SDL_PrivateGetControllerMappingForGUID(guid); ControllerMapping_t *mapping = SDL_PrivateGetControllerMappingForGUID(guid, SDL_TRUE);
if (mapping) { if (mapping) {
retval = CreateMappingString(mapping, guid); retval = CreateMappingString(mapping, guid);
} else { } else {