pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed building with mingw32

Browse source
This commit is contained in:
Sam Lantinga 2017-01-18 11:57:27 -08:00
parent adb1d6888f
commit 101fc7428b
3 changed files with 59 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/joystick/windows/SDL_mmjoystick.c
View file

@ -85,7 +85,12 @@ GetJoystickName(int index, const char *szRegKey)
char regvalue[256];
char regname[256];
SDL_snprintf(regkey, SDL_arraysize(regkey), "%s\\%s\\%s",
SDL_snprintf(regkey, SDL_arraysize(regkey),
#ifdef UNICODE
"%S\\%s\\%S",
#else
"%s\\%s\\%s",
#endif
REGSTR_PATH_JOYCONFIG, szRegKey, REGSTR_KEY_JOYCURR);
hTopKey = HKEY_LOCAL_MACHINE;
regresult = RegOpenKeyExA(hTopKey, regkey, 0, KEY_READ, &hKey);
@ -110,8 +115,13 @@ GetJoystickName(int index, const char *szRegKey)
}
/* open that registry key */
SDL_snprintf(regkey, SDL_arraysize(regkey), "%s\\%s", REGSTR_PATH_JOYOEM,
regname);
SDL_snprintf(regkey, SDL_arraysize(regkey),
#ifdef UNICODE
"%S\\%s",
#else
"%s\\%s",
#endif
REGSTR_PATH_JOYOEM, regname);
regresult = RegOpenKeyExA(hTopKey, regkey, 0, KEY_READ, &hKey);
if (regresult != ERROR_SUCCESS) {
return NULL;
@ -313,7 +323,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
};
DWORD pos[MAX_AXES];
struct _transaxis *transaxis;
int value, change;
int value;
JOYINFOEX joyinfo;
joyinfo.dwSize = sizeof(joyinfo);