[PATCH v8 1/3] jscript: Lookup and ref the named item's dispatch first, during interpretion.
Gabriel Ivăncescu
gabrielopcode at gmail.com
Wed Mar 11 08:06:29 CDT 2020
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---
dlls/jscript/engine.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 5b96895..044e32c 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);
@@ -1254,13 +1263,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) {
@@ -2995,6 +3008,8 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi
hres = create_named_item_script_obj(ctx, bytecode->named_item);
if(FAILED(hres)) return hres;
}
+ if(variable_obj == ctx->global)
+ variable_obj = bytecode->named_item->script_obj;
}
if(!ctx->ei->enter_notified) {
--
2.21.0
More information about the wine-devel
mailing list