[PATCH v4 04/12] winegstreamer: Implement IMFStreamSink::IMFMediaTypeHandler.GetMajorType.

[Torge Matthies]

From: Torge Matthies

---
 dlls/mf/tests/mf.c              |  5 -----
 dlls/winegstreamer/media_sink.c | 11 +++++++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index 2f288e854d7..d21d6841060 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -7826,12 +7826,9 @@ static void test_mpeg4_media_sink(void)
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

hr = IMFMediaTypeHandler_GetMajorType(type_handler, NULL);
-    todo_wine
     ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
     hr = IMFMediaTypeHandler_GetMajorType(type_handler, &guid);
-    todo_wine
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
-    todo_wine
     ok(IsEqualGUID(&guid, &MFMediaType_Audio), "Unexpected major type.\n");

hr = IMFMediaTypeHandler_GetMediaTypeCount(type_handler, &count);
@@ -7869,10 +7866,8 @@ static void test_mpeg4_media_sink(void)
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

hr = IMFMediaTypeHandler_GetMajorType(type_handler, NULL);
-    todo_wine
     ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
     hr = IMFMediaTypeHandler_GetMajorType(type_handler, &guid);
-    todo_wine
     ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

IMFStreamSink_Release(stream_sink);
diff --git a/dlls/winegstreamer/media_sink.c b/dlls/winegstreamer/media_sink.c
index 039acf81232..eba0d527741 100644
--- a/dlls/winegstreamer/media_sink.c
+++ b/dlls/winegstreamer/media_sink.c
@@ -466,9 +466,16 @@ static HRESULT WINAPI stream_sink_type_handler_GetCurrentMediaType(IMFMediaTypeH

static HRESULT WINAPI stream_sink_type_handler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type)
 {
-    FIXME("iface %p, type %p.\n", iface, type);
+    struct stream_sink *stream_sink = impl_from_IMFMediaTypeHandler(iface);

-    return E_NOTIMPL;
+    TRACE("iface %p, type %p.\n", iface, type);
+
+    if (!type)
+        return E_POINTER;
+    if (!stream_sink->type)
+        return MF_E_NOT_INITIALIZED;
+
+    return IMFMediaType_GetGUID(stream_sink->type, &MF_MT_MAJOR_TYPE, type);
 }

static const IMFMediaTypeHandlerVtbl stream_sink_type_handler_vtbl =