ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Better handling of IDocHostUIHandler in SetClientSite.

This commit is contained in:
Jacek Caban 2006-01-14 17:04:54 +01:00 committed by Alexandre Julliard
parent 068cedc7f2
commit d44364d3fe
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/mshtml/oleobj.c
View File

@ -73,17 +73,19 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite
if(pClientSite == This->client) if(pClientSite == This->client)
return S_OK; return S_OK;
if(This->client) if(This->client) {
IOleClientSite_Release(This->client); IOleClientSite_Release(This->client);
if(This->hostui)
IDocHostUIHandler_Release(This->hostui);
if(!pClientSite) {
This->client = NULL; This->client = NULL;
return S_OK;
} }
if(This->hostui) {
IDocHostUIHandler_Release(This->hostui);
This->hostui = NULL;
}
if(!pClientSite)
return S_OK;
hres = IOleObject_QueryInterface(pClientSite, &IID_IDocHostUIHandler, (void**)&pDocHostUIHandler); hres = IOleObject_QueryInterface(pClientSite, &IID_IDocHostUIHandler, (void**)&pDocHostUIHandler);
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
DOCHOSTUIINFO hostinfo; DOCHOSTUIINFO hostinfo;
@ -120,6 +122,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite
} }
CoTaskMemFree(override_key_path); CoTaskMemFree(override_key_path);
} }
IDocHostUIHandler2_Release(pDocHostUIHandler2);
} }
This->has_key_path = TRUE; This->has_key_path = TRUE;