Paul Vriens : quartz/tests: Fix some test failures on Win95.
Alexandre Julliard
julliard at winehq.org
Wed Jan 21 06:40:19 CST 2009
Module: wine
Branch: master
Commit: 990810030503646d8bda8edf51da4d4ae81069f2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=990810030503646d8bda8edf51da4d4ae81069f2
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Wed Jan 21 10:18:57 2009 +0100
quartz/tests: Fix some test failures on Win95.
---
dlls/quartz/tests/filtergraph.c | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index e3ae100..6f9e4c8 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -1434,7 +1434,13 @@ static HRESULT get_connected_filter_name(TestFilterImpl *pFilter, char *FilterNa
IPin_Release(pin);
if (FAILED(hr)) return hr;
+ SetLastError(0xdeadbeef);
hr = IBaseFilter_QueryFilterInfo(pinInfo.pFilter, &filterInfo);
+ if (hr == S_OK && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
+ {
+ IBaseFilter_Release(pinInfo.pFilter);
+ return E_NOTIMPL;
+ }
ok(hr == S_OK, "IBaseFilter_QueryFilterInfo failed with %x\n", hr);
IBaseFilter_Release(pinInfo.pFilter);
if (FAILED(hr)) return hr;
@@ -1557,7 +1563,7 @@ static void test_render_filter_priority(void)
hr = IFilterGraph2_Render(pgraph2, ((TestFilterImpl*)ptestfilter)->ppPins[0]);
ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr);
- get_connected_filter_name((TestFilterImpl*)ptestfilter, ConnectedFilterName1);
+ hr = get_connected_filter_name((TestFilterImpl*)ptestfilter, ConnectedFilterName1);
IFilterGraph2_Release(pgraph2);
pgraph2 = NULL;
@@ -1566,6 +1572,12 @@ static void test_render_filter_priority(void)
IBaseFilter_Release(ptestfilter2);
ptestfilter2 = NULL;
+ if (hr == E_NOTIMPL)
+ {
+ win_skip("Needed functions are not implemented\n");
+ return;
+ }
+
hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (LPVOID*)&pgraph2);
ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr);
if (!pgraph2) goto out;
More information about the wine-cvs
mailing list