[PATCH 2/6] mshtml: Move XMLHttpRequest constructor init to a helper.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

So it can be shared with XDomainRequest constructors.

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

diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c
index 5f4d16fba1d..3dd4561e6ff 100644
--- a/dlls/mshtml/xmlhttprequest.c
+++ b/dlls/mshtml/xmlhttprequest.c
@@ -1646,14 +1646,13 @@ static dispex_static_data_t HTMLXMLHttpRequestFactory_dispex = {
     .iface_tids     = HTMLXMLHttpRequestFactory_iface_tids,
 };

-static HRESULT HTMLXMLHttpRequestFactory_init(struct constructor *constr)
+static HRESULT init_constructor(struct constructor *constr, dispex_static_data_t *dispex, const void *vtbl)
 {
     struct constructor *create;
     HRESULT hres;

-    constr->iface.lpVtbl = (const IUnknownVtbl*)&HTMLXMLHttpRequestFactoryVtbl;
-    init_dispatch(&constr->dispex, &HTMLXMLHttpRequestFactory_dispex, constr->window,
-                  dispex_compat_mode(&constr->window->event_target.dispex));
+    constr->iface.lpVtbl = vtbl;
+    init_dispatch(&constr->dispex, dispex, constr->window, dispex_compat_mode(&constr->window->event_target.dispex));

if(!constr->window->jscript)
         return S_OK;
@@ -1679,6 +1678,11 @@ static HRESULT HTMLXMLHttpRequestFactory_init(struct constructor *constr)
     return hres;
 }

+static HRESULT HTMLXMLHttpRequestFactory_init(struct constructor *constr)
+{
+    return init_constructor(constr, &HTMLXMLHttpRequestFactory_dispex, &HTMLXMLHttpRequestFactoryVtbl);
+}
+
 static const tid_t HTMLXMLHttpRequest_iface_tids[] = {
     IHTMLXMLHttpRequest2_tid,
     0