shdocvw: Inherit HlinkFrame in InternetExplorer object.
authorJacek Caban <jacek@codeweavers.com>
Tue, 27 Jul 2010 16:15:38 +0000 (18:15 +0200)
committerAlexandre Julliard <julliard@winehq.org>
Wed, 28 Jul 2010 14:28:21 +0000 (16:28 +0200)
dlls/shdocvw/ie.c
dlls/shdocvw/iexplore.c
dlls/shdocvw/shdocvw.h

index 9d661ca70710535b51f32093cbbdcff5c034a875..a484de574cbe5867a51bf1bdba445708dbb82dd3 100644 (file)
@@ -47,6 +47,8 @@ static HRESULT WINAPI InternetExplorer_QueryInterface(IWebBrowser2 *iface, REFII
     }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) {
         TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv);
         *ppv = CONPTCONT(&This->doc_host.cps);
+    }else if(HlinkFrame_QI(&This->hlink_frame, riid, ppv)) {
+        return S_OK;
     }
 
     if(*ppv) {
index fa643feecfa67aa995b8906a8bd2a8e6a1ba5549..4d7c01c1786b994c19579244b3b442cabe92ab05 100644 (file)
@@ -279,6 +279,8 @@ HRESULT InternetExplorer_Create(IUnknown *pOuter, REFIID riid, void **ppv)
 
     InternetExplorer_WebBrowser_Init(ret);
 
+    HlinkFrame_Init(&ret->hlink_frame, (IUnknown*)WEBBROWSER2(ret), &ret->doc_host);
+
     create_frame_hwnd(ret);
     ret->doc_host.frame_hwnd = ret->frame_hwnd;
 
index a922b9ed208185ce5b2f3613188a9d13a7cd7b8e..6fbb20fdb64eca4679e30b2ba0d15d6f3b372e07 100644 (file)
@@ -173,6 +173,7 @@ struct WebBrowser {
 
 struct InternetExplorer {
     const IWebBrowser2Vtbl *lpWebBrowser2Vtbl;
+    HlinkFrame hlink_frame;
 
     LONG ref;