[PATCH v3 07/11] mshtml: Factor out XMLHttpRequest's send.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

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

diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c
index db6cd0782eb..cd74589e006 100644
--- a/dlls/mshtml/xmlhttprequest.c
+++ b/dlls/mshtml/xmlhttprequest.c
@@ -837,14 +837,11 @@ static HRESULT WINAPI HTMLXMLHttpRequest_open(IHTMLXMLHttpRequest *iface, BSTR b
     return xhr_open(&This->xhr, bstrMethod, bstrUrl, varAsync, varUser, varPassword);
 }

-static HRESULT WINAPI HTMLXMLHttpRequest_send(IHTMLXMLHttpRequest *iface, VARIANT varBody)
+static HRESULT WINAPI xhr_send(struct xhr *xhr, VARIANT varBody)
 {
-    HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface);
     nsIWritableVariant *nsbody = NULL;
     nsresult nsres = NS_OK;

-    TRACE("(%p)->(%s)\n", This, debugstr_variant(&varBody));
-
     switch(V_VT(&varBody)) {
     case VT_NULL:
     case VT_EMPTY:
@@ -868,10 +865,10 @@ static HRESULT WINAPI HTMLXMLHttpRequest_send(IHTMLXMLHttpRequest *iface, VARIAN
     }

if(NS_SUCCEEDED(nsres)) {
-        if(This->xhr.synchronous)
-            nsres = sync_xhr_send(&This->xhr, (nsIVariant*)nsbody);
+        if(xhr->synchronous)
+            nsres = sync_xhr_send(xhr, (nsIVariant*)nsbody);
         else
-            nsres = nsIXMLHttpRequest_Send(This->xhr.nsxhr, (nsIVariant*)nsbody);
+            nsres = nsIXMLHttpRequest_Send(xhr->nsxhr, (nsIVariant*)nsbody);
     }

if(nsbody)
@@ -884,6 +881,15 @@ static HRESULT WINAPI HTMLXMLHttpRequest_send(IHTMLXMLHttpRequest *iface, VARIAN
     return S_OK;
 }

+static HRESULT WINAPI HTMLXMLHttpRequest_send(IHTMLXMLHttpRequest *iface, VARIANT varBody)
+{
+    HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface);
+
+    TRACE("(%p)->(%s)\n", This, debugstr_variant(&varBody));
+
+    return xhr_send(&This->xhr, varBody);
+}
+
 static HRESULT WINAPI HTMLXMLHttpRequest_getAllResponseHeaders(IHTMLXMLHttpRequest *iface, BSTR *p)
 {
     HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface);