[PATCH v2 5/6] mshtml: Implement timeout for XDomainRequest.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/mshtml/tests/xmlhttprequest.c | 15 +++++++++++++++
 dlls/mshtml/xmlhttprequest.c       | 17 +++++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c
index 903b2218380..23a871f2991 100644
--- a/dlls/mshtml/tests/xmlhttprequest.c
+++ b/dlls/mshtml/tests/xmlhttprequest.c
@@ -1142,6 +1142,7 @@ static void test_xdr(IHTMLDocument2 *doc)
     IHTMLWindow2 *window;
     BSTR bstr, url;
     HRESULT hres;
+    LONG timeout;
     VARIANT v;

hres = IHTMLDocument2_get_parentWindow(doc, &window);
@@ -1200,6 +1201,20 @@ static void test_xdr(IHTMLDocument2 *doc)
     SysFreeString(bstr);
     SysFreeString(url);

+    hres = IHTMLXDomainRequest_get_timeout(xdr, NULL);
+    ok(hres == E_INVALIDARG, "get_timeout returned %08lx\n", hres);
+    hres = IHTMLXDomainRequest_get_timeout(xdr, &timeout);
+    ok(hres == S_OK, "get_timeout returned %08lx\n", hres);
+    ok(timeout == -1, "timeout = %ld\n", timeout);
+
+    hres = IHTMLXDomainRequest_put_timeout(xdr, -1);
+    ok(hres == E_INVALIDARG || broken(hres == E_FAIL), "put_timeout returned %08lx\n", hres);
+    hres = IHTMLXDomainRequest_put_timeout(xdr, 1337);
+    ok(hres == S_OK, "put_timeout returned %08lx\n", hres);
+    hres = IHTMLXDomainRequest_get_timeout(xdr, &timeout);
+    ok(hres == S_OK, "get_timeout returned %08lx\n", hres);
+    ok(timeout == 1337, "timeout = %ld\n", timeout);
+
     V_VT(&v) = VT_BSTR;
     V_BSTR(&v) = SysAllocString(L"test");
     SET_EXPECT(xdomainrequest_onload);
diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c
index fe91e738de7..7d3056d0121 100644
--- a/dlls/mshtml/xmlhttprequest.c
+++ b/dlls/mshtml/xmlhttprequest.c
@@ -1719,18 +1719,27 @@ static HRESULT WINAPI HTMLXDomainRequest_put_timeout(IHTMLXDomainRequest *iface,
 {
     HTMLXMLHttpRequest *This = impl_from_IHTMLXDomainRequest(iface);

-    FIXME("(%p)->(%ld)\n", This, v);
+    TRACE("(%p)->(%ld)\n", This, v);

-    return E_NOTIMPL;
+    if(v < 0)
+        return E_INVALIDARG;
+    return map_nsresult(nsIXMLHttpRequest_SetTimeout(This->nsxhr, v));
 }

static HRESULT WINAPI HTMLXDomainRequest_get_timeout(IHTMLXDomainRequest *iface, LONG *p)
 {
     HTMLXMLHttpRequest *This = impl_from_IHTMLXDomainRequest(iface);
+    nsresult nsres;
+    UINT32 timeout;

-    FIXME("(%p)->(%p)\n", This, p);
+    TRACE("(%p)->(%p)\n", This, p);

-    return E_NOTIMPL;
+    if(!p)
+        return E_INVALIDARG;
+
+    nsres = nsIXMLHttpRequest_GetTimeout(This->nsxhr, &timeout);
+    *p = timeout ? timeout : -1;
+    return map_nsresult(nsres);
 }

static HRESULT WINAPI HTMLXDomainRequest_get_contentType(IHTMLXDomainRequest *iface, BSTR *p)