[PATCH v4 03/10] vbscript: Use a helper function to init the script context.

[Gabriel Ivăncescu]

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/vbscript/vbscript.c | 44 ++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c
index 6d2bb54..a90d6bb 100644
--- a/dlls/vbscript/vbscript.c
+++ b/dlls/vbscript/vbscript.c
@@ -73,6 +73,33 @@ static void change_state(VBScript *This, SCRIPTSTATE state)
         IActiveScriptSite_OnStateChange(This->ctx->site, state);
 }

+static HRESULT init_ctx(VBScript *vbscript)
+{
+    script_ctx_t *ctx;
+    HRESULT hr;
+
+    if (vbscript->ctx) return S_OK;
+
+    ctx = heap_alloc_zero(sizeof(*ctx));
+    if (!ctx) return E_OUTOFMEMORY;
+
+    ctx->safeopt = INTERFACE_USES_DISPEX;
+    heap_pool_init(&ctx->heap);
+    list_init(&ctx->objects);
+    list_init(&ctx->code_list);
+    list_init(&ctx->named_items);
+
+    hr = init_global(ctx);
+    if (FAILED(hr))
+    {
+        heap_free(ctx);
+        return hr;
+    }
+
+    vbscript->ctx = ctx;
+    return S_OK;
+}
+
 static inline BOOL is_started(VBScript *This)
 {
     return This->state == SCRIPTSTATE_STARTED
@@ -938,7 +965,6 @@ static const IObjectSafetyVtbl VBScriptSafetyVtbl = {

HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv)
 {
-    script_ctx_t *ctx;
     VBScript *ret;
     HRESULT hres;

@@ -957,21 +983,9 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU
     ret->ref = 1;
     ret->state = SCRIPTSTATE_UNINITIALIZED;

-    ctx = ret->ctx = heap_alloc_zero(sizeof(*ctx));
-    if(!ctx) {
+    if(FAILED(hres = init_ctx(ret)))
+    {
         heap_free(ret);
-        return E_OUTOFMEMORY;
-    }
-
-    ctx->safeopt = INTERFACE_USES_DISPEX;
-    heap_pool_init(&ctx->heap);
-    list_init(&ctx->objects);
-    list_init(&ctx->code_list);
-    list_init(&ctx->named_items);
-
-    hres = init_global(ctx);
-    if(FAILED(hres)) {
-        IActiveScript_Release(&ret->IActiveScript_iface);
         return hres;
     }