mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-04-21 23:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use XINPUT_STATE instead of XINPUT_STATE_EX (thanks Andrew!)

Browse Source 
XINPUT_STATE_EX isn't actually a thing, we can just use the normal XINPUT_STATE

Fixes https://github.com/libsdl-org/SDL/issues/2797

(cherry picked from commit e8f4045d0b)
This commit is contained in:
Sam Lantinga
2023-11-04 22:24:55 -07:00
parent 3a482ebae0
commit d3f2eb2aba
5 changed files with 12 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/core/windows/SDL_xinput.h
View File

@@ -163,28 +163,8 @@ extern "C" {
/* typedef's for XInput structs we use */
#ifndef HAVE_XINPUT_GAMEPAD_EX
typedef struct
{
WORD wButtons;
BYTE bLeftTrigger;
BYTE bRightTrigger;
SHORT sThumbLX;
SHORT sThumbLY;
SHORT sThumbRX;
SHORT sThumbRY;
DWORD dwPaddingReserved;
} XINPUT_GAMEPAD_EX;
#endif
#ifndef HAVE_XINPUT_STATE_EX
typedef struct
{
DWORD dwPacketNumber;
XINPUT_GAMEPAD_EX Gamepad;
} XINPUT_STATE_EX;
#endif
/* This is the same as XINPUT_BATTERY_INFORMATION, but always defined instead of just if WIN32_WINNT >= _WIN32_WINNT_WIN8 */
typedef struct
{
BYTE BatteryType;
@@ -204,6 +184,12 @@ typedef struct
SHORT sThumbRY;
} XINPUT_GAMEPAD;
typedef struct
{
DWORD dwPacketNumber;
XINPUT_GAMEPAD Gamepad;
} XINPUT_STATE;
typedef struct
{
WORD wLeftMotorSpeed;
@@ -224,7 +210,7 @@ typedef struct
/* Forward decl's for XInput API's we load dynamically and use if available */
typedef DWORD(WINAPI *XInputGetState_t)(
DWORD dwUserIndex, /* [in] Index of the gamer associated with the device */
XINPUT_STATE_EX *pState /* [out] Receives the current state */
XINPUT_STATE *pState /* [out] Receives the current state */
);
typedef DWORD(WINAPI *XInputSetState_t)(