[PATCH 0/4] MR5532: mfreadwrite/tests: Tweak tests to run on Win7 and fix some leaks.

[Rémi Bernon (＠rbernon)]

Split from https://gitlab.winehq.org/wine/wine/-/merge_requests/5459 which is otherwise stalled.

[PATCH 1/4] mfreadwrite/tests: Do not accept MFVideoFormat_RGB32 in the test transform.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/mfreadwrite/tests/mfplat.c | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c
index a2c46869250..00b79353090 100644
--- a/dlls/mfreadwrite/tests/mfplat.c
+++ b/dlls/mfreadwrite/tests/mfplat.c
@@ -2488,6 +2488,13 @@ static HRESULT WINAPI test_decoder_SetInputType(IMFTransform *iface, DWORD id, I
 static HRESULT WINAPI test_decoder_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags)
 {
     struct test_decoder *decoder = test_decoder_from_IMFTransform(iface);
+    GUID subtype;
+    HRESULT hr;
+
+    if (type && SUCCEEDED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype))
+            && IsEqualGUID(&subtype, &MFVideoFormat_RGB32))
+        return MF_E_INVALIDMEDIATYPE;
+
     if (flags & MFT_SET_TYPE_TEST_ONLY)
         return S_OK;
     if (decoder->output_type)
@@ -2900,7 +2907,7 @@ static void test_source_reader_transforms_d3d(void)
         ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
         ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32),
         ATTR_RATIO(MF_MT_FRAME_SIZE, 96, 96),
-        ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1, .todo = TRUE),
+        ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1),
         ATTR_UINT32(MF_MT_COMPRESSED, 0, .todo = TRUE),
         ATTR_UINT32(MF_MT_INTERLACE_MODE, 2, .todo = TRUE),
         {0},
@@ -3019,18 +3026,14 @@ static void test_source_reader_transforms_d3d(void)

/* video processor transform is not D3D aware */
     hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 1, NULL, &video_processor);
-    todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    /* FIXME: Wine skips the video processor as the test decoder accepts the output type directly */
-    if (hr == S_OK)
-    {
-        ok(video_processor->lpVtbl != &test_decoder_vtbl, "got unexpected transform\n");
-        hr = IMFTransform_GetAttributes(video_processor, &attributes);
-        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        hr = IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &value);
-        ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr);
-        IMFAttributes_Release(attributes);
-        IMFTransform_Release(video_processor);
-    }
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(video_processor->lpVtbl != &test_decoder_vtbl, "got unexpected transform\n");
+    hr = IMFTransform_GetAttributes(video_processor, &attributes);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    hr = IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &value);
+    ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr);
+    IMFAttributes_Release(attributes);
+    IMFTransform_Release(video_processor);

hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 0, NULL, &test_decoder);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

[PATCH 2/4] mfreadwrite/tests: Avoid using MFCreateMediaBufferFromMediaType.

[Rémi Bernon]

From: Rémi Bernon

It's not available on Win7.
---
 dlls/mfreadwrite/tests/mfplat.c | 54 ++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c
index 00b79353090..69478bd58cb 100644
--- a/dlls/mfreadwrite/tests/mfplat.c
+++ b/dlls/mfreadwrite/tests/mfplat.c
@@ -2604,28 +2604,25 @@ static HRESULT WINAPI test_decoder_ProcessOutput(IMFTransform *iface, DWORD flag

hr = MFCreateSample(&data->pSample);
         ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        hr = MFCreateMediaBufferFromMediaType(decoder->output_type, 0, 0, 0, &buffer);
-        todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        if (hr != S_OK)
-        {
-            hr = MFCreateMemoryBuffer(96 * 96 * 4, &buffer);
-            ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-        }
+        hr = MFCreateMemoryBuffer(96 * 96 * 4, &buffer);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
         hr = IMFSample_AddBuffer(data->pSample, buffer);
         ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
         IMFMediaBuffer_Release(buffer);
     }
+    else
+    {
+        ok(!!data->pSample, "Missing sample\n");

-    ok(!!data->pSample, "Missing sample\n");
-
-    hr = IMFSample_GetBufferByIndex(data->pSample, 0, &buffer);
-    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    todo_wine check_interface(buffer, &IID_IMF2DBuffer2, TRUE);
-    todo_wine check_interface(buffer, &IID_IMFGetService, TRUE);
-    check_interface(buffer, &IID_IMFDXGIBuffer, FALSE);
-    hr = MFGetService((IUnknown *)buffer, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&unknown);
-    todo_wine ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr);
-    IMFMediaBuffer_Release(buffer);
+        hr = IMFSample_GetBufferByIndex(data->pSample, 0, &buffer);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+        todo_wine check_interface(buffer, &IID_IMF2DBuffer2, TRUE);
+        todo_wine check_interface(buffer, &IID_IMFGetService, TRUE);
+        check_interface(buffer, &IID_IMFDXGIBuffer, FALSE);
+        hr = MFGetService((IUnknown *)buffer, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&unknown);
+        todo_wine ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr);
+        IMFMediaBuffer_Release(buffer);
+    }

if (decoder->next_output == MF_E_TRANSFORM_STREAM_CHANGE)
     {
@@ -2817,6 +2814,16 @@ static void test_source_reader_transform_stream_change(void)
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     IMFMediaSource_Release(source);

+    /* skip tests on Win7 which misses IMFSourceReaderEx */
+    hr = IMFSourceReader_QueryInterface(reader, &IID_IMFSourceReaderEx, (void **)&reader_ex);
+    ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#lx.\n", hr);
+    if (broken(hr == E_NOINTERFACE))
+    {
+        win_skip("missing IMFSourceReaderEx interface, skipping tests on Win7\n");
+        goto skip_tests;
+    }
+    IMFSourceReaderEx_Release(reader_ex);
+
     hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

@@ -2881,6 +2888,7 @@ static void test_source_reader_transform_stream_change(void)

IMFTransform_Release(test_decoder);

+skip_tests:
     IMFSourceReader_Release(reader);

hr = MFTUnregisterLocal(&factory);
@@ -2993,6 +3001,17 @@ static void test_source_reader_transforms_d3d(void)
     IMFAttributes_Release(attributes);
     IMFMediaSource_Release(source);

+    /* skip tests on Win7 which misses IMFSourceReaderEx */
+    hr = IMFSourceReader_QueryInterface(reader, &IID_IMFSourceReaderEx, (void **)&reader_ex);
+    ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#lx.\n", hr);
+    if (broken(hr == E_NOINTERFACE))
+    {
+        win_skip("missing IMFSourceReaderEx interface, skipping tests on Win7\n");
+        IMFSourceReader_Release(reader);
+        goto skip_tests;
+    }
+    IMFSourceReaderEx_Release(reader_ex);
+
     hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

@@ -3152,6 +3171,7 @@ static void test_source_reader_transforms_d3d(void)
     test_decoder_allocate_samples = FALSE;

+skip_tests:
     hr = MFTUnregisterLocal(&factory);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

[PATCH 3/4] mfreadwrite/tests: Shutdown the test stream event queues on source shutdown.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/mfreadwrite/tests/mfplat.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c
index 69478bd58cb..b70d0587072 100644
--- a/dlls/mfreadwrite/tests/mfplat.c
+++ b/dlls/mfreadwrite/tests/mfplat.c
@@ -554,9 +554,15 @@ static HRESULT WINAPI test_source_Shutdown(IMFMediaSource *iface)
 {
     struct test_source *source = impl_from_IMFMediaSource(iface);
     HRESULT hr;
+    UINT i;

hr = IMFMediaEventQueue_Shutdown(source->event_queue);
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    for (i = 0; i < source->stream_count; ++i)
+    {
+        hr = IMFMediaEventQueue_Shutdown(source->streams[i]->event_queue);
+        ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    }

return S_OK;
 }

[PATCH 4/4] mfreadwrite/reader: Avoid leaking the stream transform service MFT.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/mfreadwrite/reader.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c
index 96bb316ac85..ab8c3993570 100644
--- a/dlls/mfreadwrite/reader.c
+++ b/dlls/mfreadwrite/reader.c
@@ -223,6 +223,8 @@ static void media_stream_destroy(struct media_stream *stream)
         transform_entry_destroy(entry);
     }

+    if (stream->transform_service)
+        IMFTransform_Release(stream->transform_service);
     if (stream->stream)
         IMFMediaStream_Release(stream->stream);
     if (stream->current)

[PATCH 0/4] MR5532: mfreadwrite/tests: Tweak tests to run on Win7 and fix some leaks. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.