Andrew Fenn : xinput: Added the function XInputGetState with test case.

[Alexandre Julliard]

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

Author: Andrew Fenn <andrewfenn(a)gmail.com>
Date:   Mon Nov 10 16:32:33 2008 +0000

xinput: Added the function XInputGetState with test case.

---

 configure                        |    9 ++++
 configure.ac                     |    1 +
 dlls/xinput1_3/tests/Makefile.in |   13 ++++++
 dlls/xinput1_3/tests/xinput.c    |   81 ++++++++++++++++++++++++++++++++++++++
 dlls/xinput1_3/xinput1_3.spec    |    2 +-
 dlls/xinput1_3/xinput1_3_main.c  |   14 +++++++
 6 files changed, 119 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 316e9cf..9c677ee 100755
--- a/configure
+++ b/configure
@@ -26858,6 +26858,14 @@ dlls/xinput1_3/Makefile: dlls/xinput1_3/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/xinput1_3/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
+	dlls/xinput1_3/tests/Makefile"
+test "x$enable_xinput1_3_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\
+	xinput1_3/tests"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/xinput1_3/tests/Makefile: dlls/xinput1_3/tests/Makefile.in dlls/Maketest.rules"
+ac_config_files="$ac_config_files dlls/xinput1_3/tests/Makefile"
+
+ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/xinput9_1_0/Makefile"
 test "x$enable_xinput9_1_0" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	xinput9_1_0"
@@ -28400,6 +28408,7 @@ do
     "dlls/xinput1_1/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_1/Makefile" ;;
     "dlls/xinput1_2/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_2/Makefile" ;;
     "dlls/xinput1_3/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/Makefile" ;;
+    "dlls/xinput1_3/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput1_3/tests/Makefile" ;;
     "dlls/xinput9_1_0/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/xinput9_1_0/Makefile" ;;
     "documentation/Makefile") CONFIG_FILES="$CONFIG_FILES documentation/Makefile" ;;
     "fonts/Makefile") CONFIG_FILES="$CONFIG_FILES fonts/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index ed61fbe..00f2ddb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2097,6 +2097,7 @@ WINE_CONFIG_MAKEFILE([dlls/wtsapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D
 WINE_CONFIG_MAKEFILE([dlls/xinput1_1/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/xinput1_2/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/xinput1_3/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/xinput1_3/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/xinput9_1_0/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([documentation/Makefile],[Make.rules],[],[ALL_TOP_DIRS])
 WINE_CONFIG_MAKEFILE([fonts/Makefile],[Make.rules],[],[ALL_TOP_DIRS])
diff --git a/dlls/xinput1_3/tests/Makefile.in b/dlls/xinput1_3/tests/Makefile.in
new file mode 100644
index 0000000..e38b858
--- /dev/null
+++ b/dlls/xinput1_3/tests/Makefile.in
@@ -0,0 +1,13 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+TESTDLL   = xinput1_3.dll
+IMPORTS   = user32 kernel32
+
+CTESTS = \
+	xinput.c
+
+(a)MAKE_TEST_RULES@
+
+(a)DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c
new file mode 100644
index 0000000..2cdc168
--- /dev/null
+++ b/dlls/xinput1_3/tests/xinput.c
@@ -0,0 +1,81 @@
+/*
+ * The Wine project - Xinput Joystick Library
+ * Copyright 2008 Andrew Fenn
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <windows.h>
+#include <stdio.h>
+
+#include "xinput.h"
+#include "wine/test.h"
+
+static DWORD (WINAPI *pXInputGetState)(DWORD, XINPUT_STATE*);
+
+static void test_get_state(void)
+{
+
+    XINPUT_STATE controllerState;
+    DWORD controllerNum;
+    DWORD result;
+
+    for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++)
+    {
+        ZeroMemory(&controllerState, sizeof(XINPUT_STATE));
+
+        result = pXInputGetState(controllerNum, &controllerState);
+        ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputGetState failed with (%d)\n", result);
+
+        if (ERROR_DEVICE_NOT_CONNECTED == result)
+        {
+            skip("Controller %d is not connected\n", controllerNum);
+        }
+        else
+        {
+            trace("-- Results for controller %d --\n", controllerNum);
+            trace("XInputGetState: %d\n", result);
+            trace("State->dwPacketNumber: %d\n", controllerState.dwPacketNumber);
+            trace("Gamepad Variables --\n");
+            trace("Gamepad.wButtons: %#x\n", controllerState.Gamepad.wButtons);
+            trace("Gamepad.bLeftTrigger: 0x%08x\n", controllerState.Gamepad.bLeftTrigger);
+            trace("Gamepad.bRightTrigger: 0x%08x\n", controllerState.Gamepad.bRightTrigger);
+            trace("Gamepad.sThumbLX: %d\n", controllerState.Gamepad.sThumbLX);
+            trace("Gamepad.sThumbLY: %d\n", controllerState.Gamepad.sThumbLY);
+            trace("Gamepad.sThumbRX: %d\n", controllerState.Gamepad.sThumbRX);
+            trace("Gamepad.sThumbRY: %d\n", controllerState.Gamepad.sThumbRY);
+        }
+    }
+
+    ZeroMemory(&controllerState, sizeof(XINPUT_STATE));
+    result = pXInputGetState(XUSER_MAX_COUNT+1, &controllerState);
+    ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result);
+}
+
+START_TEST(xinput)
+{
+    HMODULE hXinput;
+    hXinput = LoadLibraryA( "xinput1_3.dll" );
+
+    if (hXinput)
+    {
+        pXInputGetState = (void*)GetProcAddress(hXinput, "XInputGetState");
+        test_get_state();
+    }
+    else
+    {
+        skip("Could not load xinput1_3.dll\n");
+    }
+}
diff --git a/dlls/xinput1_3/xinput1_3.spec b/dlls/xinput1_3/xinput1_3.spec
index 5caaa37..8fb6353 100644
--- a/dlls/xinput1_3/xinput1_3.spec
+++ b/dlls/xinput1_3/xinput1_3.spec
@@ -1,6 +1,6 @@
 @ stub XInputEnable #(long)
 @ stub XInputSetState #(long ptr)
-@ stub XInputGetState #(long ptr)
+@ stdcall XInputGetState(long ptr)
 @ stub XInputGetKeystroke #(long long ptr)
 @ stub XInputGetCapabilities #(long long ptr)
 @ stub XInputGetDSoundAudioDeviceGuids #(long ptr ptr)
diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c
index 6198b3b..f2b6500 100644
--- a/dlls/xinput1_3/xinput1_3_main.c
+++ b/dlls/xinput1_3/xinput1_3_main.c
@@ -27,6 +27,8 @@
 #include "winbase.h"
 #include "winerror.h"
 
+#include "xinput.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(xinput);
 
 BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
@@ -43,3 +45,15 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved)
     }
     return TRUE;
 }
+
+DWORD WINAPI XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState)
+{
+    FIXME("(%u %p)\n", dwUserIndex, pState);
+
+    if (dwUserIndex < XUSER_MAX_COUNT)
+    {
+        return ERROR_DEVICE_NOT_CONNECTED;
+        /* If controller exists then return ERROR_SUCCESS */
+    }
+    return ERROR_BAD_ARGUMENTS;
+}