| Summary: | SDL incorrectly reports Joystick Device names. | ||
|---|---|---|---|
| Product: | SDL | Reporter: | Daniel Broschart <danpub> |
| Component: | joystick | Assignee: | Ryan C. Gordon <icculus> |
| Status: | RESOLVED FIXED | QA Contact: | Sam Lantinga <slouken> |
| Severity: | normal | ||
| Priority: | P2 | CC: | danpub, max |
| Version: | 1.2.9 | ||
| Hardware: | x86 | ||
| OS: | Windows (XP) | ||
| Attachments: | Patch for src/joystick/win32/SDL_mmjoystick.c | ||
|
Description
Daniel Broschart
2006-03-29 14:22:54 UTC
Created attachment 106 [details] Patch for src/joystick/win32/SDL_mmjoystick.c I am not even a Windows user, so take the following with a grain of salt: SDL_mmjoystick.c has a function GetJoystickName which obtains the joystick name by looking at the registry. The way it does that seems very fishy to me. Namely, it uses the parameter "index" to construct a registry value name (BTW, those variables used in the code are really badly named). The value of "index" in turn equals the current value of "numdevs", as called from SDL_SYS_JoystickInit. I read through the MSDN docs at <http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/dnarinput/html/msdn_extdirect.asp>, and I believe the simple fix is to replace line 183 of said file SYS_JoystickName[numdevs] = GetJoystickName(numdevs, joycaps.szRegKey); by the following: SYS_JoystickName[numdevs] = GetJoystickName(SYS_JoystickID[i], joycaps.szRegKey); However, that is only *hiding* the real issue. Problem is, the list of joysticks as returned by windows may contains "gaps", and the code deals incorrectly with that. Namely those gaps occur if joysticks are removed/(re)added, as the reporter observed. The attached patch fixes this and another (off-by-one) issue in the code. But since I have no Windows machine, I can't even test-compile it, so use with caution. Yes, that patch does indeed work on my Windows XP system. It does? Wow, cool. I didn't expect it to even compile :-). Ryan, Sam, any chance this could get checked in then? Possibly after some more testing / review by somebody who actual knows something about coding for Windows :-). Looks good, thanks Max! |