quartz/vmr9: Return VFW_E_TYPE_NOT_ACCEPTED when connection fails.

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

quartz/vmr9: Return VFW_E_TYPE_NOT_ACCEPTED when connection fails.
7595461f · Zebediah Figura · Alexandre Julliard · 1f6423f7 · 7595461f · 7595461f
Commit 7595461f authored Jun 24, 2020 by Zebediah Figura Committed by Alexandre Julliard Jun 25, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 20 deletions

vmr7.c dlls/quartz/tests/vmr7.c +2 -6

vmr9.c dlls/quartz/tests/vmr9.c +2 -12

vmr9.c dlls/quartz/vmr9.c +2 -2

No files found.
--- a/dlls/quartz/tests/vmr7.c
+++ b/dlls/quartz/tests/vmr7.c
@@ -1366,12 +1366,8 @@ static void test_connect_pin(void)

    vih.bmiHeader.biBitCount = 16;
    hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt);
-    todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr);
-    if (hr == S_OK)
-    {
-        IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface);
-        IFilterGraph2_Disconnect(graph, pin);
-    }
+    ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr);
+
    vih.bmiHeader.biBitCount = 32;
    hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt);
    if (hr == VFW_E_TYPE_NOT_ACCEPTED) /* w7u */

--- a/dlls/quartz/tests/vmr9.c
+++ b/dlls/quartz/tests/vmr9.c
@@ -1618,20 +1618,10 @@ static void test_connect_pin(void)

    req_mt.subtype = MEDIASUBTYPE_RGB8;
    hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt);
-    todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr);
-    if (hr == S_OK)
-    {
-        IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface);
-        IFilterGraph2_Disconnect(graph, pin);
-    }
+    ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr);
    req_mt.subtype = MEDIASUBTYPE_WAVE;
    hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt);
-    todo_wine ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr);
-    if (hr == S_OK)
-    {
-        IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface);
-        IFilterGraph2_Disconnect(graph, pin);
-    }
+    ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr);
    req_mt.subtype = MEDIASUBTYPE_RGB32;

    peer = (IPin *)0xdeadbeef;

--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -424,7 +424,7 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE 
            default:
                FIXME("Unhandled bit depth %u.\n", filter->bmiheader.biBitCount);
                free(filter->surfaces);
-                return E_INVALIDARG;
+                return VFW_E_TYPE_NOT_ACCEPTED;
        }

        info.dwFlags = VMR9AllocFlag_TextureSurface;
@@ -456,7 +456,7 @@ static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE 
    }

    free(filter->surfaces);
-    return hr;
+    return VFW_E_TYPE_NOT_ACCEPTED;
 }

 static void vmr_start_stream(struct strmbase_renderer *iface)