ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xinput1_3: Implement XInputGetState using XInputGetStateEx. 

Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Bruno Jesus 2016-08-31 15:17:45 -03:00 committed by Alexandre Julliard
parent 0fe758046d
commit 44cd385af3
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/xinput1_3/xinput1_3_main.c
View File

@ -29,6 +29,9 @@
#include "xinput.h" #include "xinput.h"
/* Not defined in the headers, used only by XInputGetStateEx */
#define XINPUT_GAMEPAD_GUIDE 0x0400
WINE_DEFAULT_DEBUG_CHANNEL(xinput); WINE_DEFAULT_DEBUG_CHANNEL(xinput);
struct struct
@ -72,17 +75,26 @@ DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration)
DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) 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; static int warn_once;
if (!warn_once++) if (!warn_once++)
FIXME("(index %u, state %p) Stub!\n", index, state); FIXME("(index %u, state %p) Stub!\n", index, state);
if (index >= XUSER_MAX_COUNT) ret = XInputGetStateEx(index, &xinput.state_ex);
return ERROR_BAD_ARGUMENTS; if (ret != ERROR_SUCCESS)
if (!controllers[index].connected) return ret;
return ERROR_DEVICE_NOT_CONNECTED;
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) DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE_EX* state_ex)