Zebediah Figura : strmbase: Return S_FALSE from IEnumPins::Next() when the pin count changes.
Alexandre Julliard
julliard at winehq.org
Wed Jan 29 16:24:06 CST 2020
Module: wine
Branch: master
Commit: 0820b125e29b5bfde9a6615e96cbd93efa56932f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0820b125e29b5bfde9a6615e96cbd93efa56932f
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue Jan 28 23:36:54 2020 -0600
strmbase: Return S_FALSE from IEnumPins::Next() when the pin count changes.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/tests/avisplit.c | 1 -
dlls/quartz/tests/filesource.c | 1 -
dlls/quartz/tests/mpegsplit.c | 1 -
dlls/quartz/tests/waveparser.c | 1 -
dlls/strmbase/filter.c | 2 +-
5 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c
index 31cb767b60..4af101767d 100644
--- a/dlls/quartz/tests/avisplit.c
+++ b/dlls/quartz/tests/avisplit.c
@@ -353,7 +353,6 @@ static void test_enum_pins(void)
graph = connect_input(filter, filename);
hr = IEnumPins_Next(enum1, 1, pins, NULL);
-todo_wine
ok(hr == S_FALSE, "Got hr %#x.\n", hr);
hr = IEnumPins_Reset(enum1);
diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c
index 3e571fa0e3..918605da6d 100644
--- a/dlls/quartz/tests/filesource.c
+++ b/dlls/quartz/tests/filesource.c
@@ -526,7 +526,6 @@ static void test_enum_pins(void)
load_file(filter, filename);
hr = IEnumPins_Next(enum1, 1, pins, NULL);
-todo_wine
ok(hr == S_FALSE, "Got hr %#x.\n", hr);
hr = IEnumPins_Reset(enum1);
diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c
index c45f982a02..67dd6d312d 100644
--- a/dlls/quartz/tests/mpegsplit.c
+++ b/dlls/quartz/tests/mpegsplit.c
@@ -347,7 +347,6 @@ static void test_enum_pins(void)
graph = connect_input(filter, filename);
hr = IEnumPins_Next(enum1, 1, pins, NULL);
-todo_wine
ok(hr == S_FALSE, "Got hr %#x.\n", hr);
hr = IEnumPins_Reset(enum1);
diff --git a/dlls/quartz/tests/waveparser.c b/dlls/quartz/tests/waveparser.c
index 61ba2018e4..e9540bc0f5 100644
--- a/dlls/quartz/tests/waveparser.c
+++ b/dlls/quartz/tests/waveparser.c
@@ -351,7 +351,6 @@ static void test_enum_pins(void)
graph = connect_input(filter, filename);
hr = IEnumPins_Next(enum1, 1, pins, NULL);
-todo_wine
ok(hr == S_FALSE, "Got hr %#x.\n", hr);
hr = IEnumPins_Reset(enum1);
diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c
index a7e5fcd3f0..43da4b3fb9 100644
--- a/dlls/strmbase/filter.c
+++ b/dlls/strmbase/filter.c
@@ -122,7 +122,7 @@ static HRESULT WINAPI enum_pins_Next(IEnumPins *iface, ULONG count, IPin **pins,
*ret_count = 0;
if (enum_pins->version != enum_pins->filter->pin_version)
- return VFW_E_ENUM_OUT_OF_SYNC;
+ return S_FALSE;
for (i = 0; i < count; ++i)
{
More information about the wine-cvs
mailing list