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

hhctrl.ocx: Fixed releasing web browser object.

Browse source
This commit is contained in:
Jacek Caban 2007-02-28 03:48:07 +01:00 committed by Alexandre Julliard
parent 24c13b9f8d
commit bf34ca2d03
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
dlls/hhctrl.ocx/webbrowser.c
View file

@ -580,7 +580,7 @@ BOOL InitWebBrowser(HHInfo *info, HWND hwndParent)
if (!iOleClientSiteImpl)
return FALSE;
iOleClientSiteImpl->ref = 0;
iOleClientSiteImpl->ref = 1;
iOleClientSiteImpl->lpVtbl = &MyIOleClientSiteTable;
iOleClientSiteImpl->lpvtblOleInPlaceSite = &MyIOleInPlaceSiteTable;
iOleClientSiteImpl->lpvtblOleInPlaceFrame = &MyIOleInPlaceFrameTable;
@ -632,12 +632,7 @@ error:
void ReleaseWebBrowser(HHInfo *info)
{
if (info->wb_object)
{
IOleObject_Close(info->wb_object, OLECLOSE_NOSAVE);
IOleObject_Release(info->wb_object);
info->wb_object = NULL;
}
HRESULT hres;
if (info->web_browser)
{
@ -650,6 +645,21 @@ void ReleaseWebBrowser(HHInfo *info)
IOleClientSite_Release(info->client_site);
info->client_site = NULL;
}
if(info->wb_object) {
IOleInPlaceSite *inplace;
hres = IOleObject_QueryInterface(info->wb_object, &IID_IOleInPlaceSite, (void**)&inplace);
if(SUCCEEDED(hres)) {
IOleInPlaceSite_OnInPlaceDeactivate(inplace);
IOleInPlaceSite_Release(inplace);
}
IOleObject_SetClientSite(info->wb_object, NULL);
IOleObject_Release(info->wb_object);
info->wb_object = NULL;
}
}
void ResizeWebBrowser(HHInfo *info, DWORD dwWidth, DWORD dwHeight)