[PATCH resend 04/13] msscript.ocx: Implement get_script_dispatch on top of modules.

[Gabriel Ivăncescu]

Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---
 dlls/msscript.ocx/msscript.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c
index 6bf41ff..91e6dfa 100644
--- a/dlls/msscript.ocx/msscript.c
+++ b/dlls/msscript.ocx/msscript.c
@@ -71,6 +71,7 @@ typedef struct ScriptModule {
 
     BSTR name;
     ScriptControl *control;
+    IDispatch *script_dispatch;
 } ScriptModule;
 
 typedef struct ScriptHost {
@@ -81,7 +82,6 @@ typedef struct ScriptHost {
 
     IActiveScript *script;
     IActiveScriptParse *parse;
-    IDispatch *script_dispatch;
     SCRIPTSTATE script_state;
     CLSID clsid;
 
@@ -220,14 +220,15 @@ static struct named_item *host_get_named_item(ScriptHost *host, const WCHAR *nam
     return NULL;
 }
 
-static HRESULT get_script_dispatch(struct ScriptControl *control, IDispatch **disp)
+static HRESULT get_script_dispatch(ScriptModule *module, IDispatch **disp)
 {
-    if (!control->host->script_dispatch)
+    if (!module->script_dispatch)
     {
-        HRESULT hr = IActiveScript_GetScriptDispatch(control->host->script, NULL, &control->host->script_dispatch);
+        HRESULT hr = IActiveScript_GetScriptDispatch(module->control->host->script,
+                                                     module->name, &module->script_dispatch);
         if (FAILED(hr)) return hr;
     }
-    *disp = control->host->script_dispatch;
+    *disp = module->script_dispatch;
     return S_OK;
 }
 
@@ -384,10 +385,7 @@ static void release_script_engine(ScriptHost *host)
 
     if (host->parse)
         IActiveScriptParse_Release(host->parse);
-    if (host->script_dispatch)
-        IDispatch_Release(host->script_dispatch);
 
-    host->script_dispatch = NULL;
     host->parse = NULL;
     host->script = NULL;
 
@@ -594,6 +592,8 @@ static const IServiceProviderVtbl ServiceProviderVtbl = {
 
 static void destroy_module(ScriptModule *module)
 {
+    if (module->script_dispatch)
+        IDispatch_Release(module->script_dispatch);
     SysFreeString(module->name);
     heap_free(module);
 }
@@ -994,7 +994,6 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret)
     host->ref = 1;
     host->script = NULL;
     host->parse = NULL;
-    host->script_dispatch = NULL;
     host->clsid = *clsid;
     list_init(&host->named_items);
 
@@ -1505,11 +1504,12 @@ static HRESULT WINAPI ScriptControl_Run(IScriptControl *iface, BSTR procedure_na
     V_VT(res) = VT_EMPTY;
     if (sa->cDims == 0) return DISP_E_BADINDEX;
     if (!(sa->fFeatures & FADF_VARIANT)) return DISP_E_BADVARTYPE;
+    if (!This->modules) return E_FAIL;
 
     hr = start_script(This);
     if (FAILED(hr)) return hr;
 
-    hr = get_script_dispatch(This, &disp);
+    hr = get_script_dispatch(This->modules[0], &disp);
     if (FAILED(hr)) return hr;
 
     hr = IDispatch_GetIDsOfNames(disp, &IID_NULL, &procedure_name, 1, LOCALE_USER_DEFAULT, &dispid);
-- 
2.21.0