[PATCH v2 0/2] MR10004: jscript: Fix DISPATCH_METHOD | DISPATCH_PROPERTYGET in ES5+ modes.

[Gabriel Ivăncescu]

--
  v2: mshtml/tests: Test calling function object method with return value and
      jscript: Always treat DISPATCH_METHOD | DISPATCH_PROPERTYGET as method call
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10004

[PATCH v2 1/2] jscript: Always treat DISPATCH_METHOD | DISPATCH_PROPERTYGET as method call if arguments are supplied.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu <[e-mail]>

Fixes a regression introduced by a965a5c39fa6da97c3f8f0b5956c5dde3d075b8d
which broke the Adobe cloud installers.

Spotted by Filip Bakreski.

Signed-off-by: Gabriel Ivăncescu <[e-mail]>
---
 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

[PATCH v2 2/2] mshtml/tests: Test calling function object method with return value and arg in legacy modes.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu <[e-mail]>

To validate the DISPATCH_PROPERTYGET | DISPATCH_METHOD from jscript works
as expected.

Signed-off-by: Gabriel Ivăncescu <[e-mail]>
---
 dlls/mshtml/tests/jstest.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html
index 81fbea0c493..dbd38794225 100644
--- a/dlls/mshtml/tests/jstest.html
+++ b/dlls/mshtml/tests/jstest.html
@@ -256,6 +256,16 @@ function test_getter_call() {
     ok(document.all("divid").tagName === "DIV", "document.all('divid').tagName = " + document.all("divid").tagName);
 }
 
+function test_funcobj_call() {
+    var f = document.body.getElementsByTagName;
+    var r = f("winetest");
+    ok(r.length === 0, "r.length = " + r.length);
+
+    f = document.close;
+    r = f("test");
+    ok(r === undefined, "r = " + r);
+}
+
 function test_arg_conv() {
     /* this call would throw if the argument wasn't converted by JScript */
     window.clearInterval("");
@@ -381,6 +391,7 @@ function runTests() {
     test_document_name_as_index();
     test_remove_style_attribute();
     test_getter_call();
+    test_funcobj_call();
     test_attrs();
     test_attribute_collection();
     test_arg_conv();
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10004

[PATCH v2 0/2] MR10004: jscript: Fix DISPATCH_METHOD | DISPATCH_PROPERTYGET in ES5+ modes. - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10004