Jacek Caban : shdocvw: Inherit HlinkFrame in InternetExplorer object.
Alexandre Julliard
julliard at winehq.org
Wed Jul 28 10:45:08 CDT 2010
Module: wine
Branch: master
Commit: cf6d9d6986f8347c154bffa8fa2cf9a47b96fb2e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf6d9d6986f8347c154bffa8fa2cf9a47b96fb2e
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Jul 27 18:15:38 2010 +0200
shdocvw: Inherit HlinkFrame in InternetExplorer object.
---
dlls/shdocvw/ie.c | 2 ++
dlls/shdocvw/iexplore.c | 2 ++
dlls/shdocvw/shdocvw.h | 1 +
3 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c
index 9d661ca..a484de5 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 fa643fe..4d7c01c 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 a922b9e..6fbb20f 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;
More information about the wine-cvs
mailing list