Commit 36c40e53 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard

quartz/tests: Fix a few failures on Win95 and NT4.

parent f8b8478f
...@@ -95,7 +95,17 @@ static void test_aggregation(const CLSID clsidOuter, const CLSID clsidInner, ...@@ -95,7 +95,17 @@ static void test_aggregation(const CLSID clsidOuter, const CLSID clsidInner,
/* these QueryInterface calls should work */ /* these QueryInterface calls should work */
QI_SUCCEED(pUnkOuter, iidOuter, pUnkAggregator); QI_SUCCEED(pUnkOuter, iidOuter, pUnkAggregator);
QI_SUCCEED(pUnkOuter, IID_IUnknown, pUnkOuterTest); 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); QI_SUCCEED(pUnkInner, IID_IUnknown, pUnkInnerTest);
if (!pUnkAggregator || !pUnkOuterTest || !pUnkAggregatee if (!pUnkAggregator || !pUnkOuterTest || !pUnkAggregatee
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment