Zebediah Figura : quartz/memallocator: Return S_OK when clearing the media type.

[Alexandre Julliard]

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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Mon Jun 24 20:05:18 2019 -0500

quartz/memallocator: Return S_OK when clearing the media type.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/quartz/memallocator.c       | 2 +-
 dlls/quartz/tests/memallocator.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c
index b7dff8c..91c2373 100644
--- a/dlls/quartz/memallocator.c
+++ b/dlls/quartz/memallocator.c
@@ -686,7 +686,7 @@ static HRESULT WINAPI StdMediaSample2_SetMediaType(IMediaSample2 * iface, AM_MED
         This->props.pMediaType = NULL;
     }
     if (!pMediaType)
-        return S_FALSE;
+        return S_OK;
     if (!(This->props.pMediaType = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE))))
         return E_OUTOFMEMORY;
 
diff --git a/dlls/quartz/tests/memallocator.c b/dlls/quartz/tests/memallocator.c
index 3868312..9bbfd42 100644
--- a/dlls/quartz/tests/memallocator.c
+++ b/dlls/quartz/tests/memallocator.c
@@ -487,7 +487,7 @@ static void test_sample_properties(void)
     ok(!mt, "Got media type %p.\n", mt);
 
     hr = IMediaSample_SetMediaType(sample, NULL);
-    todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
+    ok(hr == S_OK, "Got hr %#x.\n", hr);
 
     mt = (AM_MEDIA_TYPE *)0xdeadbeef;
     hr = IMediaSample_GetMediaType(sample, &mt);
@@ -513,7 +513,7 @@ static void test_sample_properties(void)
     ok(!memcmp(props.pMediaType, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n");
 
     hr = IMediaSample_SetMediaType(sample, NULL);
-    todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
+    ok(hr == S_OK, "Got hr %#x.\n", hr);
 
     mt = (AM_MEDIA_TYPE *)0xdeadbeef;
     hr = IMediaSample_GetMediaType(sample, &mt);