Jacek Caban : shdocvw: Check GetContainer result before setting new container.
Alexandre Julliard
julliard at winehq.org
Mon Aug 10 10:35:38 CDT 2009
Module: wine
Branch: master
Commit: 52bade97f46e99331800a4fbe5f4a80300d196d1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=52bade97f46e99331800a4fbe5f4a80300d196d1
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Aug 7 19:02:31 2009 +0200
shdocvw: Check GetContainer result before setting new container.
---
dlls/shdocvw/oleobject.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c
index 017e738..c42aa91 100644
--- a/dlls/shdocvw/oleobject.c
+++ b/dlls/shdocvw/oleobject.c
@@ -152,8 +152,16 @@ static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site)
SWP_NOZORDER | SWP_SHOWWINDOW);
if(This->client) {
+ IOleContainer *container;
+
IOleClientSite_ShowObject(This->client);
- IOleClientSite_GetContainer(This->client, &This->container);
+
+ hres = IOleClientSite_GetContainer(This->client, &container);
+ if(SUCCEEDED(hres)) {
+ if(This->container)
+ IOleContainer_Release(This->container);
+ This->container = container;
+ }
}
if(This->doc_host.frame)
More information about the wine-cvs
mailing list