From: Jacek Caban <jacek@codeweavers.com>
Date: Tue, 27 Jul 2010 16:15:38 +0000 (+0200)
Subject: shdocvw: Inherit HlinkFrame in InternetExplorer object.
X-Git-Tag: wine-1.3.0~117
X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=cf6d9d6986f8347c154bffa8fa2cf9a47b96fb2e;p=wine%2Feterwine.git

shdocvw: Inherit HlinkFrame in InternetExplorer object.
---

diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c
index 9d661ca707..a484de574c 100644
--- a/dlls/shdocvw/ie.c
+++ b/dlls/shdocvw/ie.c
@@ -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) {
diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c
index fa643feecf..4d7c01c178 100644
--- a/dlls/shdocvw/iexplore.c
+++ b/dlls/shdocvw/iexplore.c
@@ -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;
 
diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h
index a922b9ed20..6fbb20fdb6 100644
--- a/dlls/shdocvw/shdocvw.h
+++ b/dlls/shdocvw/shdocvw.h
@@ -173,6 +173,7 @@ struct WebBrowser {
 
 struct InternetExplorer {
     const IWebBrowser2Vtbl *lpWebBrowser2Vtbl;
+    HlinkFrame hlink_frame;
 
     LONG ref;