Zebediah Figura : quartz/tests: Fix a test failure in Windows 7 and higher.
Alexandre Julliard
julliard at winehq.org
Mon May 18 15:00:13 CDT 2020
Module: wine
Branch: master
Commit: 1e9d3ff3228d106a017be7e1476ddcad0803a651
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e9d3ff3228d106a017be7e1476ddcad0803a651
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Sun May 17 14:38:14 2020 -0500
quartz/tests: Fix a test failure in Windows 7 and higher.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/tests/filtermapper.c | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c
index 41b933275d..b9123ce525 100644
--- a/dlls/quartz/tests/filtermapper.c
+++ b/dlls/quartz/tests/filtermapper.c
@@ -668,11 +668,8 @@ static void test_aggregation(void)
static void test_dmo(void)
{
DMO_PARTIAL_MEDIATYPE mt = {MEDIATYPE_Audio, MEDIASUBTYPE_PCM};
- IEnumRegFilters *enumerator1;
IEnumMoniker *enumerator;
IFilterMapper3 *mapper;
- IFilterMapper *mapper1;
- REGFILTER *regfilter;
IMoniker *moniker;
WCHAR *name;
HRESULT hr;
@@ -688,8 +685,6 @@ static void test_dmo(void)
ok(hr == S_OK, "Got hr %#x.\n", hr);
mapper = create_mapper();
- IFilterMapper3_QueryInterface(mapper, &IID_IFilterMapper, (void **)&mapper1);
- ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IFilterMapper3_EnumMatchingFilters(mapper, &enumerator, 0, FALSE, 0,
FALSE, 0, NULL, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL);
@@ -710,20 +705,8 @@ static void test_dmo(void)
IEnumMoniker_Release(enumerator);
ok(found, "DMO should be enumerated.\n");
- /* DMOs lack a CLSID property and are therefore not enumerated by IFilterMapper. */
-
- hr = IFilterMapper_EnumMatchingFilters(mapper1, &enumerator1, 0, FALSE,
- GUID_NULL, GUID_NULL, FALSE, FALSE, GUID_NULL, GUID_NULL);
- ok(hr == S_OK, "Got hr %#x.\n", hr);
-
- while (IEnumRegFilters_Next(enumerator1, 1, ®filter, NULL) == S_OK)
- {
- ok(!IsEqualGUID(®filter->Clsid, &testclsid), "DMO should not be enumerated.\n");
- ok(wcscmp(regfilter->Name, L"dmo test"), "DMO should not be enumerated.\n");
- }
- IEnumRegFilters_Release(enumerator1);
+ /* DMOs are enumerated by IFilterMapper in Windows 7 and higher. */
- IFilterMapper_Release(mapper1);
ref = IFilterMapper3_Release(mapper);
ok(!ref, "Got outstanding refcount %d.\n", ref);
More information about the wine-cvs
mailing list