Andrew Eikum : winebus.sys: Report SDL controller buttons in the right order.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ba79a14369e52f7e932211288bde0a487155b439
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ba79a14369e52f7e932211288...

Author: Andrew Eikum <aeikum(a)codeweavers.com>
Date:   Tue May  7 09:01:57 2019 -0500

winebus.sys: Report SDL controller buttons in the right order.

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/winebus.sys/bus_sdl.c | 8 ++++----
 dlls/xinput1_3/hid.c       | 9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c
index 8ff8373..59c1698 100644
--- a/dlls/winebus.sys/bus_sdl.c
+++ b/dlls/winebus.sys/bus_sdl.c
@@ -808,10 +808,10 @@ static BOOL set_mapped_report_from_event(SDL_Event *event)
                 case SDL_CONTROLLER_BUTTON_Y: usage = 3; break;
                 case SDL_CONTROLLER_BUTTON_LEFTSHOULDER: usage = 4; break;
                 case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: usage = 5; break;
-                case SDL_CONTROLLER_BUTTON_LEFTSTICK: usage = 6; break;
-                case SDL_CONTROLLER_BUTTON_RIGHTSTICK: usage = 7; break;
-                case SDL_CONTROLLER_BUTTON_START: usage = 8; break;
-                case SDL_CONTROLLER_BUTTON_BACK: usage = 9; break;
+                case SDL_CONTROLLER_BUTTON_BACK: usage = 6; break;
+                case SDL_CONTROLLER_BUTTON_START: usage = 7; break;
+                case SDL_CONTROLLER_BUTTON_LEFTSTICK: usage = 8; break;
+                case SDL_CONTROLLER_BUTTON_RIGHTSTICK: usage = 9; break;
                 case SDL_CONTROLLER_BUTTON_GUIDE: usage = 10; break;
 
                 case SDL_CONTROLLER_BUTTON_DPAD_UP:
diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c
index f0036b1..34e4e51 100644
--- a/dlls/xinput1_3/hid.c
+++ b/dlls/xinput1_3/hid.c
@@ -375,11 +375,10 @@ void HID_update_state(xinput_controller* device)
             case 4: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_Y; break;
             case 5: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_SHOULDER; break;
             case 6: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_SHOULDER; break;
-            case 7: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_THUMB; break;
-            case 8: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_THUMB; break;
-
-            case 9: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break;
-            case 10: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break;
+            case 7: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break;
+            case 8: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break;
+            case 9: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_THUMB; break;
+            case 10: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_THUMB; break;
             case 11: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_GUIDE; break;
         }
     }