jscript: Do not pass DISPATCH_JSCRIPT_CALLEREXECSSOURCE flag for calls across…

jscript: Do not pass DISPATCH_JSCRIPT_CALLEREXECSSOURCE flag for calls across different script contexts. Fixes regression in calls between different contexts. Spotted by Nikolay. Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

jscript: Do not pass DISPATCH_JSCRIPT_CALLEREXECSSOURCE flag for calls across…
2f9c2186 · Jacek Caban · Alexandre Julliard · dac252ec · 2f9c2186
Commit 2f9c2186 authored Dec 12, 2017 by Jacek Caban Committed by Alexandre Julliard Dec 12, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

dispex.c dlls/jscript/dispex.c +4 -0

No files found.
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -1103,6 +1103,8 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns
            return E_FAIL;
        }

+        if(ctx != jsdisp->ctx)
+            flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK;
        hres = jsdisp_call(jsdisp, id, flags, argc, argv, ret);
        jsdisp_release(jsdisp);
        return hres;
@@ -1191,6 +1193,8 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W

    jsdisp = iface_to_jsdisp(disp);
    if(jsdisp) {
+        if(ctx != jsdisp->ctx)
+            flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK;
        hres = jsdisp_call_value(jsdisp, jsthis, flags, argc, argv, r);
        jsdisp_release(jsdisp);
        return hres;