qcap/capturegraph: Return E_POINTER when ICaptureGraphBuilder2::FindInterface()…

qcap/capturegraph: Return E_POINTER when ICaptureGraphBuilder2::FindInterface() is called with NULL filter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46950Signed-off-by: Gijs Vermeulen <gijsvrm@gmail.com> Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

qcap/capturegraph: Return E_POINTER when ICaptureGraphBuilder2::FindInterface()…
4aabbaaf · Gijs Vermeulen · Alexandre Julliard · 7287bd50 · 4aabbaaf · 4aabbaaf
Commit 4aabbaaf authored Oct 22, 2020 by Gijs Vermeulen Committed by Alexandre Julliard Oct 22, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

capturegraph.c dlls/qcap/capturegraph.c +3 -0

capturegraph.c dlls/qcap/tests/capturegraph.c +4 -0

No files found.
--- a/dlls/qcap/capturegraph.c
+++ b/dlls/qcap/capturegraph.c
@@ -343,6 +343,9 @@ static HRESULT WINAPI fnCaptureGraphBuilder2_FindInterface(ICaptureGraphBuilder2
    TRACE("graph %p, category %s, majortype %s, filter %p, iid %s, out %p.\n",
            graph, debugstr_guid(category), debugstr_guid(majortype), filter, debugstr_guid(iid), out);

+    if (!filter)
+        return E_POINTER;
+
    if (category && IsEqualGUID(category, &LOOK_DOWNSTREAM_ONLY))
        return find_interface_recurse(PINDIR_OUTPUT, NULL, NULL, filter, iid, out);


--- a/dlls/qcap/tests/capturegraph.c
+++ b/dlls/qcap/tests/capturegraph.c
@@ -384,6 +384,10 @@ static void test_find_interface(void)

    /* Test search order without any restrictions applied. */

+    hr = ICaptureGraphBuilder2_FindInterface(capture_graph, NULL, &bogus_majortype,
+                NULL, &testiid, (void **)&unk);
+    ok(hr == E_POINTER, "got hr %#x.\n", hr);
+
    for (i = 0; i < ARRAY_SIZE(tests_from_filter2); ++i)
    {
        hr = ICaptureGraphBuilder2_FindInterface(capture_graph, NULL, &bogus_majortype,