ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Use internal jsdisp calls only within the same script context. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-01-30 15:49:53 +01:00 committed by Alexandre Julliard
parent 722469254d
commit 614ea7e624
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/jscript/dispex.c
View File

@ -1951,7 +1951,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns
HRESULT hres; HRESULT hres;
jsdisp = iface_to_jsdisp(disp); jsdisp = iface_to_jsdisp(disp);
if(jsdisp) { if(jsdisp && jsdisp->ctx == ctx) {
if(flags & DISPATCH_PROPERTYPUT) { if(flags & DISPATCH_PROPERTYPUT) {
FIXME("disp_call(propput) on builtin object\n"); FIXME("disp_call(propput) on builtin object\n");
return E_FAIL; return E_FAIL;
@ -2046,7 +2046,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W
assert(!(flags & ~(DISPATCH_METHOD|DISPATCH_CONSTRUCT|DISPATCH_JSCRIPT_INTERNAL_MASK))); assert(!(flags & ~(DISPATCH_METHOD|DISPATCH_CONSTRUCT|DISPATCH_JSCRIPT_INTERNAL_MASK)));
jsdisp = iface_to_jsdisp(disp); jsdisp = iface_to_jsdisp(disp);
if(jsdisp) { if(jsdisp && jsdisp->ctx == ctx) {
if(ctx != jsdisp->ctx) if(ctx != jsdisp->ctx)
flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK;
hres = jsdisp_call_value(jsdisp, jsthis, flags, argc, argv, r); hres = jsdisp_call_value(jsdisp, jsthis, flags, argc, argv, r);
@ -2170,7 +2170,7 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t val)
HRESULT hres; HRESULT hres;
jsdisp = iface_to_jsdisp(disp); jsdisp = iface_to_jsdisp(disp);
if(jsdisp) { if(jsdisp && jsdisp->ctx == ctx) {
dispex_prop_t *prop; dispex_prop_t *prop;
prop = get_prop(jsdisp, id); prop = get_prop(jsdisp, id);
@ -2272,7 +2272,7 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val
HRESULT hres; HRESULT hres;
jsdisp = iface_to_jsdisp(disp); jsdisp = iface_to_jsdisp(disp);
if(jsdisp) { if(jsdisp && jsdisp->ctx == ctx) {
hres = jsdisp_propget(jsdisp, id, val); hres = jsdisp_propget(jsdisp, id, val);
jsdisp_release(jsdisp); jsdisp_release(jsdisp);
return hres; return hres;