Module: wine Branch: oldstable Commit: 49064d4311e948a83e262610054a69bf260fa432 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49064d4311e948a83e2626100...
Author: Gijs Vermeulen gijsvrm@gmail.com Date: Mon Nov 23 17:29:27 2020 +0100
quartz: Return E_INVALIDARG when cursor is NULL in IEnumFilters::Skip().
Signed-off-by: Gijs Vermeulen gijsvrm@gmail.com Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit 68d03ba8bbeb07116e15373938e511d693346f4a) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/quartz/filtergraph.c | 2 +- dlls/quartz/tests/filtergraph.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 1ed41bdcec5..ffd481fb171 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -313,7 +313,7 @@ static HRESULT WINAPI EnumFilters_Skip(IEnumFilters *iface, ULONG count) TRACE("enum_filters %p, count %u.\n", enum_filters, count);
if (!enum_filters->cursor) - return S_FALSE; + return E_INVALIDARG;
while (count--) { diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 62546342097..ab573b74008 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -677,6 +677,12 @@ static void test_enum_filters(void) hr = IEnumFilters_Next(enum1, 1, filters, NULL); ok(hr == S_FALSE, "Got hr %#x.\n", hr);
+ hr = IEnumFilters_Skip(enum1, 0); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumFilters_Skip(enum1, 1); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + IFilterGraph2_AddFilter(graph, filter1, NULL); IFilterGraph2_AddFilter(graph, filter2, NULL);