qedit: Fix return code for requesting aggregation with an interface other than IUnknown.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
a6b00b4db6
commit
96eb82f701
|
@ -106,7 +106,7 @@ static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter
|
||||||
|
|
||||||
*ppobj = NULL;
|
*ppobj = NULL;
|
||||||
if (pOuter && !IsEqualGUID(&IID_IUnknown, riid))
|
if (pOuter && !IsEqualGUID(&IID_IUnknown, riid))
|
||||||
return E_INVALIDARG;
|
return E_NOINTERFACE;
|
||||||
|
|
||||||
hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk);
|
hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk);
|
||||||
if (SUCCEEDED(hres)) {
|
if (SUCCEEDED(hres)) {
|
||||||
|
|
|
@ -82,7 +82,7 @@ static void test_aggregation(void)
|
||||||
detector = (IMediaDet *)0xdeadbeef;
|
detector = (IMediaDet *)0xdeadbeef;
|
||||||
hr = CoCreateInstance(&CLSID_MediaDet, &test_outer, CLSCTX_INPROC_SERVER,
|
hr = CoCreateInstance(&CLSID_MediaDet, &test_outer, CLSCTX_INPROC_SERVER,
|
||||||
&IID_IMediaDet, (void **)&detector);
|
&IID_IMediaDet, (void **)&detector);
|
||||||
todo_wine ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr);
|
ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr);
|
||||||
ok(!detector, "Got interface %p.\n", detector);
|
ok(!detector, "Got interface %p.\n", detector);
|
||||||
|
|
||||||
hr = CoCreateInstance(&CLSID_MediaDet, &test_outer, CLSCTX_INPROC_SERVER,
|
hr = CoCreateInstance(&CLSID_MediaDet, &test_outer, CLSCTX_INPROC_SERVER,
|
||||||
|
|
|
@ -400,7 +400,7 @@ static void test_aggregation(void)
|
||||||
filter = (IBaseFilter *)0xdeadbeef;
|
filter = (IBaseFilter *)0xdeadbeef;
|
||||||
hr = CoCreateInstance(&CLSID_SampleGrabber, &test_outer, CLSCTX_INPROC_SERVER,
|
hr = CoCreateInstance(&CLSID_SampleGrabber, &test_outer, CLSCTX_INPROC_SERVER,
|
||||||
&IID_IBaseFilter, (void **)&filter);
|
&IID_IBaseFilter, (void **)&filter);
|
||||||
todo_wine ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr);
|
ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr);
|
||||||
ok(!filter, "Got interface %p.\n", filter);
|
ok(!filter, "Got interface %p.\n", filter);
|
||||||
|
|
||||||
hr = CoCreateInstance(&CLSID_SampleGrabber, &test_outer, CLSCTX_INPROC_SERVER,
|
hr = CoCreateInstance(&CLSID_SampleGrabber, &test_outer, CLSCTX_INPROC_SERVER,
|
||||||
|
|
|
@ -74,7 +74,7 @@ static void test_aggregation(void)
|
||||||
timeline = (IAMTimeline *)0xdeadbeef;
|
timeline = (IAMTimeline *)0xdeadbeef;
|
||||||
hr = CoCreateInstance(&CLSID_AMTimeline, &test_outer, CLSCTX_INPROC_SERVER,
|
hr = CoCreateInstance(&CLSID_AMTimeline, &test_outer, CLSCTX_INPROC_SERVER,
|
||||||
&IID_IAMTimeline, (void **)&timeline);
|
&IID_IAMTimeline, (void **)&timeline);
|
||||||
todo_wine ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr);
|
ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr);
|
||||||
ok(!timeline, "Got interface %p.\n", timeline);
|
ok(!timeline, "Got interface %p.\n", timeline);
|
||||||
|
|
||||||
hr = CoCreateInstance(&CLSID_AMTimeline, &test_outer, CLSCTX_INPROC_SERVER,
|
hr = CoCreateInstance(&CLSID_AMTimeline, &test_outer, CLSCTX_INPROC_SERVER,
|
||||||
|
|
Loading…
Reference in New Issue