Skip to content

W
wine-winehq
Commit 8767356d authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

shdocvw: Get rid of WEBBROWSER_THIS macro and InternetExplorer to IWebBowser2 casts.

parent 878c5d04
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 11 deletions
dlls/shdocvw/iexplore.c
View file @ 8767356d
......@@ -332,7 +332,7 @@ static void ie_navigate(InternetExplorer* This, LPCWSTR url)
V_VT(&variant) = VT_BSTR;
V_BSTR(&variant) = SysAllocString(url);
IWebBrowser2_Navigate2(WEBBROWSER2(This), &variant, NULL, NULL, NULL, NULL);
IWebBrowser2_Navigate2(&This->IWebBrowser2_iface, &variant, NULL, NULL, NULL, NULL);
SysFreeString(V_BSTR(&variant));
}
......@@ -372,7 +372,7 @@ static INT_PTR CALLBACK ie_dialog_open_proc(HWND hwnd, UINT msg, WPARAM wparam,
V_BSTR(&url) = SysAllocStringLen(NULL, len);
GetWindowTextW(hwndurl, V_BSTR(&url), len + 1);
IWebBrowser2_Navigate2(WEBBROWSER2(This), &url, NULL, NULL, NULL, NULL);
IWebBrowser2_Navigate2(&This->IWebBrowser2_iface, &url, NULL, NULL, NULL, NULL);
SysFreeString(V_BSTR(&url));
}
......@@ -530,7 +530,7 @@ static LRESULT iewnd_OnNotify(InternetExplorer *This, WPARAM wparam, LPARAM lpar
V_VT(&vt) = VT_BSTR;
V_BSTR(&vt) = SysAllocString(info->szText);
IWebBrowser2_Navigate2(WEBBROWSER2(This), &vt, NULL, NULL, NULL, NULL);
IWebBrowser2_Navigate2(&This->IWebBrowser2_iface, &vt, NULL, NULL, NULL, NULL);
SysFreeString(V_BSTR(&vt));
......@@ -580,7 +580,7 @@ static LRESULT iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT msg, WPAR
break;
case ID_BROWSE_HOME:
IWebBrowser2_GoHome(WEBBROWSER2(This));
IWebBrowser2_GoHome(&This->IWebBrowser2_iface);
break;
case ID_BROWSE_ABOUT:
......@@ -761,17 +761,17 @@ HRESULT InternetExplorer_Create(IUnknown *pOuter, REFIID riid, void **ppv)
ret = heap_alloc_zero(sizeof(InternetExplorer));
ret->ref = 0;
ret->doc_host.disp = (IDispatch*)WEBBROWSER2(ret);
DocHost_Init(&ret->doc_host, (IDispatch*)WEBBROWSER2(ret), &DocHostContainerVtbl);
ret->doc_host.disp = (IDispatch*)&ret->IWebBrowser2_iface;
DocHost_Init(&ret->doc_host, (IDispatch*)&ret->IWebBrowser2_iface, &DocHostContainerVtbl);
InternetExplorer_WebBrowser_Init(ret);
HlinkFrame_Init(&ret->hlink_frame, (IUnknown*)WEBBROWSER2(ret), &ret->doc_host);
HlinkFrame_Init(&ret->hlink_frame, (IUnknown*)&ret->IWebBrowser2_iface, &ret->doc_host);
create_frame_hwnd(ret);
ret->doc_host.frame_hwnd = ret->frame_hwnd;
hres = IWebBrowser2_QueryInterface(WEBBROWSER2(ret), riid, ppv);
hres = IWebBrowser2_QueryInterface(&ret->IWebBrowser2_iface, riid, ppv);
if(FAILED(hres)) {
heap_free(ret);
return hres;
......
dlls/shdocvw/shdocvw.h
View file @ 8767356d
......@@ -182,7 +182,7 @@ struct WebBrowser {
};
struct InternetExplorer {
const IWebBrowser2Vtbl *lpWebBrowser2Vtbl;
IWebBrowser2 IWebBrowser2_iface;
HlinkFrame hlink_frame;
LONG ref;
......@@ -194,8 +194,6 @@ struct InternetExplorer {
DocHost doc_host;
};
#define WEBBROWSER(x) ((IWebBrowser*) &(x)->lpWebBrowser2Vtbl)
#define WEBBROWSER2(x) ((IWebBrowser2*) &(x)->lpWebBrowser2Vtbl)
#define OLEOBJ(x) ((IOleObject*) &(x)->lpOleObjectVtbl)
#define INPLACEOBJ(x) ((IOleInPlaceObject*) &(x)->lpOleInPlaceObjectVtbl)
#define CONTROL(x) ((IOleControl*) &(x)->lpOleControlVtbl)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment