[PATCH v5 0/2] MR4693: xinput: Implement XInputGetCapabilitiesEx.

[Etaash Mathamsetty (＠etaash.mathamsetty)]

Farlight 84 calls this API using the ordinal number 108

For after the code freeze

--
  v5: xinput: Reimplement XInputGetCapabilities.
      xinput: Implement XInputGetCapabilitiesEx.

https://gitlab.winehq.org/wine/wine/-/merge_requests/4693

[PATCH v5 1/2] xinput: Implement XInputGetCapabilitiesEx.

[Etaash Mathamsetty]

From: Etaash Mathamsetty

---
 dlls/xinput1_3/main.c         | 30 ++++++++++++++++++++++++++++++
 dlls/xinput1_4/xinput1_4.spec |  1 +
 include/xinput.h              | 11 +++++++++++
 3 files changed, 42 insertions(+)

diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c
index e69553fba16..a6a2e581d9c 100644
--- a/dlls/xinput1_3/main.c
+++ b/dlls/xinput1_3/main.c
@@ -1129,3 +1129,33 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetBatteryInformation(DWORD index, BYTE typ

return ERROR_NOT_SUPPORTED;
 }
+
+DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilitiesEx(DWORD unk, DWORD index, DWORD flags, XINPUT_CAPABILITIES_EX *caps)
+{
+    HIDD_ATTRIBUTES attr;
+    DWORD ret = ERROR_SUCCESS;
+    
+    TRACE("unk %lu, index %lu, flags %#lx, capabilities %p.\n", unk, index, flags, caps);
+
+    start_update_thread();
+
+    if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS;
+
+    if (!controller_lock(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED;
+
+    if (flags & XINPUT_FLAG_GAMEPAD && controllers[index].caps.SubType != XINPUT_DEVSUBTYPE_GAMEPAD)
+        ret = ERROR_DEVICE_NOT_CONNECTED;
+    else if (!HidD_GetAttributes(controllers[index].device, &attr))
+        ret = ERROR_DEVICE_NOT_CONNECTED;
+    else
+    {
+        caps->Capabilities = controllers[index].caps;
+        caps->VendorId = attr.VendorID;
+        caps->ProductId = attr.ProductID;
+        caps->VersionNumber = attr.VersionNumber;
+    }
+
+    controller_unlock(&controllers[index]);
+
+    return ret;
+}
diff --git a/dlls/xinput1_4/xinput1_4.spec b/dlls/xinput1_4/xinput1_4.spec
index 8c3f4c0cd73..22c511237dd 100644
--- a/dlls/xinput1_4/xinput1_4.spec
+++ b/dlls/xinput1_4/xinput1_4.spec
@@ -7,3 +7,4 @@
 8 stdcall XInputGetKeystroke(long long ptr)
 10 stub XInputGetAudioDeviceIds(long ptr ptr ptr ptr)
 100 stdcall XInputGetStateEx(long ptr)
+108 stdcall XInputGetCapabilitiesEx(long long long ptr)
diff --git a/include/xinput.h b/include/xinput.h
index f7c291630cb..c1e1ab3d39c 100644
--- a/include/xinput.h
+++ b/include/xinput.h
@@ -210,6 +210,16 @@ typedef struct _XINPUT_CAPABILITIES {
     XINPUT_VIBRATION Vibration;
 } XINPUT_CAPABILITIES, *PXINPUT_CAPABILITIES;

+typedef struct _XINPUT_CAPABILITIES_EX
+{
+    XINPUT_CAPABILITIES Capabilities;
+    WORD  VendorId;
+    WORD  ProductId;
+    WORD  VersionNumber;
+    WORD  unk1;
+    DWORD unk2;
+} XINPUT_CAPABILITIES_EX, *PXINPUT_CAPABILITIES_EX;
+
 /*
  * Defines the structure for a joystick input event which is
  * retrieved using the function XInputGetKeystroke
@@ -237,6 +247,7 @@ DWORD WINAPI XInputSetState(DWORD, XINPUT_VIBRATION*);
 DWORD WINAPI XInputGetState(DWORD, XINPUT_STATE*);
 DWORD WINAPI XInputGetKeystroke(DWORD, DWORD, PXINPUT_KEYSTROKE);
 DWORD WINAPI XInputGetCapabilities(DWORD, DWORD, XINPUT_CAPABILITIES*);
+DWORD WINAPI XInputGetCapabilitiesEx(DWORD, DWORD, DWORD, XINPUT_CAPABILITIES_EX*);
 DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD, GUID*, GUID*);
 DWORD WINAPI XInputGetBatteryInformation(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*);

[PATCH v5 2/2] xinput: Reimplement XInputGetCapabilities.

[Etaash Mathamsetty]

From: Etaash Mathamsetty

---
 dlls/xinput1_3/main.c | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c
index a6a2e581d9c..85356a6e176 100644
--- a/dlls/xinput1_3/main.c
+++ b/dlls/xinput1_3/main.c
@@ -1086,25 +1086,14 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetKeystroke(DWORD index, DWORD reserved, P

DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilities(DWORD index, DWORD flags, XINPUT_CAPABILITIES *capabilities)
 {
-    TRACE("index %lu, flags %#lx, capabilities %p.\n", index, flags, capabilities);
-
-    start_update_thread();
-
-    if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS;
-
-    if (!controller_lock(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED;
-
-    if (flags & XINPUT_FLAG_GAMEPAD && controllers[index].caps.SubType != XINPUT_DEVSUBTYPE_GAMEPAD)
-    {
-        controller_unlock(&controllers[index]);
-        return ERROR_DEVICE_NOT_CONNECTED;
-    }
+    XINPUT_CAPABILITIES_EX caps_ex;
+    DWORD ret;

-    memcpy(capabilities, &controllers[index].caps, sizeof(*capabilities));
+    ret = XInputGetCapabilitiesEx(1, index, flags, &caps_ex);

-    controller_unlock(&controllers[index]);
+    if (!ret) *capabilities = caps_ex.Capabilities;

-    return ERROR_SUCCESS;
+    return ret;
 }

DWORD WINAPI DECLSPEC_HOTPATCH XInputGetDSoundAudioDeviceGuids(DWORD index, GUID *render_guid, GUID *capture_guid)

[PATCH v5 2/2] xinput: Reimplement XInputGetCapabilities.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=142059

Your paranoid android.

=== debian11b (64 bit WoW report) ===

shell32:
shlfolder.c:5512: Test failed: Got unexpected hr 0x1.
shlfolder.c:5513: Test failed: Failed to create window.
shlfolder.c:5520: Test failed: Got unexpected hr 0x1.
shlfolder.c:5521: Test failed: Failed to create window.
shlfolder.c:5530: Test failed: Got unexpected hr 0x1.
shlfolder.c:5531: Test failed: Failed to create window.
shlfolder.c:5540: Test failed: Got unexpected hr 0x1.
shlfolder.c:5541: Test failed: Failed to create window.
shlfolder.c:5550: Test failed: Got unexpected hr 0x1.
shlfolder.c:5551: Test failed: Failed to create window.