Nikolay Sivov : mf/tests: Relax error code test for IsMediaTypeSupported() of SAR.

Alexandre Julliard julliard at winehq.org
Mon Nov 23 15:43:24 CST 2020


Module: wine
Branch: master
Commit: 73c3c8e0315182acfc3cd3154e0b6ff9b3012a2d
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=73c3c8e0315182acfc3cd3154e0b6ff9b3012a2d

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Nov 23 17:34:34 2020 +0300

mf/tests: Relax error code test for IsMediaTypeSupported() of SAR.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mf/tests/mf.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 27e859fa82d..117e2d2e785 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -3106,11 +3106,17 @@ todo_wine
     hr = MFCreateMediaType(&mediatype);
     ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr);
 
+    /* Actual return value is MF_E_ATRIBUTENOTFOUND triggered by missing MF_MT_MAJOR_TYPE */
     hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL);
-todo_wine
-    ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr);
+    ok(FAILED(hr), "Unexpected hr %#x.\n", hr);
 
-    IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio);
+    hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video);
+    ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+    hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL);
+    ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr);
+
+    hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio);
+    ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
     hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL);
     ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr);
 




More information about the wine-cvs mailing list