[PATCH v7 0/2] MR9660: jscript: Treat DISPATCH_PROPERTYGET | DISPATCH_METHOD as property getter in ES5+ modes.

[Gabriel Ivăncescu (＠insn)]

--
  v7: mshtml: Handle DISPATCH_PROPERTYGET | DISPATCH_METHOD in dispex_value as
      jscript: Treat DISPATCH_PROPERTYGET | DISPATCH_METHOD as property getter
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9660

[PATCH v7 1/2] jscript: Treat DISPATCH_PROPERTYGET | DISPATCH_METHOD as property getter in ES5+ modes.

[Gabriel Ivăncescu]

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

Signed-off-by: Gabriel Ivăncescu <[e-mail]>
---
 dlls/jscript/dispex.c   |  8 ++--
 dlls/mshtml/tests/dom.c | 81 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index f39a8cd4b12..dc2ff9f6a55 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -2136,10 +2136,10 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IWineJSDispatch *iface, DISPID id, LCI
     if(pspCaller)
         IServiceProvider_AddRef(pspCaller);
 
+    if(wFlags == (DISPATCH_METHOD | DISPATCH_PROPERTYGET))
+        wFlags = (This->ctx->version < SCRIPTLANGUAGEVERSION_ES5) ? DISPATCH_METHOD : DISPATCH_PROPERTYGET;
+
     switch(wFlags) {
-    case DISPATCH_METHOD|DISPATCH_PROPERTYGET:
-        wFlags = DISPATCH_METHOD;
-        /* fall through */
     case DISPATCH_METHOD:
     case DISPATCH_CONSTRUCT: {
         jsval_t *argv, buf[6], r;
@@ -2712,7 +2712,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns
         jsdisp_release(jsdisp);
 
     flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK;
-    if(ret && argc)
+    if(ret && argc && (!jsdisp || ctx->version < SCRIPTLANGUAGEVERSION_ES5))
         flags |= DISPATCH_PROPERTYGET;
 
     dp.cArgs = argc;
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index 3235cbbaca5..861042bc6eb 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -11731,6 +11731,85 @@ static void test_case_insens(IHTMLDocument2 *doc)
     IDispatchEx_Release(dispex);
 }
 
+static void test_method_vs_getter(IHTMLDocument2 *doc)
+{
+    DISPPARAMS dp = { 0 };
+    IDispatchEx *dispex;
+    DISPID dispid;
+    HRESULT hres;
+    VARIANT v;
+    BSTR bstr;
+
+    hres = IHTMLDocument2_QueryInterface(doc, &IID_IDispatchEx, (void**)&dispex);
+    ok(hres == S_OK, "Could not get IDispatchEx: %08lx\n", hres);
+
+    V_VT(&v) = VT_EMPTY;
+    hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, LOCALE_NEUTRAL, DISPATCH_METHOD | DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL);
+    todo_wine_if(compat_mode < COMPAT_IE9)
+    ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres);
+    todo_wine_if(compat_mode < COMPAT_IE9)
+    ok(V_VT(&v) == VT_BSTR, "V_VT = %d\n", V_VT(&v));
+    VariantClear(&v);
+
+    bstr = SysAllocString(L"body");
+    hres = IDispatchEx_GetDispID(dispex, bstr, 0, &dispid);
+    ok(hres == S_OK, "GetDispID returned: %08lx\n", hres);
+    SysFreeString(bstr);
+
+    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_DISPATCH, "V_VT = %d\n", V_VT(&v));
+    ok(V_DISPATCH(&v) != NULL, "V_DISPATCH == NULL\n");
+    VariantClear(&v);
+
+    bstr = SysAllocString(L"title");
+    hres = IDispatchEx_GetDispID(dispex, bstr, 0, &dispid);
+    ok(hres == S_OK, "GetDispID returned: %08lx\n", hres);
+    SysFreeString(bstr);
+
+    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_BSTR, "V_VT = %d\n", V_VT(&v));
+    VariantClear(&v);
+
+    bstr = SysAllocString(L"close");
+    hres = IDispatchEx_GetDispID(dispex, bstr, 0, &dispid);
+    ok(hres == S_OK, "GetDispID returned: %08lx\n", hres);
+    SysFreeString(bstr);
+
+    hres = IDispatchEx_InvokeEx(dispex, dispid, LOCALE_NEUTRAL, DISPATCH_METHOD | DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL);
+    ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres);
+    if(compat_mode < COMPAT_IE9)
+        ok(V_VT(&v) == VT_EMPTY, "V_VT = %d\n", V_VT(&v));
+    else {
+        ok(V_VT(&v) == VT_DISPATCH, "V_VT = %d\n", V_VT(&v));
+        ok(V_DISPATCH(&v) != NULL, "V_DISPATCH == NULL\n");
+    }
+    VariantClear(&v);
+
+    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));
+    ok(V_DISPATCH(&v) != NULL, "V_DISPATCH == NULL\n");
+    IDispatchEx_Release(dispex);
+
+    hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IDispatchEx, (void**)&dispex);
+    ok(hres == S_OK, "Could not get IDispatchEx: %08lx\n", hres);
+    VariantClear(&v);
+
+    hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, LOCALE_NEUTRAL, DISPATCH_METHOD | DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL);
+    if(compat_mode < COMPAT_IE9)
+        todo_wine
+        ok(hres == E_ACCESSDENIED, "InvokeEx returned: %08lx\n", hres);
+    else {
+        ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres);
+        ok(V_VT(&v) == VT_BSTR, "V_VT = %d\n", V_VT(&v));
+    }
+    VariantClear(&v);
+
+    IDispatchEx_Release(dispex);
+}
+
 static void test_null_write(IHTMLDocument2 *doc)
 {
     HRESULT hres;
@@ -13842,9 +13921,11 @@ START_TEST(dom)
     run_domtest(doc_blank_ie8, test_quirks_mode_perf_toJSON);
     run_domtest(doctype_str, test_doctype);
     run_domtest(case_insens_str, test_case_insens);
+    run_domtest(doc_blank, test_method_vs_getter);
     if(is_ie9plus) {
         compat_mode = COMPAT_IE9;
         run_domtest(emptydiv_ie9_str, test_docfrag);
+        run_domtest(doc_blank_ie9, test_method_vs_getter);
         compat_mode = COMPAT_NONE;
     }
 
-- 
GitLab


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

[PATCH v7 2/2] mshtml: Handle DISPATCH_PROPERTYGET | DISPATCH_METHOD in dispex_value as property getter.

[Gabriel Ivăncescu]

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

Signed-off-by: Gabriel Ivăncescu <[e-mail]>
---
 dlls/mshtml/dispex.c    | 1 +
 dlls/mshtml/tests/dom.c | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c
index 0af89aca630..a6b8afb0543 100644
--- a/dlls/mshtml/dispex.c
+++ b/dlls/mshtml/dispex.c
@@ -868,6 +868,7 @@ static HRESULT dispex_value(DispatchEx *This, LCID lcid, WORD flags, DISPPARAMS
         return This->info->vtbl->value(This, lcid, flags, params, res, ei, caller);
 
     switch(flags) {
+    case DISPATCH_PROPERTYGET | DISPATCH_METHOD:
     case DISPATCH_PROPERTYGET:
         V_VT(res) = VT_BSTR;
         hres = dispex_to_string(This, &V_BSTR(res));
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index 861042bc6eb..58a409a7a77 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -11745,9 +11745,7 @@ static void test_method_vs_getter(IHTMLDocument2 *doc)
 
     V_VT(&v) = VT_EMPTY;
     hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, LOCALE_NEUTRAL, DISPATCH_METHOD | DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL);
-    todo_wine_if(compat_mode < COMPAT_IE9)
     ok(hres == S_OK, "InvokeEx failed: %08lx\n", hres);
-    todo_wine_if(compat_mode < COMPAT_IE9)
     ok(V_VT(&v) == VT_BSTR, "V_VT = %d\n", V_VT(&v));
     VariantClear(&v);
 
-- 
GitLab

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

[PATCH v7 0/2] MR9660: jscript: Treat DISPATCH_PROPERTYGET | DISPATCH_METHOD as property getter in ES5+ modes. - approved

[Jacek Caban (＠jacek)]

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