Jacek Caban : shdocvw: Use OnObjectAvailable in http_load_hack.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6f1c3f3613681a3b7080d9eaef92b1d9e00bf661
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6f1c3f3613681a3b7080d9eaef...

Author: Jacek Caban 
Date:   Thu Jan  3 16:38:44 2008 +0100

shdocvw: Use OnObjectAvailable in http_load_hack.

---

dlls/shdocvw/navigate.c |   27 ++++++++++-----------------
 1 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c
index 43aa3b2..e9c3db1 100644
--- a/dlls/shdocvw/navigate.c
+++ b/dlls/shdocvw/navigate.c
@@ -466,8 +466,8 @@ static BOOL try_application_url(LPCWSTR url)

static HRESULT http_load_hack(DocHost *This, IMoniker *mon, IBindStatusCallback *callback, IBindCtx *bindctx)
 {
-    IOleObject *oleobj;
     IPersistMoniker *persist;
+    IUnknown *doc;
     HRESULT hres;

/*
@@ -478,40 +478,33 @@ static HRESULT http_load_hack(DocHost *This, IMoniker *mon, IBindStatusCallback

hres = CoCreateInstance(&CLSID_HTMLDocument, NULL,
                             CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
-                            &IID_IUnknown, (void**)&This->document);
+                            &IID_IUnknown, (void**)&doc);

if(FAILED(hres)) {
         ERR("Could not create HTMLDocument: %08x\n", hres);
         return hres;
     }

-    hres = IUnknown_QueryInterface(This->document, &IID_IPersistMoniker, (void**)&persist);
+    hres = IUnknown_QueryInterface(doc, &IID_IPersistMoniker, (void**)&persist);
     if(FAILED(hres))
         return hres;

hres = IPersistMoniker_Load(persist, FALSE, mon, bindctx, 0);
     IPersistMoniker_Release(persist);

+    if(SUCCEEDED(hres))
+        hres = IBindStatusCallback_OnObjectAvailable(callback, &IID_IUnknown, doc);
+    else
+        WARN("Load failed: %08x\n", hres);
+
+    IUnknown_Release(doc);
+
     if(This->frame) {
         static const WCHAR empty[] = {0};

IOleInPlaceFrame_SetStatusText(This->frame, empty); /* FIXME */
     }

-    if(FAILED(hres)) {
-        WARN("Load failed: %08x\n", hres);
-        return hres;
-    }
-
-    hres = IUnknown_QueryInterface(This->document, &IID_IOleObject, (void**)&oleobj);
-    if(FAILED(hres))
-        return hres;
-
-    hres = IOleObject_SetClientSite(oleobj, CLIENTSITE(This));
-    IOleObject_Release(oleobj);
-
-    PostMessageW(This->hwnd, WB_WM_NAVIGATE2, 0, 0);
-
     return hres;

}