ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shdocvw: Don't call hlink_navigate if HLNF_OPENINNEWWINDOW is set. 

- Don't call hlink_navigate if HLNF_OPENINNEWWINDOW is set.
- Remove unneeded call to GetBindInfo.
This commit is contained in:
Jacek Caban 2006-03-01 22:06:11 +01:00 committed by Alexandre Julliard
parent d656f996f1
commit d3a5921e8e
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/shdocvw/navigate.c
View File

@ -497,6 +497,7 @@ HRESULT navigate_hlink(WebBrowser *This, IMoniker *mon, IBindCtx *bindctx,
bindinfo.cbSize = sizeof(bindinfo);
hres = IBindStatusCallback_GetBindInfo(callback, &bindf, &bindinfo);
dump_BINDINFO(&bindinfo);
if(bindinfo.dwBindVerb == BINDVERB_POST) {
post_data_len = bindinfo.cbStgmedData;
if(post_data_len)
@ -558,8 +559,6 @@ static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPB
WebBrowser *This = HLINKFRAME_THIS(iface);
IMoniker *mon;
LPWSTR location = NULL;
BINDINFO bi = {0};
DWORD bindf = 0;
TRACE("(%p)->(%08lx %p %p %p)\n", This, grfHLNF, pbc, pibsc, pihlNavigate);
@ -568,12 +567,6 @@ static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPB
/* Windows calls GetTargetFrameName here. */
memset(&bi, 0, sizeof(bi));
bi.cbSize = sizeof(bi);
IBindStatusCallback_GetBindInfo(pibsc, &bindf, &bi);
dump_BINDINFO(&bi);
IHlink_GetMonikerReference(pihlNavigate, 1, &mon, &location);
if(location) {
@ -583,6 +576,11 @@ static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPB
/* Windows calls GetHlinkSite here */
if(grfHLNF & HLNF_OPENINNEWWINDOW) {
FIXME("Not supported HLNF_OPENINNEWWINDOW\n");
return E_NOTIMPL;
}
return navigate_hlink(This, mon, pbc, pibsc);
}