[PATCH 0/1] MR8800: mfreadwrite/tests: Fix test failures with Windows 7.
[Test pattern page](https://test.winehq.org/data/patterns.html#mfreadwrite:mfplat) [Testbot run with this patch](https://testbot.winehq.org/JobDetails.pl?Key=159453) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8800
From: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/mfreadwrite/tests/mfplat.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 2946425e494..cadb47d6b48 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -1703,7 +1703,7 @@ static void test_sink_writer_get_object(void) hr = IMFSinkWriter_QueryInterface(writer, &IID_IMFSinkWriterEx, (void **)&writer_ex); todo_wine - ok(hr == S_OK, "QueryInterface returned %#lx.\n", hr); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "QueryInterface returned %#lx.\n", hr); hr = MFCreateMediaType(&stream_type); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -1732,13 +1732,13 @@ static void test_sink_writer_get_object(void) init_media_type(input_type, video_input_type_desc, -1); hr = IMFSinkWriter_SetInputMediaType(writer, 0, input_type, NULL); todo_wine - ok(hr == S_OK, "SetInputMediaType returned %#lx.\n", hr); + ok(hr == S_OK || broken(hr == MF_E_INVALIDMEDIATYPE) /* Win7 */, "SetInputMediaType returned %#lx.\n", hr); IMFMediaType_Release(input_type); /* Get transform after SetInputMediaType. */ hr = IMFSinkWriter_GetServiceForStream(writer, 0, &GUID_NULL, &IID_IMFTransform, (void **)&transform); todo_wine - ok(hr == S_OK, "GetServiceForStream returned %#lx.\n", hr); + ok(hr == S_OK || broken(hr == MF_E_UNSUPPORTED_SERVICE) /* Win7 */, "GetServiceForStream returned %#lx.\n", hr); if (hr == S_OK) IMFTransform_Release(transform); @@ -1858,7 +1858,7 @@ static void test_sink_writer_add_stream(void) hr = IMFSinkWriter_SetInputMediaType(writer, 0, input_type, NULL); todo_wine - ok(hr == S_OK, "SetInputMediaType returned %#lx.\n", hr); + ok(hr == S_OK || broken(hr == MF_E_INVALIDMEDIATYPE) /* Win7 */, "SetInputMediaType returned %#lx.\n", hr); IMFMediaType_Release(input_type); @@ -1918,7 +1918,12 @@ static void test_sink_writer_sample_process(void) init_media_type(input_type, video_input_type_desc, -1); hr = IMFSinkWriter_SetInputMediaType(writer, 0, input_type, NULL); todo_wine - ok(hr == S_OK, "SetInputMediaType returned %#lx.\n", hr); + ok(hr == S_OK || broken(hr == MF_E_INVALIDMEDIATYPE) /* Win7 */, "SetInputMediaType returned %#lx.\n", hr); + if (broken(hr == MF_E_INVALIDMEDIATYPE)) + { + win_skip("SetInputMediaType failed, skipping tests on Win7\n"); + goto skip_tests; + } IMFMediaType_Release(input_type); /* BeginWriting after adding stream. */ @@ -1964,6 +1969,7 @@ static void test_sink_writer_sample_process(void) ok(file_size.QuadPart > 0x400, "Unexpected file size %I64x.\n", file_size.QuadPart); CloseHandle(file); } +skip_tests: IMFSinkWriter_Release(writer); DeleteFileW(temp_file); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8800
Nikolay Sivov (@nsivov) commented about dlls/mfreadwrite/tests/mfplat.c:
init_media_type(input_type, video_input_type_desc, -1); hr = IMFSinkWriter_SetInputMediaType(writer, 0, input_type, NULL); todo_wine - ok(hr == S_OK, "SetInputMediaType returned %#lx.\n", hr); + ok(hr == S_OK || broken(hr == MF_E_INVALIDMEDIATYPE) /* Win7 */, "SetInputMediaType returned %#lx.\n", hr); IMFMediaType_Release(input_type);
This is different comparing to unsupported newer API, we need to figure out why type is rejected, if we are going to run tests on Windows 7. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8800#note_113534
On Thu Aug 21 20:50:31 2025 +0000, Nikolay Sivov wrote:
This is different comparing to unsupported newer API, we need to figure out why type is rejected, if we are going to run tests on Windows 7. Thanks for looking into it. But in [this comment](https://gitlab.winehq.org/wine/wine/-/merge_requests/8908#note_114955) @gofman mentioned "I think it is now decided that we don't care about Win7 test failures anymore". So I guess there is no point in this MR anymore?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/8800#note_115765
On Fri Sep 12 15:22:22 2025 +0000, Bernhard Übelacker wrote:
Thanks for looking into it. But in [this comment](https://gitlab.winehq.org/wine/wine/-/merge_requests/8908#note_114955) @gofman mentioned "I think it is now decided that we don't care about Win7 test failures anymore". So I guess there is no point in this MR anymore? Sure, if it's been decided, I don't see a reason to spend time on that.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/8800#note_115885
This merge request was closed by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8800
We can ignore Win7 failures now. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8800#note_120131
participants (3)
-
Alexandre Julliard (@julliard) -
Bernhard Übelacker -
Nikolay Sivov (@nsivov)