Module: wine Branch: refs/heads/master Commit: d3a5921e8eeaab5f33bb074c77bb04d8ccd0fa0a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d3a5921e8eeaab5f33bb074c... Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 1 22:06:11 2006 +0100 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. --- dlls/shdocvw/navigate.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index f821558..5a6b45a 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -497,6 +497,7 @@ HRESULT navigate_hlink(WebBrowser *This, 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_Navigat 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_Navigat /* 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_Navigat /* Windows calls GetHlinkSite here */ + if(grfHLNF & HLNF_OPENINNEWWINDOW) { + FIXME("Not supported HLNF_OPENINNEWWINDOW\n"); + return E_NOTIMPL; + } + return navigate_hlink(This, mon, pbc, pibsc); }