[PATCH 0/4] MR2542: tests: Misc janitorings

[PATCH 1/4] uiautomationcore/tests: Drop superfluous TRUE : FALSE conditional expression.

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/uiautomationcore/tests/uiautomation.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c
index ce3ee303fd1..3d2a61af8f0 100644
--- a/dlls/uiautomationcore/tests/uiautomation.c
+++ b/dlls/uiautomationcore/tests/uiautomation.c
@@ -135,7 +135,7 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2)

IUnknown_QueryInterface(iface1, &IID_IUnknown, (void**)&unk1);
     IUnknown_QueryInterface(iface2, &IID_IUnknown, (void**)&unk2);
-    cmp = (unk1 == unk2) ? TRUE : FALSE;
+    cmp = unk1 == unk2;

IUnknown_Release(unk1);
     IUnknown_Release(unk2);

[PATCH 2/4] ntdll/tests: Use FAILED() instead of not SUCCEEDED().

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/ntdll/tests/info.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
index ae1c8c7c89d..af74819aaca 100644
--- a/dlls/ntdll/tests/info.c
+++ b/dlls/ntdll/tests/info.c
@@ -2130,7 +2130,7 @@ static void subtest_query_process_debug_port_custom_dacl(int argc, char **argv,
     InitializeObjectAttributes(&attr, NULL, 0, NULL, &sd);
     status = NtCreateDebugObject(&debug_obj, MAXIMUM_ALLOWED, &attr, DEBUG_KILL_ON_CLOSE);
     ok(SUCCEEDED(status), "Failed to create debug object: %#010lx\n", status);
-    if (!SUCCEEDED(status)) return;
+    if (FAILED(status)) return;

old_debug_obj = pDbgUiGetThreadDebugObject();
     pDbgUiSetThreadDebugObject(debug_obj);

[PATCH 3/4] wmvcore/tests: Don't cast NULL to another pointer type.

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/wmvcore/tests/wmvcore.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c
index f07abb8d4bb..a116d8a1d69 100644
--- a/dlls/wmvcore/tests/wmvcore.c
+++ b/dlls/wmvcore/tests/wmvcore.c
@@ -3185,7 +3185,7 @@ static void test_async_reader_settings(void)
             WMT_TYPE_DWORD, 0, E_INVALIDARG);

SetEvent(callback.expect_started);
-    hr = IWMReader_Start(reader, 0, 0, 1, (void **)NULL);
+    hr = IWMReader_Start(reader, 0, 0, 1, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     hr = IWMReader_Close(reader);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
@@ -3259,7 +3259,7 @@ static void test_async_reader_streaming(void)
         ok(!ref, "Got outstanding refcount %ld.\n", ref);
     }

-    hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)NULL);
+    hr = IWMReader_Start(reader, 0, 0, 1.0f, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     wait_started_callback(&callback);

@@ -3296,7 +3296,7 @@ static void test_async_reader_streaming(void)
     callback.last_pts[1] = 0;
     callback.next_pts[1] = 0;

-    hr = IWMReader_Start(reader, 0, 0, 1.0f, (void *)NULL);
+    hr = IWMReader_Start(reader, 0, 0, 1.0f, NULL);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     wait_started_callback(&callback);

[PATCH 4/4] mfplat/tests: Remove duplicated ok() call.

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/mfplat/tests/mfplat.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
index 540001676bf..1e5dc190944 100644
--- a/dlls/mfplat/tests/mfplat.c
+++ b/dlls/mfplat/tests/mfplat.c
@@ -8341,7 +8341,6 @@ static void test_MFInitMediaTypeFromVideoInfoHeader(void)
     hr = IMFMediaType_GetUINT32(media_type, &MF_MT_INTERLACE_MODE, &value32);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(value32 == MFVideoInterlace_Progressive, "Unexpected value %#x.\n", value32);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

hr = IMFMediaType_GetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, &value32);
     ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr);

[PATCH 0/4] MR2542: tests: Misc janitorings - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.

[PATCH 0/4] MR2542: tests: Misc janitorings - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.