From: "Gabriel Ivăncescu" Subject: [PATCH 05/13] msscript.ocx: Implement parse_script_text on top of modules. Message-Id: Date: Thu, 9 Apr 2020 17:34:32 +0300 In-Reply-To: <311c32ff785fcd554c8d64166530bcc63090f724.1586442574.git.gabrielopcode@gmail.com> References: <311c32ff785fcd554c8d64166530bcc63090f724.1586442574.git.gabrielopcode@gmail.com> Signed-off-by: Gabriel Ivăncescu --- dlls/msscript.ocx/msscript.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 91e6dfa..393f39e 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -255,15 +255,17 @@ static HRESULT start_script(struct ScriptControl *control) return hr; } -static HRESULT parse_script_text(ScriptControl *control, BSTR script_text, DWORD flag, VARIANT *res) +static HRESULT parse_script_text(ScriptModule *module, BSTR script_text, DWORD flag, VARIANT *res) { EXCEPINFO excepinfo; HRESULT hr; - hr = start_script(control); + if (!module->control) return E_FAIL; + + hr = start_script(module->control); if (FAILED(hr)) return hr; - hr = IActiveScriptParse_ParseScriptText(control->host->parse, script_text, NULL, + hr = IActiveScriptParse_ParseScriptText(module->control->host->parse, script_text, module->name, NULL, NULL, 0, 1, flag, res, &excepinfo); /* FIXME: more error handling */ return hr; @@ -761,27 +763,31 @@ static HRESULT WINAPI ScriptModule_AddCode(IScriptModule *iface, BSTR code) { ScriptModule *This = impl_from_IScriptModule(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(code)); + TRACE("(%p)->(%s)\n", This, debugstr_w(code)); - return E_NOTIMPL; + return parse_script_text(This, code, SCRIPTTEXT_ISVISIBLE, NULL); } static HRESULT WINAPI ScriptModule_Eval(IScriptModule *iface, BSTR expression, VARIANT *res) { ScriptModule *This = impl_from_IScriptModule(iface); - FIXME("(%p)->(%s, %p)\n", This, debugstr_w(expression), res); + TRACE("(%p)->(%s, %p)\n", This, debugstr_w(expression), res); - return E_NOTIMPL; + if (!res) + return E_POINTER; + V_VT(res) = VT_EMPTY; + + return parse_script_text(This, expression, SCRIPTTEXT_ISEXPRESSION, res); } static HRESULT WINAPI ScriptModule_ExecuteStatement(IScriptModule *iface, BSTR statement) { ScriptModule *This = impl_from_IScriptModule(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(statement)); + TRACE("(%p)->(%s)\n", This, debugstr_w(statement)); - return E_NOTIMPL; + return parse_script_text(This, statement, 0, NULL); } static HRESULT WINAPI ScriptModule_Run(IScriptModule *iface, BSTR procedure_name, SAFEARRAY **parameters, VARIANT *res) @@ -1460,7 +1466,9 @@ static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) TRACE("(%p)->(%s).\n", This, debugstr_w(code)); - return parse_script_text(This, code, SCRIPTTEXT_ISVISIBLE, NULL); + if (!This->modules) + return E_FAIL; + return parse_script_text(This->modules[0], code, SCRIPTTEXT_ISVISIBLE, NULL); } static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, VARIANT *res) @@ -1473,7 +1481,9 @@ static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, return E_POINTER; V_VT(res) = VT_EMPTY; - return parse_script_text(This, expression, SCRIPTTEXT_ISEXPRESSION, res); + if (!This->modules) + return E_FAIL; + return parse_script_text(This->modules[0], expression, SCRIPTTEXT_ISEXPRESSION, res); } static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR statement) @@ -1482,7 +1492,9 @@ static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR TRACE("(%p)->(%s)\n", This, debugstr_w(statement)); - return parse_script_text(This, statement, 0, NULL); + if (!This->modules) + return E_FAIL; + return parse_script_text(This->modules[0], statement, 0, NULL); } static HRESULT WINAPI ScriptControl_Run(IScriptControl *iface, BSTR procedure_name, SAFEARRAY **parameters, VARIANT *res) -- 2.21.0