Andrew Fenn : xinput: Added XInputGetCapabilities function with test case.

[Alexandre Julliard]

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

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

xinput: Added XInputGetCapabilities function with test case.

---

 dlls/xinput1_3/tests/xinput.c   |   27 +++++++++++++++++++++++++++
 dlls/xinput1_3/xinput1_3.spec   |    2 +-
 dlls/xinput1_3/xinput1_3_main.c |   12 ++++++++++++
 3 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c
index 2cdc168..ffc0d33 100644
--- a/dlls/xinput1_3/tests/xinput.c
+++ b/dlls/xinput1_3/tests/xinput.c
@@ -24,6 +24,7 @@
 #include "wine/test.h"
 
 static DWORD (WINAPI *pXInputGetState)(DWORD, XINPUT_STATE*);
+static DWORD (WINAPI *pXInputGetCapabilities)(DWORD,DWORD,XINPUT_CAPABILITIES*);
 
 static void test_get_state(void)
 {
@@ -64,6 +65,30 @@ static void test_get_state(void)
     ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result);
 }
 
+static void test_get_capabilities(void)
+{
+    XINPUT_CAPABILITIES capabilities;
+    DWORD controllerNum;
+    DWORD result;
+
+    for(controllerNum=0; controllerNum < XUSER_MAX_COUNT; controllerNum++)
+    {
+        ZeroMemory(&capabilities, sizeof(XINPUT_CAPABILITIES));
+
+        result = pXInputGetCapabilities(controllerNum, XINPUT_FLAG_GAMEPAD, &capabilities);
+        ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "XInputGetCapabilities failed with (%d)\n", result);
+
+        if (ERROR_DEVICE_NOT_CONNECTED == result)
+        {
+            skip("Controller %d is not connected\n", controllerNum);
+        }
+    }
+
+    ZeroMemory(&capabilities, sizeof(XINPUT_CAPABILITIES));
+    result = pXInputGetCapabilities(XUSER_MAX_COUNT+1, XINPUT_FLAG_GAMEPAD, &capabilities);
+    ok(result == ERROR_BAD_ARGUMENTS, "XInputGetCapabilities returned (%d)\n", result);
+}
+
 START_TEST(xinput)
 {
     HMODULE hXinput;
@@ -72,7 +97,9 @@ START_TEST(xinput)
     if (hXinput)
     {
         pXInputGetState = (void*)GetProcAddress(hXinput, "XInputGetState");
+        pXInputGetCapabilities = (void*)GetProcAddress(hXinput, "XInputGetCapabilities");
         test_get_state();
+        test_get_capabilities();
     }
     else
     {
diff --git a/dlls/xinput1_3/xinput1_3.spec b/dlls/xinput1_3/xinput1_3.spec
index 8fb6353..92d45e9 100644
--- a/dlls/xinput1_3/xinput1_3.spec
+++ b/dlls/xinput1_3/xinput1_3.spec
@@ -2,6 +2,6 @@
 @ stub XInputSetState #(long ptr)
 @ stdcall XInputGetState(long ptr)
 @ stub XInputGetKeystroke #(long long ptr)
-@ stub XInputGetCapabilities #(long long ptr)
+@ stdcall XInputGetCapabilities(long long ptr)
 @ stub XInputGetDSoundAudioDeviceGuids #(long ptr ptr)
 @ stub XInputGetBatteryInformation
diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c
index f2b6500..c25c0d7 100644
--- a/dlls/xinput1_3/xinput1_3_main.c
+++ b/dlls/xinput1_3/xinput1_3_main.c
@@ -57,3 +57,15 @@ DWORD WINAPI XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState)
     }
     return ERROR_BAD_ARGUMENTS;
 }
+
+DWORD WINAPI XInputGetCapabilities(DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPABILITIES* pCapabilities)
+{
+    FIXME("(%d %d %p)\n", dwUserIndex, dwFlags, pCapabilities);
+
+    if (dwUserIndex < XUSER_MAX_COUNT)
+    {
+        return ERROR_DEVICE_NOT_CONNECTED;
+        /* If controller exists then return ERROR_SUCCESS */
+    }
+    return ERROR_BAD_ARGUMENTS;
+}