Gijs Vermeulen : quartz: Only return S_FALSE in IEnumFilters::Skip() if count goes past the end of the sequence.

[Alexandre Julliard]

Module: wine
Branch: oldstable
Commit: 9167d99c9b1bddf212098d05f223f130ae06f7fe
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=9167d99c9b1bddf212098d05f...

Author: Gijs Vermeulen <gijsvrm(a)gmail.com>
Date:   Mon Nov 23 17:29:28 2020 +0100

quartz: Only return S_FALSE in IEnumFilters::Skip() if count goes past the end of the sequence.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28332
Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 4807a8f588c67e2296474399368a96c0046120fd)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/quartz/filtergraph.c       |  2 +-
 dlls/quartz/tests/filtergraph.c | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index ffd481fb171..7114d47753c 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -318,7 +318,7 @@ static HRESULT WINAPI EnumFilters_Skip(IEnumFilters *iface, ULONG count)
     while (count--)
     {
         if (!(enum_filters->cursor = list_next(&enum_filters->graph->filters, enum_filters->cursor)))
-            return S_FALSE;
+            return count ? S_FALSE : S_OK;
     }
 
     return S_OK;
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index ab573b74008..b76e6fcbe23 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -692,6 +692,30 @@ static void test_enum_filters(void)
     hr = IEnumFilters_Reset(enum1);
     ok(hr == S_OK, "Got hr %#x.\n", hr);
 
+    hr = IEnumFilters_Skip(enum1, 0);
+    ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+    hr = IEnumFilters_Skip(enum1, 1);
+    ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+    hr = IEnumFilters_Skip(enum1, 2);
+    ok(hr == S_FALSE, "Got hr %#x.\n", hr);
+
+    hr = IEnumFilters_Skip(enum1, 1);
+    ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
+
+    hr = IEnumFilters_Reset(enum1);
+    ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+    hr = IEnumFilters_Skip(enum1, 2);
+    ok(hr == S_OK, "Got hr %#x.\n", hr);
+
+    hr = IEnumFilters_Skip(enum1, 1);
+    ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr);
+
+    hr = IEnumFilters_Reset(enum1);
+    ok(hr == S_OK, "Got hr %#x.\n", hr);
+
     hr = IEnumFilters_Next(enum1, 1, filters, NULL);
     ok(hr == S_OK, "Got hr %#x.\n", hr);
     ok(filters[0] == filter2, "Got filter %p.\n", filters[0]);