eden-emu/SDL
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SDL_XINPUT_Enabled() returns false until XInput DLL is successfully loaded

Browse source 
We make sure we initialize XInput first, so that anything checking whether it's enabled gets a valid result based on whether we were able to load it or not.
This commit is contained in:
Sam Lantinga 2024-09-06 11:19:19 -07:00
parent 6da97c63da
commit 8f46cb771c
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/joystick/SDL_joystick.c
View file

@ -61,7 +61,7 @@ static SDL_JoystickDriver *SDL_joystick_drivers[] = {
#if defined(SDL_JOYSTICK_DINPUT) || defined(SDL_JOYSTICK_XINPUT) #if defined(SDL_JOYSTICK_DINPUT) || defined(SDL_JOYSTICK_XINPUT)
&SDL_WINDOWS_JoystickDriver, &SDL_WINDOWS_JoystickDriver,
#endif #endif
#ifdef SDL_JOYSTICK_WGI #ifdef SDL_JOYSTICK_WGI // Lower priority than other Windows drivers
&SDL_WGI_JoystickDriver, &SDL_WGI_JoystickDriver,
#endif #endif
#ifdef SDL_JOYSTICK_WINMM #ifdef SDL_JOYSTICK_WINMM

7
src/joystick/windows/SDL_windowsjoystick.c
View file

@ -241,7 +241,7 @@ static int SDLCALL SDL_JoystickThread(void *_data)
#ifdef SDL_JOYSTICK_XINPUT #ifdef SDL_JOYSTICK_XINPUT
// WM_DEVICECHANGE not working, poll for new XINPUT controllers // WM_DEVICECHANGE not working, poll for new XINPUT controllers
SDL_WaitConditionTimeout(s_condJoystickThread, s_mutexJoyStickEnum, 1000); SDL_WaitConditionTimeout(s_condJoystickThread, s_mutexJoyStickEnum, 1000);
if (SDL_XINPUT_Enabled() && XINPUTGETCAPABILITIES) { if (SDL_XINPUT_Enabled()) {
// scan for any change in XInput devices // scan for any change in XInput devices
Uint8 userId; Uint8 userId;
for (userId = 0; userId < XUSER_MAX_COUNT; userId++) { for (userId = 0; userId < XUSER_MAX_COUNT; userId++) {
@ -329,15 +329,14 @@ void WINDOWS_AddJoystickDevice(JoyStick_DeviceData *device)
void WINDOWS_JoystickDetect(void); void WINDOWS_JoystickDetect(void);
void WINDOWS_JoystickQuit(void); void WINDOWS_JoystickQuit(void);
// Function to scan the system for joysticks.
static bool WINDOWS_JoystickInit(void) static bool WINDOWS_JoystickInit(void)
{ {
if (!SDL_DINPUT_JoystickInit()) { if (!SDL_XINPUT_JoystickInit()) {
WINDOWS_JoystickQuit(); WINDOWS_JoystickQuit();
return false; return false;
} }
if (!SDL_XINPUT_JoystickInit()) { if (!SDL_DINPUT_JoystickInit()) {
WINDOWS_JoystickQuit(); WINDOWS_JoystickQuit();
return false; return false;
} }

2
src/joystick/windows/SDL_xinputjoystick.c
View file

@ -37,7 +37,7 @@ extern "C" {
/* /*
* Internal stuff. * Internal stuff.
*/ */
static bool s_bXInputEnabled = true; static bool s_bXInputEnabled = false;
bool SDL_XINPUT_Enabled(void) bool SDL_XINPUT_Enabled(void)
{ {