Brendan McGrath : dinput/tests: Test that the GUID is the same for Instance and Product.

[Alexandre Julliard]

Module: wine
Branch: oldstable
Commit: 99bced7b47cd55834373a1881c5378e3c5b9e38f
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=99bced7b47cd55834373a1881...

Author: Brendan McGrath <brendan(a)redmandi.com>
Date:   Wed Oct 31 21:01:40 2018 +1100

dinput/tests: Test that the GUID is the same for Instance and Product.

Signed-off-by: Brendan McGrath <brendan(a)redmandi.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit c357f3670f71f3fc40aad0d89f3c9553e653c246)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/dinput/tests/dinput.c  | 11 +++++++++++
 dlls/dinput8/tests/dinput.c | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c
index a5f7c0c..f30d2cc 100644
--- a/dlls/dinput/tests/dinput.c
+++ b/dlls/dinput/tests/dinput.c
@@ -392,6 +392,17 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo
 {
     struct enum_devices_test *enum_test = context;
 
+    if ((instance->dwDevType & 0xff) == DIDEVTYPE_KEYBOARD ||
+           (instance->dwDevType & 0xff) == DIDEVTYPE_MOUSE) {
+        const char *device = ((instance->dwDevType & 0xff) ==
+                                   DIDEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse";
+        todo_wine
+        ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct),
+           "%s guidInstance (%s) does not match guidProduct (%s)\n",
+           device, wine_dbgstr_guid(&instance->guidInstance),
+           wine_dbgstr_guid(&instance->guidProduct));
+    }
+
     enum_test->device_count++;
     return enum_test->return_value;
 }
diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c
index e16542a..43bac03 100644
--- a/dlls/dinput8/tests/dinput.c
+++ b/dlls/dinput8/tests/dinput.c
@@ -377,6 +377,17 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo
           instance->wUsagePage,
           instance->wUsage);
 
+    if ((instance->dwDevType & 0xff) == DI8DEVTYPE_KEYBOARD ||
+           (instance->dwDevType & 0xff) == DI8DEVTYPE_MOUSE) {
+        const char *device = ((instance->dwDevType & 0xff) ==
+                                   DI8DEVTYPE_KEYBOARD) ? "Keyboard" : "Mouse";
+        todo_wine
+        ok(IsEqualGUID(&instance->guidInstance, &instance->guidProduct),
+           "%s guidInstance (%s) does not match guidProduct (%s)\n",
+           device, wine_dbgstr_guid(&instance->guidInstance),
+           wine_dbgstr_guid(&instance->guidProduct));
+    }
+
     enum_test->device_count++;
     return enum_test->return_value;
 }