shdocvw: Check GetContainer result before setting new container.

52bade97 · Jacek Caban · Alexandre Julliard · e9aaea04 · 52bade97
Commit 52bade97 authored Aug 07, 2009 by Jacek Caban Committed by Alexandre Julliard Aug 10, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

oleobject.c dlls/shdocvw/oleobject.c +9 -1

No files found.
--- 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)