Gabriel Ivăncescu : jscript: Lookup and ref the named item's dispatch first, during interpretion.
Alexandre Julliard
julliard at winehq.org
Wed Mar 18 15:42:02 CDT 2020
Module: wine
Branch: master
Commit: 0cc48cfd87e698a304e882312b82f106447a390d
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cc48cfd87e698a304e882312b82f106447a390d
Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date: Wed Mar 18 15:19:49 2020 +0200
jscript: Lookup and ref the named item's dispatch first, during interpretion.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/jscript/engine.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 59f37779a1..896ba6067c 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -669,6 +669,15 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re
return S_OK;
}
}
+
+ if(ctx->call_ctx->bytecode->named_item) {
+ jsdisp_t *script_obj = ctx->call_ctx->bytecode->named_item->script_obj;
+ hres = jsdisp_get_id(script_obj, identifier, 0, &id);
+ if(SUCCEEDED(hres)) {
+ exprval_set_disp_ref(ret, to_disp(script_obj), id);
+ return S_OK;
+ }
+ }
}
hres = jsdisp_get_id(ctx->global, identifier, 0, &id);
@@ -1260,13 +1269,17 @@ static HRESULT interp_identifier_ref(script_ctx_t *ctx, BSTR identifier, unsigne
return hres;
if(exprval.type == EXPRVAL_INVALID && (flags & fdexNameEnsure)) {
+ jsdisp_t *script_obj = ctx->global;
DISPID id;
- hres = jsdisp_get_id(ctx->global, identifier, fdexNameEnsure, &id);
+ if(ctx->call_ctx->bytecode->named_item)
+ script_obj = ctx->call_ctx->bytecode->named_item->script_obj;
+
+ hres = jsdisp_get_id(script_obj, identifier, fdexNameEnsure, &id);
if(FAILED(hres))
return hres;
- exprval_set_disp_ref(&exprval, to_disp(ctx->global), id);
+ exprval_set_disp_ref(&exprval, to_disp(script_obj), id);
}
if(exprval.type == EXPRVAL_JSVAL || exprval.type == EXPRVAL_INVALID) {
More information about the wine-cvs
mailing list