[PATCH v6 05/11] mshtml: Factor out XMLHttpRequest's abort.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

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

diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c
index f86cd14393b..cb668f52686 100644
--- a/dlls/mshtml/xmlhttprequest.c
+++ b/dlls/mshtml/xmlhttprequest.c
@@ -707,30 +707,36 @@ static HRESULT WINAPI HTMLXMLHttpRequest_get_onreadystatechange(IHTMLXMLHttpRequ
     return get_event_handler(&This->xhr.event_target, EVENTID_READYSTATECHANGE, p);
 }

-static HRESULT WINAPI HTMLXMLHttpRequest_abort(IHTMLXMLHttpRequest *iface)
+static HRESULT WINAPI xhr_abort(struct xhr *xhr)
 {
-    HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface);
-    DWORD prev_magic = This->xhr.magic;
+    DWORD prev_magic = xhr->magic;
     UINT16 ready_state;
     nsresult nsres;

-    TRACE("(%p)->()\n", This);
-
-    This->xhr.magic++;
-    nsres = nsIXMLHttpRequest_SlowAbort(This->xhr.nsxhr);
+    xhr->magic++;
+    nsres = nsIXMLHttpRequest_SlowAbort(xhr->nsxhr);
     if(NS_FAILED(nsres)) {
         ERR("nsIXMLHttpRequest_SlowAbort failed: %08lx\n", nsres);
-        This->xhr.magic = prev_magic;
+        xhr->magic = prev_magic;
         return E_FAIL;
     }

/* Gecko changed to READYSTATE_UNINITIALIZED if it did abort */
-    nsres = nsIXMLHttpRequest_GetReadyState(This->xhr.nsxhr, &ready_state);
+    nsres = nsIXMLHttpRequest_GetReadyState(xhr->nsxhr, &ready_state);
     if(NS_SUCCEEDED(nsres))
-        This->xhr.ready_state = ready_state;
+        xhr->ready_state = ready_state;
     return S_OK;
 }

+static HRESULT WINAPI HTMLXMLHttpRequest_abort(IHTMLXMLHttpRequest *iface)
+{
+    HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface);
+
+    TRACE("(%p)->()\n", This);
+
+    return xhr_abort(&This->xhr);
+}
+
 static HRESULT HTMLXMLHttpRequest_open_hook(DispatchEx *dispex, WORD flags,
         DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller)
 {