Module: wine Branch: master Commit: 36c40e53e0f49975b477955e0fcd1d44a54e8bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c40e53e0f49975b477955e0f...
Author: Paul Vriens Paul.Vriens.Wine@gmail.com Date: Thu Nov 13 18:07:01 2008 +0100
quartz/tests: Fix a few failures on Win95 and NT4.
---
dlls/quartz/tests/misc.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/dlls/quartz/tests/misc.c b/dlls/quartz/tests/misc.c index 95468b4..74c386b 100644 --- a/dlls/quartz/tests/misc.c +++ b/dlls/quartz/tests/misc.c @@ -95,7 +95,17 @@ static void test_aggregation(const CLSID clsidOuter, const CLSID clsidInner, /* these QueryInterface calls should work */ QI_SUCCEED(pUnkOuter, iidOuter, pUnkAggregator); QI_SUCCEED(pUnkOuter, IID_IUnknown, pUnkOuterTest); - QI_SUCCEED(pUnkInner, iidInner, pUnkAggregatee); + /* IGraphConfig interface comes with DirectShow 9 */ + if(IsEqualGUID(&IID_IGraphConfig, &iidInner)) + { + hr = IUnknown_QueryInterface(pUnkInner, &iidInner, (LPVOID*)&pUnkAggregatee); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "IUnknown_QueryInterface returned %x\n", hr); + ok(pUnkAggregatee != NULL || broken(!pUnkAggregatee), "Pointer is NULL\n"); + } + else + { + QI_SUCCEED(pUnkInner, iidInner, pUnkAggregatee); + } QI_SUCCEED(pUnkInner, IID_IUnknown, pUnkInnerTest);
if (!pUnkAggregator || !pUnkOuterTest || !pUnkAggregatee