[PATCH 0/2] MR2541: dinput: Misc janitorings

[PATCH 1/2] dinput/tests: Drop superfluous TRUE : FALSE conditional expressions.

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/dinput/tests/force_feedback.c | 2 +-
 dlls/dinput/tests/joystick8.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c
index 0b7fcb29fa9..4ac5c3b4a00 100644
--- a/dlls/dinput/tests/force_feedback.c
+++ b/dlls/dinput/tests/force_feedback.c
@@ -2950,7 +2950,7 @@ static BOOL test_force_feedback_joystick( DWORD version )
         .expect_count = version < 0x700 ? ARRAY_SIZE(expect_objects_5) : ARRAY_SIZE(expect_objects),
         .expect_objs = version < 0x700 ? expect_objects_5 : expect_objects,
         .todo_objs = version < 0x700 ? todo_objects_5 : NULL,
-        .todo_extra = version < 0x700 ? TRUE : FALSE,
+        .todo_extra = version < 0x700,
     };
     struct check_effects_params check_effects_params =
     {
diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c
index e654fd53dbb..3ab6f3c26d4 100644
--- a/dlls/dinput/tests/joystick8.c
+++ b/dlls/dinput/tests/joystick8.c
@@ -1781,7 +1781,7 @@ static void test_simple_joystick( DWORD version )
         .expect_count = version < 0x700 ? ARRAY_SIZE(expect_objects_5) : ARRAY_SIZE(expect_objects),
         .expect_objs = version < 0x700 ? expect_objects_5 : expect_objects,
         .todo_objs = version < 0x700 ? todo_objects_5 : NULL,
-        .todo_extra = version < 0x700 ? TRUE : FALSE,
+        .todo_extra = version < 0x700,
     };

const DIEFFECTINFOW expect_effects[] = {};

[PATCH 2/2] dinput: Remove superfluous cast to self.

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/dinput/dinput.c       | 2 +-
 dlls/dinput/tests/dinput.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dinput/dinput.c b/dlls/dinput/dinput.c
index f3003b652d8..76c60b09db0 100644
--- a/dlls/dinput/dinput.c
+++ b/dlls/dinput/dinput.c
@@ -944,7 +944,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create( HINSTANCE hinst, DWORD vers

if (outer || FAILED(hr = IDirectInput8_Initialize( (IDirectInput8W *)unknown, hinst, version )))
     {
-        IUnknown_Release( (IUnknown *)unknown );
+        IUnknown_Release( unknown );
         *out = NULL;
         return hr;
     }
diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c
index 682a5cbf97f..88db7be9288 100644
--- a/dlls/dinput/tests/dinput.c
+++ b/dlls/dinput/tests/dinput.c
@@ -84,7 +84,7 @@ static HRESULT WINAPI outer_QueryInterface( IUnknown *iface, REFIID iid, void **

if (IsEqualGUID( iid, &IID_IUnknown ))
     {
-        *obj = (IUnknown *)iface;
+        *obj = iface;
         return S_OK;
     }

[PATCH 0/2] MR2541: dinput: Misc janitorings - approved

[Rémi Bernon (＠rbernon)]

This merge request was approved by Rémi Bernon.