From: Gabriel Ivăncescu <gabrielopcode@gmail.com> Fixes a regression introduced by a965a5c39fa6da97c3f8f0b5956c5dde3d075b8d which broke the Adobe cloud installers. Spotted by Filip Bakreski. Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com> --- dlls/jscript/dispex.c | 2 +- dlls/mshtml/tests/dom.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index dc2ff9f6a55..14eb30b03c5 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2137,7 +2137,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IWineJSDispatch *iface, DISPID id, LCI IServiceProvider_AddRef(pspCaller); if(wFlags == (DISPATCH_METHOD | DISPATCH_PROPERTYGET)) - wFlags = (This->ctx->version < SCRIPTLANGUAGEVERSION_ES5) ? DISPATCH_METHOD : DISPATCH_PROPERTYGET; + wFlags = (This->ctx->version < SCRIPTLANGUAGEVERSION_ES5 || pdp->cArgs) ? DISPATCH_METHOD : DISPATCH_PROPERTYGET; switch(wFlags) { case DISPATCH_METHOD: diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 58a409a7a77..0a8398f935d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -11735,9 +11735,9 @@ static void test_method_vs_getter(IHTMLDocument2 *doc) { DISPPARAMS dp = { 0 }; IDispatchEx *dispex; + VARIANT v, arg; DISPID dispid; HRESULT hres; - VARIANT v; BSTR bstr; hres = IHTMLDocument2_QueryInterface(doc, &IID_IDispatchEx, (void**)&dispex); @@ -11785,6 +11785,15 @@ static void test_method_vs_getter(IHTMLDocument2 *doc) } VariantClear(&v); + dp.cArgs = 1; + dp.rgvarg = &arg; + V_VT(&arg) = VT_I4; + V_I4(&arg) = 42; + hres = IDispatchEx_InvokeEx(dispex, dispid, LOCALE_NEUTRAL, DISPATCH_METHOD | DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); + ok(V_VT(&v) == VT_EMPTY, "V_VT = %d\n", V_VT(&v)); + + dp.cArgs = 0; hres = IDispatchEx_InvokeEx(dispex, dispid, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres); ok(V_VT(&v) == VT_DISPATCH, "V_VT = %d\n", V_VT(&v)); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10004