system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 23:02:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

sti: Allow CoCreateInstance aggregation and fix a broken test.

Browse source
This commit is contained in:
Damjan Jovanovic 2009-10-06 19:15:40 +02:00 committed by Alexandre Julliard
parent 50b8c47d19
commit 0dea7326c3
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/sti/sti_main.c
View file

@ -97,9 +97,6 @@ static HRESULT WINAPI sti_cf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOu
*ppobj = NULL;
if (pOuter)
return CLASS_E_NOAGGREGATION;
r = This->pfnCreateInstance( riid, pOuter, (LPVOID *)&punk );
if (FAILED(r))
return r;

4
dlls/sti/tests/sti.c
View file

@ -218,7 +218,9 @@ static void test_stillimage_aggregation(void)
if (SUCCEEDED(hr))
IStillImage_Release(pStiW);
hr = CoCreateInstance(&CLSID_Sti, &aggregator, CLSCTX_ALL, &IID_IUnknown, (void**)&pUnknown);
ok(FAILED(hr), "CoCreateInstance unexpectedly succeeded when querying for IUnknown during aggregation\n");
ok(SUCCEEDED(hr) ||
broken(hr == CLASS_E_NOAGGREGATION), /* Win 2000 */
"CoCreateInstance unexpectedly failed when querying for IUnknown during aggregation, hr = 0x%x\n", hr);
if (SUCCEEDED(hr))
IUnknown_Release(pUnknown);
}