Jacek Caban : shdocvw: Added get_LocationURL implementation.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Mar 6 12:54:57 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 87e04f2f4a020a4209f051c2ee39f4c0a463d985
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=87e04f2f4a020a4209f051c2ee39f4c0a463d985
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Mar 6 15:53:31 2006 +0100
shdocvw: Added get_LocationURL implementation.
---
dlls/shdocvw/navigate.c | 15 ++++++++++-----
dlls/shdocvw/webbrowser.c | 13 +++++++++++--
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c
index 5a6b45a..d1030d2 100644
--- a/dlls/shdocvw/navigate.c
+++ b/dlls/shdocvw/navigate.c
@@ -315,7 +315,7 @@ static IBindStatusCallback *create_callb
return BINDSC(ret);
}
-static void on_before_navigate2(WebBrowser *This, PBYTE post_data, ULONG post_data_len,
+static void on_before_navigate2(WebBrowser *This, LPWSTR url, PBYTE post_data, ULONG post_data_len,
LPWSTR headers, VARIANT_BOOL *cancel)
{
VARIANT var_url, var_flags, var_frame_name, var_post_data, var_post_data2, var_headers;
@@ -366,13 +366,14 @@ static void on_before_navigate2(WebBrows
V_VT(params+5) = (VT_BYREF|VT_VARIANT);
V_VARIANTREF(params+5) = &var_url;
V_VT(&var_url) = VT_BSTR;
- V_BSTR(&var_url) = SysAllocString(This->url);
+ V_BSTR(&var_url) = SysAllocString(url);
V_VT(params+6) = (VT_DISPATCH);
V_DISPATCH(params+6) = (IDispatch*)WEBBROWSER2(This);
call_sink(This->cp_wbe2, DISPID_BEFORENAVIGATE2, &dispparams);
+ SysFreeString(V_BSTR(&var_url));
if(post_data_len)
SafeArrayDestroy(V_ARRAY(&var_post_data));
}
@@ -472,6 +473,7 @@ HRESULT navigate_hlink(WebBrowser *This,
IBindStatusCallback *callback)
{
IHttpNegotiate *http_negotiate;
+ LPWSTR url = NULL;
PBYTE post_data = NULL;
ULONG post_data_len = 0;
LPWSTR headers = NULL;
@@ -480,8 +482,8 @@ HRESULT navigate_hlink(WebBrowser *This,
DWORD bindf = 0;
HRESULT hres;
- IMoniker_GetDisplayName(mon, NULL, NULL, &This->url);
- TRACE("navigating to %s\n", debugstr_w(This->url));
+ IMoniker_GetDisplayName(mon, NULL, NULL, &url);
+ TRACE("navigating to %s\n", debugstr_w(url));
hres = IBindStatusCallback_QueryInterface(callback, &IID_IHttpNegotiate,
(void**)&http_negotiate);
@@ -504,16 +506,19 @@ HRESULT navigate_hlink(WebBrowser *This,
post_data = bindinfo.stgmedData.u.hGlobal;
}
- on_before_navigate2(This, post_data, post_data_len, headers, &cancel);
+ on_before_navigate2(This, url, post_data, post_data_len, headers, &cancel);
CoTaskMemFree(headers);
ReleaseBindInfo(&bindinfo);
if(cancel) {
FIXME("navigation canceled\n");
+ CoTaskMemFree(url);
return S_OK;
}
+ This->url = url;
+
return navigate(This, mon, bindctx, callback);
}
diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c
index 493a124..a2021e1 100644
--- a/dlls/shdocvw/webbrowser.c
+++ b/dlls/shdocvw/webbrowser.c
@@ -351,8 +351,17 @@ static HRESULT WINAPI WebBrowser_get_Loc
static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *LocationURL)
{
WebBrowser *This = WEBBROWSER_THIS(iface);
+
FIXME("(%p)->(%p)\n", This, LocationURL);
- return E_NOTIMPL;
+
+ if(!This->url) {
+ static const WCHAR null_char = 0;
+ *LocationURL = SysAllocString(&null_char);
+ return S_FALSE;
+ }
+
+ *LocationURL = SysAllocString(This->url);
+ return S_OK;
}
static HRESULT WINAPI WebBrowser_get_Busy(IWebBrowser2 *iface, VARIANT_BOOL *pBool)
@@ -543,7 +552,7 @@ static HRESULT WINAPI WebBrowser_Navigat
return E_INVALIDARG;
headers = V_BSTR(Headers);
- FIXME("Headers: %s\n", debugstr_w(headers));
+ TRACE("Headers: %s\n", debugstr_w(headers));
}
if(!This->doc_view_hwnd)
More information about the wine-cvs
mailing list