Bruno Jesus : xinput1_3: Implement XInputGetState using XInputGetStateEx.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 44cd385af30ae8a0811d1af8764ef2f3a8f2d34e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=44cd385af30ae8a0811d1af8764ef2f3a8f2d34e

Author: Bruno Jesus <00cpxxx at gmail.com>
Date:   Wed Aug 31 15:17:45 2016 -0300

xinput1_3: Implement XInputGetState using XInputGetStateEx.

Signed-off-by: Bruno Jesus <00cpxxx at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/xinput1_3/xinput1_3_main.c | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c
index 227ab7a..04732eb 100644
--- a/dlls/xinput1_3/xinput1_3_main.c
+++ b/dlls/xinput1_3/xinput1_3_main.c
@@ -29,6 +29,9 @@
 
 #include "xinput.h"
 
+/* Not defined in the headers, used only by XInputGetStateEx */
+#define XINPUT_GAMEPAD_GUIDE 0x0400
+
 WINE_DEFAULT_DEBUG_CHANNEL(xinput);
 
 struct
@@ -72,17 +75,26 @@ DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration)
 
 DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state)
 {
+    union
+    {
+        XINPUT_STATE state;
+        XINPUT_STATE_EX state_ex;
+    } xinput;
+    DWORD ret;
     static int warn_once;
 
     if (!warn_once++)
         FIXME("(index %u, state %p) Stub!\n", index, state);
 
-    if (index >= XUSER_MAX_COUNT)
-        return ERROR_BAD_ARGUMENTS;
-    if (!controllers[index].connected)
-        return ERROR_DEVICE_NOT_CONNECTED;
+    ret = XInputGetStateEx(index, &xinput.state_ex);
+    if (ret != ERROR_SUCCESS)
+        return ret;
 
-    return ERROR_NOT_SUPPORTED;
+    /* The main difference between this and the Ex version is the media guide button */
+    xinput.state.Gamepad.wButtons &= ~XINPUT_GAMEPAD_GUIDE;
+    *state = xinput.state;
+
+    return ERROR_SUCCESS;
 }
 
 DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE_EX* state_ex)