From: "Gabriel Ivăncescu" Subject: [PATCH] msscript.ocx: Supply the ServiceProvider in IScriptControl::Run. Message-Id: <3ac3c8d1a5be70c0f2bafa15632cb56ad89ca75b.1570024124.git.gabrielopcode@gmail.com> Date: Wed, 2 Oct 2019 16:49:06 +0300 Signed-off-by: Gabriel Ivăncescu --- Even though it's a stub for now, it's the reason Windows uses InvokeEx in the first place. Sorry for the oversight. dlls/msscript.ocx/msscript.c | 2 +- dlls/msscript.ocx/tests/msscript.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c4c6485..0086ec2 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1105,7 +1105,7 @@ static HRESULT WINAPI ScriptControl_Run(IScriptControl *iface, BSTR procedure_na else { hr = IDispatchEx_InvokeEx(dispex, dispid, LOCALE_USER_DEFAULT, - DISPATCH_METHOD, &dp, res, NULL, NULL); + DISPATCH_METHOD, &dp, res, NULL, &This->host->IServiceProvider_iface); IDispatchEx_Release(dispex); } } diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 7693f0b..c835d64 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -329,6 +329,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc ok(lcid == LOCALE_USER_DEFAULT, "unexpected lcid %u.\n", lcid); ok(wFlags == DISPATCH_METHOD, "unexpected wFlags %u.\n", wFlags); ok(id == 0xdeadbeef, "unexpected id %d.\n", id); + ok(!!pspCaller, "unexpected NULL ServiceProvider.\n"); ok(pdp->cNamedArgs == 0, "unexpected number of named args %u.\n", pdp->cNamedArgs); ok(!pdp->rgdispidNamedArgs, "unexpected named args array %p.\n", pdp->rgdispidNamedArgs); ok(pdp->cArgs == 2, "unexpected number of args %u.\n", pdp->cArgs); -- 2.21.0