[PATCH resend 08/13] msscript.ocx: Implement ScriptModule_Run.
Gabriel Ivăncescu
gabrielopcode at gmail.com
Tue May 26 07:42:02 CDT 2020
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---
dlls/msscript.ocx/msscript.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c
index 3cbc7a4..d5fdca7 100644
--- a/dlls/msscript.ocx/msscript.c
+++ b/dlls/msscript.ocx/msscript.c
@@ -847,10 +847,19 @@ static HRESULT WINAPI ScriptModule_ExecuteStatement(IScriptModule *iface, BSTR s
static HRESULT WINAPI ScriptModule_Run(IScriptModule *iface, BSTR procedure_name, SAFEARRAY **parameters, VARIANT *res)
{
ScriptModule *This = impl_from_IScriptModule(iface);
+ SAFEARRAY *sa;
- FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(procedure_name), parameters, res);
+ TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(procedure_name), parameters, res);
- return E_NOTIMPL;
+ if (!parameters || !res) return E_POINTER;
+ if (!(sa = *parameters)) return E_POINTER;
+
+ V_VT(res) = VT_EMPTY;
+ if (sa->cDims == 0) return DISP_E_BADINDEX;
+ if (!(sa->fFeatures & FADF_VARIANT)) return DISP_E_BADVARTYPE;
+ if (!This->control) return E_FAIL;
+
+ return run_procedure(This, procedure_name, sa, res);
}
static const IScriptModuleVtbl ScriptModuleVtbl = {
--
2.21.0
More information about the wine-devel
mailing list