Jacek Caban : mshtml: Better handling of IDocHostUIHandler in
SetClientSite.
Alexandre Julliard
julliard at wine.codeweavers.com
Sat Jan 14 10:56:30 CST 2006
Module: wine
Branch: refs/heads/master
Commit: d44364d3fe61dca9d7d3f1189e8d24fcbae2336d
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d44364d3fe61dca9d7d3f1189e8d24fcbae2336d
Author: Jacek Caban <jacek at codeweavers.com>
Date: Sat Jan 14 17:04:54 2006 +0100
mshtml: Better handling of IDocHostUIHandler in SetClientSite.
---
dlls/mshtml/oleobj.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c
index 3c18682..c034d33 100644
--- a/dlls/mshtml/oleobj.c
+++ b/dlls/mshtml/oleobj.c
@@ -73,16 +73,18 @@ static HRESULT WINAPI OleObject_SetClien
if(pClientSite == This->client)
return S_OK;
- if(This->client)
+ if(This->client) {
IOleClientSite_Release(This->client);
+ This->client = NULL;
+ }
- if(This->hostui)
+ if(This->hostui) {
IDocHostUIHandler_Release(This->hostui);
+ This->hostui = NULL;
+ }
- if(!pClientSite) {
- This->client = NULL;
+ if(!pClientSite)
return S_OK;
- }
hres = IOleObject_QueryInterface(pClientSite, &IID_IDocHostUIHandler, (void**)&pDocHostUIHandler);
if(SUCCEEDED(hres)) {
@@ -120,6 +122,7 @@ static HRESULT WINAPI OleObject_SetClien
}
CoTaskMemFree(override_key_path);
}
+ IDocHostUIHandler2_Release(pDocHostUIHandler2);
}
This->has_key_path = TRUE;
More information about the wine-cvs
mailing list