[PATCH v4 04/10] vbscript: Destroy the entire script context when the script engine is closed.

[Gabriel Ivăncescu]

When the engine is closed, even the persistent code is removed.

Signed-off-by: Gabriel Ivăncescu 
---

Removing the context altogether is necessary when the script context will
be ref counted, since we can't re-use the existing one. It is also needed
for script persistence to work properly.

This is required because re-initializng a new context when the old one is
closed can potentially fail, and decrease_state shouldn't be able to fail.

So instead it is re-initialized on demand, when necessary.

dlls/vbscript/vbscript.c | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c
index a90d6bb..37fb5e5 100644
--- a/dlls/vbscript/vbscript.c
+++ b/dlls/vbscript/vbscript.c
@@ -225,7 +225,6 @@ static void destroy_script(script_ctx_t *ctx)
     while(!list_empty(&ctx->code_list))
         release_vbscode(LIST_ENTRY(list_head(&ctx->code_list), vbscode_t, entry));

-    release_script(ctx);
     heap_free(ctx);
 }

@@ -248,6 +247,11 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state)
             break;
         release_script(This->ctx);
         This->thread_id = 0;
+        if(state == SCRIPTSTATE_CLOSED)
+        {
+            destroy_script(This->ctx);
+            This->ctx = NULL;
+        }
         break;
     case SCRIPTSTATE_CLOSED:
         break;
@@ -423,7 +427,6 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface)

if(!ref) {
         decrease_state(This, SCRIPTSTATE_CLOSED);
-        destroy_script(This->ctx);
         heap_free(This);
     }

@@ -441,6 +444,9 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript
     if(!pass)
         return E_POINTER;

+    if(FAILED(hres = init_ctx(This)))
+        return hres;
+
     if(This->ctx->site)
         return E_UNEXPECTED;

@@ -767,9 +773,13 @@ static ULONG WINAPI VBScriptParse_Release(IActiveScriptParse *iface)
 static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface)
 {
     VBScript *This = impl_from_IActiveScriptParse(iface);
+    HRESULT hr;

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

+    if(FAILED(hr = init_ctx(This)))
+        return hr;
+
     if(This->is_initialized)
         return E_UNEXPECTED;
     This->is_initialized = TRUE;
@@ -930,12 +940,16 @@ static HRESULT WINAPI VBScriptSafety_GetInterfaceSafetyOptions(IObjectSafety *if
         DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions)
 {
     VBScript *This = impl_from_IObjectSafety(iface);
+    HRESULT hr;

TRACE("(%p)->(%s %p %p)\n", This, debugstr_guid(riid), pdwSupportedOptions, pdwEnabledOptions);

if(!pdwSupportedOptions || !pdwEnabledOptions)
         return E_POINTER;

+    if(FAILED(hr = init_ctx(This)))
+        return hr;
+
     *pdwSupportedOptions = SUPPORTED_OPTIONS;
     *pdwEnabledOptions = This->ctx->safeopt;
     return S_OK;
@@ -945,12 +959,16 @@ static HRESULT WINAPI VBScriptSafety_SetInterfaceSafetyOptions(IObjectSafety *if
         DWORD dwOptionSetMask, DWORD dwEnabledOptions)
 {
     VBScript *This = impl_from_IObjectSafety(iface);
+    HRESULT hr;

TRACE("(%p)->(%s %x %x)\n", This, debugstr_guid(riid), dwOptionSetMask, dwEnabledOptions);

if(dwOptionSetMask & ~SUPPORTED_OPTIONS)
         return E_FAIL;

+    if(FAILED(hr = init_ctx(This)))
+        return hr;
+
     This->ctx->safeopt = (dwEnabledOptions & dwOptionSetMask) | (This->ctx->safeopt & ~dwOptionSetMask) | INTERFACE_USES_DISPEX;
     return S_OK;
 }