We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch to remove XINPUT_STATE_EX

sdl_xinput.diff (text/plain), 5.11 KB, created by Andrew Eikum on 2018-01-16 14:47:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Eikum

Created: 2018-01-16 14:47:50 UTC

Size: 5.11 KB

patch

obsolete

>diff -r 43bba409e6d2 CMakeLists.txt
>--- a/CMakeLists.txt	Sun Jan 07 22:00:37 2018 -0400
>+++ b/CMakeLists.txt	Tue Jan 16 08:40:53 2018 -0600
>@@ -1163,16 +1163,6 @@
>         #include <windows.h>
>         #include <xinput.h>
>         int main(int argc, char **argv) { }" HAVE_XINPUT_H)
>-      check_c_source_compiles("
>-        #include <windows.h>
>-        #include <xinput.h>
>-        XINPUT_GAMEPAD_EX x1;
>-        int main(int argc, char **argv) { }" HAVE_XINPUT_GAMEPAD_EX)
>-      check_c_source_compiles("
>-        #include <windows.h>
>-        #include <xinput.h>
>-        XINPUT_STATE_EX s1;
>-        int main(int argc, char **argv) { }" HAVE_XINPUT_STATE_EX)
>     else()
>       check_include_file(xinput.h HAVE_XINPUT_H)
>     endif()
>diff -r 43bba409e6d2 configure.in
>--- a/configure.in	Sun Jan 07 22:00:37 2018 -0400
>+++ b/configure.in	Tue Jan 16 08:40:53 2018 -0600
>@@ -3021,16 +3021,6 @@
>         AC_CHECK_HEADER(xinput.h, have_xinput=yes)
>         AC_CHECK_HEADER(mmdeviceapi.h, have_wasapi=yes)
>         AC_CHECK_HEADER(audioclient.h,,have_wasapi=no)
>-        AC_TRY_COMPILE([
>-#include <windows.h>
>-#include <xinput.h>
>-XINPUT_GAMEPAD_EX x1;
>-        ],[],[have_xinput_gamepadex=yes])
>-        AC_TRY_COMPILE([
>-#include <windows.h>
>-#include <xinput.h>
>-XINPUT_STATE_EX s1;
>-        ],[],[have_xinput_stateex=yes])
> 
>         if test x$have_ddraw = xyes; then
>             AC_DEFINE(HAVE_DDRAW_H, 1, [ ])
>@@ -3047,12 +3037,6 @@
>         if test x$have_xinput = xyes; then
>             AC_DEFINE(HAVE_XINPUT_H, 1, [ ])
>         fi
>-        if test x$have_xinput_gamepadex = xyes; then
>-            AC_DEFINE(HAVE_XINPUT_GAMEPAD_EX, 1, [ ])
>-        fi
>-        if test x$have_xinput_stateex = xyes; then
>-            AC_DEFINE(HAVE_XINPUT_STATE_EX, 1, [ ])
>-        fi
> 
>         SUMMARY_video="${SUMMARY_video} directx"
>         SUMMARY_audio="${SUMMARY_audio} directx"
>diff -r 43bba409e6d2 include/SDL_config.h.cmake
>--- a/include/SDL_config.h.cmake	Sun Jan 07 22:00:37 2018 -0400
>+++ b/include/SDL_config.h.cmake	Tue Jan 16 08:40:53 2018 -0600
>@@ -205,8 +205,6 @@
> #cmakedefine HAVE_DINPUT_H @HAVE_DINPUT_H@
> #cmakedefine HAVE_XINPUT_H @HAVE_XINPUT_H@
> #cmakedefine HAVE_DXGI_H @HAVE_DXGI_H@
>-#cmakedefine HAVE_XINPUT_GAMEPAD_EX @HAVE_XINPUT_GAMEPAD_EX@
>-#cmakedefine HAVE_XINPUT_STATE_EX @HAVE_XINPUT_STATE_EX@
> 
> /* SDL internal assertion support */
> #cmakedefine SDL_DEFAULT_ASSERT_LEVEL @SDL_DEFAULT_ASSERT_LEVEL@
>diff -r 43bba409e6d2 include/SDL_config.h.in
>--- a/include/SDL_config.h.in	Sun Jan 07 22:00:37 2018 -0400
>+++ b/include/SDL_config.h.in	Tue Jan 16 08:40:53 2018 -0600
>@@ -205,8 +205,6 @@
> #undef HAVE_DSOUND_H
> #undef HAVE_DXGI_H
> #undef HAVE_XINPUT_H
>-#undef HAVE_XINPUT_GAMEPAD_EX
>-#undef HAVE_XINPUT_STATE_EX
> 
> /* SDL internal assertion support */
> #undef SDL_DEFAULT_ASSERT_LEVEL
>diff -r 43bba409e6d2 src/core/windows/SDL_xinput.h
>--- a/src/core/windows/SDL_xinput.h	Sun Jan 07 22:00:37 2018 -0400
>+++ b/src/core/windows/SDL_xinput.h	Tue Jan 16 08:40:53 2018 -0600
>@@ -101,28 +101,6 @@
> 
> /* 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
>-
> typedef struct
> {
>     BYTE BatteryType;
>@@ -133,7 +111,7 @@
> 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)
>diff -r 43bba409e6d2 src/joystick/windows/SDL_xinputjoystick.c
>--- a/src/joystick/windows/SDL_xinputjoystick.c	Sun Jan 07 22:00:37 2018 -0400
>+++ b/src/joystick/windows/SDL_xinputjoystick.c	Tue Jan 16 08:40:53 2018 -0600
>@@ -344,7 +344,7 @@
> }
> 
> static void
>-UpdateXInputJoystickState_OLD(SDL_Joystick * joystick, XINPUT_STATE_EX *pXInputState, XINPUT_BATTERY_INFORMATION_EX *pBatteryInformation)
>+UpdateXInputJoystickState_OLD(SDL_Joystick * joystick, XINPUT_STATE *pXInputState, XINPUT_BATTERY_INFORMATION_EX *pBatteryInformation)
> {
>     static WORD s_XInputButtons[] = {
>         XINPUT_GAMEPAD_DPAD_UP, XINPUT_GAMEPAD_DPAD_DOWN, XINPUT_GAMEPAD_DPAD_LEFT, XINPUT_GAMEPAD_DPAD_RIGHT,
>@@ -371,7 +371,7 @@
> }
> 
> static void
>-UpdateXInputJoystickState(SDL_Joystick * joystick, XINPUT_STATE_EX *pXInputState, XINPUT_BATTERY_INFORMATION_EX *pBatteryInformation)
>+UpdateXInputJoystickState(SDL_Joystick * joystick, XINPUT_STATE *pXInputState, XINPUT_BATTERY_INFORMATION_EX *pBatteryInformation)
> {
>     static WORD s_XInputButtons[] = {
>         XINPUT_GAMEPAD_A, XINPUT_GAMEPAD_B, XINPUT_GAMEPAD_X, XINPUT_GAMEPAD_Y,
>@@ -415,7 +415,7 @@
> SDL_XINPUT_JoystickUpdate(SDL_Joystick * joystick)
> {
>     HRESULT result;
>-    XINPUT_STATE_EX XInputState;
>+    XINPUT_STATE XInputState;
>     XINPUT_BATTERY_INFORMATION_EX XBatteryInformation;
> 
>     if (!XINPUTGETSTATE)

Actions: View | Diff

Attachments on bug 4048: 3141

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.