[PATCH v2 2/5] mshtml: Track readyState in XHRs and report it manually.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

So it can be forced to specific values during synchronous XHRs.

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/mshtml/xmlhttprequest.c | 75 +++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 40 deletions(-)

diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c
index 04ee66af6d9..0efe4c3ac85 100644
--- a/dlls/mshtml/xmlhttprequest.c
+++ b/dlls/mshtml/xmlhttprequest.c
@@ -138,6 +138,7 @@ struct HTMLXMLHttpRequest {
     IWineXMLHttpRequestPrivate IWineXMLHttpRequestPrivate_iface;
     IProvideClassInfo2 IProvideClassInfo2_iface;
     LONG ref;
+    LONG readyState;
     response_type_t response_type;
     nsIXMLHttpRequest *nsxhr;
     XMLHttpReqEventListener *event_listener;
@@ -224,6 +225,7 @@ static nsrefcnt NSAPI XMLHttpReqEventListener_Release(nsIDOMEventListener *iface
 static nsresult NSAPI XMLHttpReqEventListener_HandleEvent(nsIDOMEventListener *iface, nsIDOMEvent *nsevent)
 {
     XMLHttpReqEventListener *This = impl_from_nsIDOMEventListener(iface);
+    UINT16 readyState;
     DOMEvent *event;
     HRESULT hres;

@@ -232,6 +234,9 @@ static nsresult NSAPI XMLHttpReqEventListener_HandleEvent(nsIDOMEventListener *i
     if(!This->xhr)
         return NS_OK;

+    if(NS_SUCCEEDED(nsIXMLHttpRequest_GetReadyState(This->xhr->nsxhr, &readyState)))
+        This->xhr->readyState = readyState;
+
     hres = create_event_from_nsevent(nsevent, dispex_compat_mode(&This->xhr->event_target.dispex), &event);
     if(SUCCEEDED(hres) ){
         dispatch_event(&This->xhr->event_target, event);
@@ -344,19 +349,12 @@ static HRESULT WINAPI HTMLXMLHttpRequest_Invoke(IHTMLXMLHttpRequest *iface, DISP
 static HRESULT WINAPI HTMLXMLHttpRequest_get_readyState(IHTMLXMLHttpRequest *iface, LONG *p)
 {
     HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface);
-    UINT16 val;
-    nsresult nsres;

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

if(!p)
         return E_POINTER;
-    nsres = nsIXMLHttpRequest_GetReadyState(This->nsxhr, &val);
-    if(NS_FAILED(nsres)) {
-        ERR("nsIXMLHttpRequest_GetReadyState failed: %08lx\n", nsres);
-        return E_FAIL;
-    }
-    *p = val;
+    *p = This->readyState;
     return S_OK;
 }

@@ -378,6 +376,11 @@ static HRESULT WINAPI HTMLXMLHttpRequest_get_responseText(IHTMLXMLHttpRequest *i
     if(!p)
         return E_POINTER;

+    if(This->readyState < 3) {
+        *p = NULL;
+        return S_OK;
+    }
+
     nsAString_Init(&nsstr, NULL);
     nsres = nsIXMLHttpRequest_GetResponseText(This->nsxhr, &nsstr);
     return return_nsstr(nsres, &nsstr, p);
@@ -394,6 +397,11 @@ static HRESULT WINAPI HTMLXMLHttpRequest_get_responseXML(IHTMLXMLHttpRequest *if

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

+    if(This->readyState < 4) {
+        *p = NULL;
+        return S_OK;
+    }
+
     if(dispex_compat_mode(&This->event_target.dispex) >= COMPAT_MODE_IE10) {
         nsIDOMDocument *nsdoc;
         nsresult nsres;
@@ -448,6 +456,11 @@ static HRESULT WINAPI HTMLXMLHttpRequest_get_status(IHTMLXMLHttpRequest *iface,
     if(!p)
         return E_POINTER;

+    if(This->readyState < 2) {
+        *p = 0;
+        return E_FAIL;
+    }
+
     nsres = nsIXMLHttpRequest_GetStatus(This->nsxhr, &val);
     if(NS_FAILED(nsres)) {
         ERR("nsIXMLHttpRequest_GetStatus failed: %08lx\n", nsres);
@@ -465,19 +478,13 @@ static HRESULT WINAPI HTMLXMLHttpRequest_get_statusText(IHTMLXMLHttpRequest *ifa
     HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface);
     nsACString nscstr;
     nsresult nsres;
-    HRESULT hres;
-    LONG state;

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

if(!p)
         return E_POINTER;

-    hres = IHTMLXMLHttpRequest_get_readyState(iface, &state);
-    if(FAILED(hres))
-        return hres;
-
-    if(state < 2) {
+    if(This->readyState < 2) {
         *p = NULL;
         return E_FAIL;
     }
@@ -518,6 +525,8 @@ static HRESULT WINAPI HTMLXMLHttpRequest_abort(IHTMLXMLHttpRequest *iface)
         return E_FAIL;
     }

+    /* This state change is not broadcast by Gecko, so set it manually */
+    This->readyState = 0;
     return S_OK;
 }

@@ -657,19 +666,13 @@ static HRESULT WINAPI HTMLXMLHttpRequest_getAllResponseHeaders(IHTMLXMLHttpReque
     HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface);
     nsACString nscstr;
     nsresult nsres;
-    HRESULT hres;
-    LONG state;

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

if(!p)
         return E_POINTER;

-    hres = IHTMLXMLHttpRequest_get_readyState(iface, &state);
-    if(FAILED(hres))
-        return hres;
-
-    if(state < 2) {
+    if(This->readyState < 2) {
         *p = NULL;
         return E_FAIL;
     }
@@ -685,8 +688,6 @@ static HRESULT WINAPI HTMLXMLHttpRequest_getResponseHeader(IHTMLXMLHttpRequest *
     nsACString header, ret;
     char *cstr;
     nsresult nsres;
-    HRESULT hres;
-    LONG state;
     TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrHeader), p);

if(!p)
@@ -694,11 +695,7 @@ static HRESULT WINAPI HTMLXMLHttpRequest_getResponseHeader(IHTMLXMLHttpRequest *
     if(!bstrHeader)
         return E_INVALIDARG;

-    hres = IHTMLXMLHttpRequest_get_readyState(iface, &state);
-    if(FAILED(hres))
-        return hres;
-
-    if(state < 2) {
+    if(This->readyState < 2) {
         *p = NULL;
         return E_FAIL;
     }
@@ -939,8 +936,6 @@ static HRESULT WINAPI HTMLXMLHttpRequest_private_get_response(IWineXMLHttpReques
 {
     HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface);
     HRESULT hres = S_OK;
-    nsresult nsres;
-    UINT16 state;

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

@@ -958,8 +953,7 @@ static HRESULT WINAPI HTMLXMLHttpRequest_private_get_response(IWineXMLHttpReques

case response_type_arraybuf:
     case response_type_blob:
-        nsres = nsIXMLHttpRequest_GetReadyState(This->nsxhr, &state);
-        if(NS_FAILED(nsres) || state < 4) {
+        if(This->readyState < 4) {
             V_VT(p) = VT_EMPTY;
             break;
         }
@@ -986,17 +980,11 @@ static HRESULT WINAPI HTMLXMLHttpRequest_private_put_responseType(IWineXMLHttpRe
     HTMLXMLHttpRequest *This = impl_from_IWineXMLHttpRequestPrivate(iface);
     nsAString nsstr;
     nsresult nsres;
-    HRESULT hres;
     unsigned i;
-    LONG state;

TRACE("(%p)->(%s)\n", This, debugstr_w(v));

-    hres = IHTMLXMLHttpRequest_get_readyState(&This->IHTMLXMLHttpRequest_iface, &state);
-    if(FAILED(hres))
-        return hres;
-
-    if(state < 1 || state > 2) {
+    if(This->readyState < 1 || This->readyState > 2) {
         /* FIXME: Return InvalidStateError */
         return E_FAIL;
     }
@@ -1309,6 +1297,9 @@ static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, eventid_t eid)
         This->event_listener->events_mask = 0;
     }

+    if(This->event_listener->events_mask & (1 << i))
+        return;
+
     nsres = nsIXMLHttpRequest_QueryInterface(This->nsxhr, &IID_nsIDOMEventTarget, (void**)&nstarget);
     assert(nsres == NS_OK);

@@ -1489,6 +1480,10 @@ static HRESULT WINAPI HTMLXMLHttpRequestFactory_create(IHTMLXMLHttpRequestFactor
                      &HTMLXMLHttpRequest_dispex, This->window->doc->document_mode);
     ret->ref = 1;

+    /* Always register these handlers because we need them to track state */
+    HTMLXMLHttpRequest_bind_event(&ret->event_target.dispex, EVENTID_READYSTATECHANGE);
+    HTMLXMLHttpRequest_bind_event(&ret->event_target.dispex, EVENTID_PROGRESS);
+
     *p = &ret->IHTMLXMLHttpRequest_iface;
     return S_OK;
 }