[PATCH 2/3] xinput1_3/tests: Dump the gamepad values from XInputGetCapabilities
Bruno Jesus
00cpxxx at gmail.com
Tue Dec 6 08:52:33 CST 2016
Important to show that they changed between XInput versions 1.3 and 1.4.
Signed-off-by: Bruno Jesus <00cpxxx at gmail.com>
---
dlls/xinput1_3/tests/xinput.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c
index 25126be..a9ef543 100644
--- a/dlls/xinput1_3/tests/xinput.c
+++ b/dlls/xinput1_3/tests/xinput.c
@@ -32,6 +32,18 @@ static DWORD (WINAPI *pXInputGetKeystroke)(DWORD, DWORD, PXINPUT_KEYSTROKE);
static DWORD (WINAPI *pXInputGetDSoundAudioDeviceGuids)(DWORD, GUID*, GUID*);
static DWORD (WINAPI *pXInputGetBatteryInformation)(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*);
+void dump_gamepad(XINPUT_GAMEPAD *data)
+{
+ trace("-- Gamepad Variables --\n");
+ trace("Gamepad.wButtons: %#x\n", data->wButtons);
+ trace("Gamepad.bLeftTrigger: %d\n", data->bLeftTrigger);
+ trace("Gamepad.bRightTrigger: %d\n", data->bRightTrigger);
+ trace("Gamepad.sThumbLX: %d\n", data->sThumbLX);
+ trace("Gamepad.sThumbLY: %d\n", data->sThumbLY);
+ trace("Gamepad.sThumbRX: %d\n", data->sThumbRX);
+ trace("Gamepad.sThumbRY: %d\n\n", data->sThumbRY);
+}
+
static void test_set_state(void)
{
XINPUT_VIBRATION vibrator;
@@ -96,14 +108,7 @@ static void test_get_state(void)
else
trace("XInputGetStateEx: %d\n", result);
trace("State->dwPacketNumber: %d\n", xinput.state.dwPacketNumber);
- trace("Gamepad Variables --\n");
- trace("Gamepad.wButtons: %#x\n", xinput.state.Gamepad.wButtons);
- trace("Gamepad.bLeftTrigger: 0x%08x\n", xinput.state.Gamepad.bLeftTrigger);
- trace("Gamepad.bRightTrigger: 0x%08x\n", xinput.state.Gamepad.bRightTrigger);
- trace("Gamepad.sThumbLX: %d\n", xinput.state.Gamepad.sThumbLX);
- trace("Gamepad.sThumbLY: %d\n", xinput.state.Gamepad.sThumbLY);
- trace("Gamepad.sThumbRX: %d\n", xinput.state.Gamepad.sThumbRX);
- trace("Gamepad.sThumbRY: %d\n", xinput.state.Gamepad.sThumbRY);
+ dump_gamepad(&xinput.state.Gamepad);
}
}
@@ -163,7 +168,11 @@ static void test_get_capabilities(void)
if (ERROR_DEVICE_NOT_CONNECTED == result)
{
skip("Controller %d is not connected\n", controllerNum);
+ continue;
}
+
+ /* Important to show that the results changed between 1.3 and 1.4 XInput version */
+ dump_gamepad(&capabilities.Gamepad);
}
ZeroMemory(&capabilities, sizeof(XINPUT_CAPABILITIES));
--
2.9.3
More information about the wine-patches
mailing list