[PATCH 5/5] dinput: Support DIDEVICEINSTANCE_DX3 for Mouse GetDeviceInfo

[Alistair Leslie-Hughes]

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
 dlls/dinput/mouse.c       |  5 -----
 dlls/dinput/tests/mouse.c | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c
index f3ec8e4f03..58c78a5cc7 100644
--- a/dlls/dinput/mouse.c
+++ b/dlls/dinput/mouse.c
@@ -765,11 +765,6 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceInfo(
     SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface);
     TRACE("(this=%p,%p)\n", This, pdidi);
 
-    if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA)) {
-        WARN(" dinput3 not supported yet...\n");
-	return DI_OK;
-    }
-
     fill_mouse_dideviceinstanceA(pdidi, This->base.dinput->dwVersion);
     
     return DI_OK;
diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c
index c2d0226487..c1a7ff7dec 100644
--- a/dlls/dinput/tests/mouse.c
+++ b/dlls/dinput/tests/mouse.c
@@ -198,6 +198,35 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd)
     DestroyWindow( hwnd2 );
 }
 
+static void test_GetDeviceInfo(IDirectInputA *pDI)
+{
+    HRESULT hr;
+    IDirectInputDeviceA *pMouse = NULL;
+    DIDEVICEINSTANCEA instA;
+    DIDEVICEINSTANCE_DX3A inst3A;
+
+    hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL);
+    ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr);
+    if (FAILED(hr)) return;
+
+    instA.dwSize = sizeof(instA);
+    hr = IDirectInputDevice_GetDeviceInfo(pMouse, &instA);
+    ok(SUCCEEDED(hr), "got %08x\n", hr);
+
+    inst3A.dwSize = sizeof(inst3A);
+    hr = IDirectInputDevice_GetDeviceInfo(pMouse, (DIDEVICEINSTANCEA *)&inst3A);
+    ok(SUCCEEDED(hr), "got %08x\n", hr);
+
+    ok(instA.dwSize != inst3A.dwSize, "got %d, %d \n", instA.dwSize, inst3A.dwSize);
+    ok(IsEqualGUID(&instA.guidInstance, &inst3A.guidInstance), "got %s, %s\n",
+            wine_dbgstr_guid(&instA.guidInstance), wine_dbgstr_guid(&inst3A.guidInstance) );
+    ok(IsEqualGUID(&instA.guidProduct, &inst3A.guidProduct), "got %s, %s\n",
+            wine_dbgstr_guid(&instA.guidProduct), wine_dbgstr_guid(&inst3A.guidProduct) );
+    ok(instA.dwDevType == inst3A.dwDevType, "got %d, %d\n", instA.dwDevType, inst3A.dwDevType);
+
+    if (pMouse) IUnknown_Release(pMouse);
+}
+
 static void mouse_tests(void)
 {
     HRESULT hr;
@@ -224,6 +253,7 @@ static void mouse_tests(void)
 
         test_set_coop(pDI, hwnd);
         test_acquire(pDI, hwnd);
+        test_GetDeviceInfo(pDI);
 
         DestroyWindow(hwnd);
     }
-- 
2.20.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=51564

Your paranoid android.


=== debian9 (32 bit report) ===

dinput8:
Unhandled exception: page fault on read access to 0xdeadbeef in 32-bit code (0x7ece2a7c).

Report errors:
dinput8:dinput crashed (c0000005)

=== debian9 (32 bit French report) ===

dinput:
mouse.c:162: Test failed: GetDeviceData() failed: 00000000 cnt:0

=== debian9 (32 bit Japanese:Japan report) ===

dinput:
mouse.c:173: Test failed: GetDeviceData() failed: 00000000 cnt:0

=== debian9 (32 bit Chinese:China report) ===

dinput8:
Unhandled exception: page fault on read access to 0xdeadbeef in 32-bit code (0x7ece2a7c).

Report errors:
dinput8:dinput crashed (c0000005)

=== debian9 (32 bit WoW report) ===

dinput8:
Unhandled exception: page fault on read access to 0xdeadbeef in 32-bit code (0x7ece2a7c).

Report errors:
dinput8:dinput crashed (c0000005)

=== debian9 (64 bit WoW report) ===

dinput8:
Unhandled exception: page fault on read access to 0xdeadbeef in 32-bit code (0x7ece2a7c).

Report errors:
dinput8:dinput crashed (c0000005)