Commit 59bdd9d0 authored by Gabriel Ivăncescu's avatar Gabriel Ivăncescu Committed by Alexandre Julliard

mshtml: Pass optional args to XMLHttpRequest.open() correctly.

parent 63b38aed
......@@ -546,8 +546,9 @@ static HRESULT HTMLXMLHttpRequest_open_hook(DispatchEx *dispex, WORD flags,
static HRESULT WINAPI HTMLXMLHttpRequest_open(IHTMLXMLHttpRequest *iface, BSTR bstrMethod, BSTR bstrUrl, VARIANT varAsync, VARIANT varUser, VARIANT varPassword)
{
HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface);
nsACString method, url;
nsAString user, password;
nsACString method, url;
unsigned opt_argc = 1;
nsresult nsres;
HRESULT hres;
......@@ -594,8 +595,11 @@ static HRESULT WINAPI HTMLXMLHttpRequest_open(IHTMLXMLHttpRequest *iface, BSTR b
return hres;
}
nsres = nsIXMLHttpRequest_Open(This->nsxhr, &method, &url, TRUE,
&user, &password, 0);
if(V_VT(&varPassword) != VT_EMPTY && V_VT(&varPassword) != VT_ERROR)
opt_argc += 2;
else if(V_VT(&varUser) != VT_EMPTY && V_VT(&varUser) != VT_ERROR)
opt_argc += 1;
nsres = nsIXMLHttpRequest_Open(This->nsxhr, &method, &url, !!V_BOOL(&varAsync), &user, &password, opt_argc);
nsACString_Finish(&method);
nsACString_Finish(&url);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment