Jacek Caban : ieframe: Added implementation of AggregatedNavigation2.
Alexandre Julliard
julliard at winehq.org
Mon Jan 9 14:24:31 CST 2012
Module: wine
Branch: master
Commit: 5fb52f2db0875d3faf0c7b36757d575f48ba3a5f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb52f2db0875d3faf0c7b36757d575f48ba3a5f
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Jan 9 17:56:41 2012 +0100
ieframe: Added implementation of AggregatedNavigation2.
---
dlls/ieframe/navigate.c | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c
index 6a74d2e..8d2636b 100644
--- a/dlls/ieframe/navigate.c
+++ b/dlls/ieframe/navigate.c
@@ -1302,9 +1302,25 @@ static HRESULT WINAPI TargetFramePriv2_AggregatedNavigation2(ITargetFramePriv2 *
IBindStatusCallback *pibsc, LPCWSTR pszTargetName, IUri *pUri, LPCWSTR pszLocation)
{
HlinkFrame *This = impl_from_ITargetFramePriv2(iface);
- FIXME("(%p)->(%x %p %p %s %p %s)\n", This, grfHLNF, pbc, pibsc, debugstr_w(pszTargetName),
+ IMoniker *mon;
+ HRESULT hres;
+
+ TRACE("(%p)->(%x %p %p %s %p %s)\n", This, grfHLNF, pbc, pibsc, debugstr_w(pszTargetName),
pUri, debugstr_w(pszLocation));
- return E_NOTIMPL;
+
+ /*
+ * NOTE: This is an undocumented function. It seems to be working the way it's implemented,
+ * but I couldn't get its tests working. It's used by mshtml to load content in a new
+ * instance of browser.
+ */
+
+ hres = CreateURLMonikerEx2(NULL, pUri, &mon, 0);
+ if(FAILED(hres))
+ return hres;
+
+ hres = navigate_hlink(This->doc_host, mon, pbc, pibsc);
+ IMoniker_Release(mon);
+ return hres;
}
static const ITargetFramePriv2Vtbl TargetFramePriv2Vtbl = {
More information about the wine-cvs
mailing list