system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:54:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

ole32: Don't pass CLSCTX_INPROC_SERVER and CLSCTX_INPROC_HANDLER flags to CoCreateInstance in DefaultHandler_Run.

Browse source
This commit is contained in:
Piotr Caban 2013-02-27 17:59:38 +01:00 committed by Alexandre Julliard
parent 0cf2b77aed
commit c0a17a4f09
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/ole32/defaulthandler.c
View file

@ -1322,7 +1322,7 @@ static HRESULT WINAPI DefaultHandler_Run(
release_delegates(This); release_delegates(This);
hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_ALL, hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER,
&IID_IOleObject, (void **)&This->pOleDelegate); &IID_IOleObject, (void **)&This->pOleDelegate);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;

11
dlls/ole32/tests/defaulthandler.c
View file

@ -36,9 +36,6 @@
#define SET_EXPECT(func) \ #define SET_EXPECT(func) \
expect_ ## func = TRUE expect_ ## func = TRUE
#define GET_EXPECT(func) \
expect_ ## func
#define CHECK_EXPECT2(func) \ #define CHECK_EXPECT2(func) \
do { \ do { \
ok(expect_ ##func, "unexpected call " #func "\n"); \ ok(expect_ ##func, "unexpected call " #func "\n"); \
@ -184,12 +181,6 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r
*ppv = NULL; *ppv = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
}else if(IsEqualGUID(riid, &IID_IClassFactory)) { }else if(IsEqualGUID(riid, &IID_IClassFactory)) {
if(!GET_EXPECT(CF_QueryInterface_ClassFactory)) {
todo_wine CHECK_EXPECT(CF_QueryInterface_ClassFactory);
*ppv = NULL;
return E_NOINTERFACE;
}
CHECK_EXPECT(CF_QueryInterface_ClassFactory); CHECK_EXPECT(CF_QueryInterface_ClassFactory);
*ppv = iface; *ppv = iface;
return S_OK; return S_OK;
@ -268,7 +259,7 @@ static void test_default_handler_run(void)
IUnknown_Release(unk); IUnknown_Release(unk);
hres = IRunnableObject_Run(ro, NULL); hres = IRunnableObject_Run(ro, NULL);
todo_wine ok(hres == REGDB_E_CLASSNOTREG, "Run returned: %x, expected REGDB_E_CLASSNOTREG\n", hres); ok(hres == REGDB_E_CLASSNOTREG, "Run returned: %x, expected REGDB_E_CLASSNOTREG\n", hres);
IRunnableObject_Release(ro); IRunnableObject_Release(ro);
CoRevokeClassObject(class_reg); CoRevokeClassObject(class_reg);