Juan Lang : shdocvw: Support URLs passed by reference in WebBrowser_Navigate2.
Alexandre Julliard
julliard at winehq.org
Mon Aug 17 11:23:50 CDT 2009
Module: wine
Branch: master
Commit: a3575824eaee5cc8722c901b4df6fc62ad925ca4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3575824eaee5cc8722c901b4df6fc62ad925ca4
Author: Juan Lang <juan.lang at gmail.com>
Date: Fri Aug 14 10:44:11 2009 -0700
shdocvw: Support URLs passed by reference in WebBrowser_Navigate2.
---
dlls/shdocvw/webbrowser.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c
index 5e97961..e54e9ee 100644
--- a/dlls/shdocvw/webbrowser.c
+++ b/dlls/shdocvw/webbrowser.c
@@ -724,6 +724,7 @@ static HRESULT WINAPI WebBrowser_Navigate2(IWebBrowser2 *iface, VARIANT *URL, VA
VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers)
{
WebBrowser *This = WEBBROWSER_THIS(iface);
+ LPCWSTR url;
TRACE("(%p)->(%p %p %p %p %p)\n", This, URL, Flags, TargetFrameName, PostData, Headers);
@@ -733,12 +734,20 @@ static HRESULT WINAPI WebBrowser_Navigate2(IWebBrowser2 *iface, VARIANT *URL, VA
if(!URL)
return S_OK;
- if(V_VT(URL) != VT_BSTR) {
+ switch (V_VT(URL))
+ {
+ case VT_BSTR:
+ url = V_BSTR(URL);
+ break;
+ case VT_BSTR|VT_BYREF:
+ url = *V_BSTRREF(URL);
+ break;
+ default:
FIXME("Unsupported V_VT(URL) %d\n", V_VT(URL));
return E_INVALIDARG;
}
- return navigate_url(&This->doc_host, V_BSTR(URL), Flags, TargetFrameName, PostData, Headers);
+ return navigate_url(&This->doc_host, url, Flags, TargetFrameName, PostData, Headers);
}
static HRESULT WINAPI WebBrowser_QueryStatusWB(IWebBrowser2 *iface, OLECMDID cmdID, OLECMDF *pcmdf)
More information about the wine-cvs
mailing list