March 2016 - Wine-commits - list.winehq.org

Jacek Caban : jscript: Pass script context instead of execution context to op handlers.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 9e03bb2ecea25e22a30fbc4eac659e13a22b8b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e03bb2ecea25e22a30fbc4ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 17:49:14 2016 +0100 jscript: Pass script context instead of execution context to op handlers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 423 ++++++++++++++++++++++++++------------------------ 1 file changed, 218 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e03bb2ecea25e22a30fb…

1 0

Jacek Caban : jscript: Moved stack from execution context to script context.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 0224f1829b34f260291e810706e69b7a1d6f0191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0224f1829b34f260291e81070… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 17:49:24 2016 +0100 jscript: Moved stack from execution context to script context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 42 ++++++++++++++++++------------------------ dlls/jscript/engine.h | 3 --- dlls/jscript/jscript.c | 2 ++ dlls/jscript/jscript.h | 4 ++++ 4 files changed, 24 insertions(+), 27 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d459939..c74aa75 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -61,15 +61,14 @@ typedef struct { } u; } exprval_t; -static HRESULT stack_push(script_ctx_t *script_ctx, jsval_t v) +static HRESULT stack_push(script_ctx_t *ctx, jsval_t v) { - exec_ctx_t *ctx = script_ctx->call_ctx->exec_ctx; if(!ctx->stack_size) { ctx->stack = heap_alloc(16*sizeof(*ctx->stack)); if(!ctx->stack) return E_OUTOFMEMORY; ctx->stack_size = 16; - }else if(ctx->stack_size == ctx->top) { + }else if(ctx->stack_size == ctx->stack_top) { jsval_t *new_stack; new_stack = heap_realloc(ctx->stack, ctx->stack_size*2*sizeof(*new_stack)); @@ -82,7 +81,7 @@ static HRESULT stack_push(script_ctx_t *script_ctx, jsval_t v) ctx->stack_size *= 2; } - ctx->stack[ctx->top++] = v; + ctx->stack[ctx->stack_top++] = v; return S_OK; } @@ -110,32 +109,28 @@ static HRESULT stack_push_objid(script_ctx_t *ctx, IDispatch *disp, DISPID id) static inline jsval_t stack_top(script_ctx_t *ctx) { - exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; - assert(exec_ctx->top > ctx->call_ctx->stack_base); - return exec_ctx->stack[exec_ctx->top-1]; + assert(ctx->stack_top > ctx->call_ctx->stack_base); + return ctx->stack[ctx->stack_top-1]; } static inline jsval_t stack_topn(script_ctx_t *ctx, unsigned n) { - exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; - assert(exec_ctx->top > ctx->call_ctx->stack_base+n); - return exec_ctx->stack[exec_ctx->top-1-n]; + assert(ctx->stack_top > ctx->call_ctx->stack_base+n); + return ctx->stack[ctx->stack_top-1-n]; } -static inline jsval_t *stack_args(script_ctx_t *script_ctx, unsigned n) +static inline jsval_t *stack_args(script_ctx_t *ctx, unsigned n) { - exec_ctx_t *ctx = script_ctx->call_ctx->exec_ctx; if(!n) return NULL; - assert(ctx->top > script_ctx->call_ctx->stack_base+n-1); - return ctx->stack + ctx->top-n; + assert(ctx->stack_top > ctx->call_ctx->stack_base+n-1); + return ctx->stack + ctx->stack_top-n; } static inline jsval_t stack_pop(script_ctx_t *ctx) { - exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; - assert(exec_ctx->top > ctx->call_ctx->stack_base); - return exec_ctx->stack[--exec_ctx->top]; + assert(ctx->stack_top > ctx->call_ctx->stack_base); + return ctx->stack[--ctx->stack_top]; } static void stack_popn(script_ctx_t *ctx, unsigned n) @@ -355,7 +350,6 @@ void exec_release(exec_ctx_t *ctx) if(ctx->script) script_release(ctx->script); jsval_release(ctx->ret); - heap_free(ctx->stack); heap_free(ctx); } @@ -778,7 +772,7 @@ static HRESULT interp_push_except(script_ctx_t *ctx) TRACE("\n"); - stack_top = ctx->call_ctx->exec_ctx->top; + stack_top = ctx->stack_top; if(!arg2) { HRESULT hres; @@ -2435,8 +2429,8 @@ static HRESULT unwind_exception(script_ctx_t *ctx) except_frame = frame->except_frame; frame->except_frame = except_frame->next; - assert(except_frame->stack_top <= frame->exec_ctx->top); - stack_popn(ctx, frame->exec_ctx->top - except_frame->stack_top); + assert(except_frame->stack_top <= ctx->stack_top); + stack_popn(ctx, ctx->stack_top - except_frame->stack_top); while(except_frame->scope != frame->scope) scope_pop(&frame->scope); @@ -2509,10 +2503,10 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t if(FAILED(hres)) { while(frame->scope != frame->base_scope) scope_pop(&frame->scope); - stack_popn(ctx, exec_ctx->top-frame->stack_base); + stack_popn(ctx, ctx->stack_top-frame->stack_base); } - assert(exec_ctx->top == frame->stack_base); + assert(ctx->stack_top == frame->stack_base); assert(frame->scope == frame->base_scope); ctx->call_ctx = frame->prev_frame; release_call_frame(frame); @@ -2573,7 +2567,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ frame->bytecode = bytecode; frame->function = function; frame->ip = function->instr_off; - frame->stack_base = ctx->top; + frame->stack_base = ctx->script->stack_top; if(scope) frame->base_scope = frame->scope = scope_addref(scope); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 82ff4ed..6c738ebe 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -213,9 +213,6 @@ struct _exec_ctx_t { IDispatch *this_obj; BOOL is_global; - jsval_t *stack; - unsigned stack_size; - unsigned top; jsval_t ret; }; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 13a5b47..c5c7705 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -74,6 +74,8 @@ void script_release(script_ctx_t *ctx) heap_pool_free(&ctx->tmp_heap); if(ctx->last_match) jsstr_release(ctx->last_match); + assert(!ctx->stack_top); + heap_free(ctx->stack); ctx->jscaller->ctx = NULL; IServiceProvider_Release(&ctx->jscaller->IServiceProvider_iface); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 18be0c1..1c7303e 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -400,6 +400,10 @@ struct _script_ctx_t { IDispatch *host_global; + jsval_t *stack; + unsigned stack_size; + unsigned stack_top; + jsstr_t *last_match; match_result_t match_parens[9]; DWORD last_match_index;

1 0

Jacek Caban : jscript: Store this object in call_frame_t.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 0db7059663dd54f73107e623c122251f354e78eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0db7059663dd54f73107e623c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 17:49:37 2016 +0100 jscript: Store this object in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 61 +++++++++++++++++++++++++------------------------ dlls/jscript/engine.h | 7 +++--- dlls/jscript/function.c | 4 ++-- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 8 +++---- 5 files changed, 42 insertions(+), 40 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c74aa75..15f71bd 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -295,7 +295,7 @@ void scope_release(scope_chain_t *scope) heap_free(scope); } -HRESULT create_exec_ctx(script_ctx_t *script_ctx, IDispatch *this_obj, jsdisp_t *var_disp, +HRESULT create_exec_ctx(script_ctx_t *script_ctx, jsdisp_t *var_disp, BOOL is_global, exec_ctx_t **ret) { exec_ctx_t *ctx; @@ -308,26 +308,6 @@ HRESULT create_exec_ctx(script_ctx_t *script_ctx, IDispatch *this_obj, jsdisp_t ctx->is_global = is_global; ctx->ret = jsval_undefined(); - /* ECMA-262 3rd Edition 11.2.3.7 */ - if(this_obj) { - jsdisp_t *jsthis; - - jsthis = iface_to_jsdisp((IUnknown*)this_obj); - if(jsthis) { - if(jsthis->builtin_info->class == JSCLASS_GLOBAL || jsthis->builtin_info->class == JSCLASS_NONE) - this_obj = NULL; - jsdisp_release(jsthis); - } - } - - if(this_obj) - ctx->this_obj = this_obj; - else if(script_ctx->host_global) - ctx->this_obj = script_ctx->host_global; - else - ctx->this_obj = to_disp(script_ctx->global); - IDispatch_AddRef(ctx->this_obj); - jsdisp_addref(var_disp); ctx->var_disp = var_disp; @@ -345,8 +325,6 @@ void exec_release(exec_ctx_t *ctx) if(ctx->var_disp) jsdisp_release(ctx->var_disp); - if(ctx->this_obj) - IDispatch_Release(ctx->this_obj); if(ctx->script) script_release(ctx->script); jsval_release(ctx->ret); @@ -1067,13 +1045,12 @@ static HRESULT interp_call_member(script_ctx_t *ctx) /* ECMA-262 3rd Edition 11.1.1 */ static HRESULT interp_this(script_ctx_t *ctx) { - IDispatch *this_obj; + call_frame_t *frame = ctx->call_ctx; TRACE("\n"); - this_obj = ctx->call_ctx->exec_ctx->this_obj; - IDispatch_AddRef(this_obj); - return stack_push(ctx, jsval_disp(this_obj)); + IDispatch_AddRef(frame->this_obj); + return stack_push(ctx, jsval_disp(frame->this_obj)); } /* ECMA-262 3rd Edition 10.1.4 */ @@ -2413,6 +2390,8 @@ OP_LIST static void release_call_frame(call_frame_t *frame) { + if(frame->this_obj) + IDispatch_Release(frame->this_obj); if(frame->scope) scope_release(frame->scope); heap_free(frame); @@ -2556,10 +2535,23 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis return hres; } -static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope) +static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, + IDispatch *this_obj) { call_frame_t *frame; + /* ECMA-262 3rd Edition 11.2.3.7 */ + if(this_obj) { + jsdisp_t *jsthis; + + jsthis = iface_to_jsdisp((IUnknown*)this_obj); + if(jsthis) { + if(jsthis->builtin_info->class == JSCLASS_GLOBAL || jsthis->builtin_info->class == JSCLASS_NONE) + this_obj = NULL; + jsdisp_release(jsthis); + } + } + frame = heap_alloc_zero(sizeof(*frame)); if(!frame) return E_OUTOFMEMORY; @@ -2572,6 +2564,14 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ if(scope) frame->base_scope = frame->scope = scope_addref(scope); + if(this_obj) + frame->this_obj = this_obj; + else if(ctx->script->host_global) + frame->this_obj = ctx->script->host_global; + else + frame->this_obj = to_disp(ctx->script->global); + IDispatch_AddRef(frame->this_obj); + frame->exec_ctx = ctx; frame->prev_frame = ctx->script->call_ctx; @@ -2579,7 +2579,8 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ return S_OK; } -HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, scope_chain_t *scope, jsval_t *ret) +HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, scope_chain_t *scope, + IDispatch *this_obj, jsval_t *ret) { jsval_t val; unsigned i; @@ -2614,7 +2615,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, sc } } - hres = setup_call_frame(ctx, code, func, scope); + hres = setup_call_frame(ctx, code, func, scope, this_obj); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 6c738ebe..cd4051f 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -198,6 +198,8 @@ typedef struct _call_frame_t { scope_chain_t *scope; scope_chain_t *base_scope; + IDispatch *this_obj; + bytecode_t *bytecode; function_code_t *function; @@ -210,7 +212,6 @@ struct _exec_ctx_t { script_ctx_t *script; jsdisp_t *var_disp; - IDispatch *this_obj; BOOL is_global; jsval_t ret; @@ -222,6 +223,6 @@ static inline void exec_addref(exec_ctx_t *ctx) } void exec_release(exec_ctx_t*) DECLSPEC_HIDDEN; -HRESULT create_exec_ctx(script_ctx_t*,IDispatch*,jsdisp_t*,BOOL,exec_ctx_t**) DECLSPEC_HIDDEN; -HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT create_exec_ctx(script_ctx_t*,jsdisp_t*,BOOL,exec_ctx_t**) DECLSPEC_HIDDEN; +HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*,jsval_t*) DECLSPEC_HIDDEN; HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 2c378b3..05792bd 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -239,13 +239,13 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis hres = scope_push(function->scope_chain, var_disp, to_disp(var_disp), &scope); if(SUCCEEDED(hres)) { - hres = create_exec_ctx(ctx, this_obj, var_disp, FALSE, &exec_ctx); + hres = create_exec_ctx(ctx, var_disp, FALSE, &exec_ctx); if(SUCCEEDED(hres)) { jsdisp_t *prev_args; prev_args = function->arguments; function->arguments = arg_disp; - hres = exec_source(exec_ctx, function->code, function->func_code, scope, r); + hres = exec_source(exec_ctx, function->code, function->func_code, scope, this_obj, r); function->arguments = prev_args; exec_release(exec_ctx); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index ec3e355..5574f50 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -223,7 +223,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return throw_syntax_error(ctx, hres, NULL); } - hres = exec_source(ctx->call_ctx->exec_ctx, code, &code->global_code, frame->scope, r); + hres = exec_source(ctx->call_ctx->exec_ctx, code, &code->global_code, frame->scope, frame->this_obj, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index c5c7705..3dda22c 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -105,14 +105,14 @@ static HRESULT exec_global_code(JScript *This, bytecode_t *code) exec_ctx_t *exec_ctx; HRESULT hres; - hres = create_exec_ctx(This->ctx, NULL, This->ctx->global, TRUE, &exec_ctx); + hres = create_exec_ctx(This->ctx, This->ctx->global, TRUE, &exec_ctx); if(FAILED(hres)) return hres; IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL); + hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, NULL); exec_release(exec_ctx); IActiveScriptSite_OnLeaveScript(This->site); @@ -776,14 +776,14 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(dwFlags & SCRIPTTEXT_ISEXPRESSION) { exec_ctx_t *exec_ctx; - hres = create_exec_ctx(This->ctx, NULL, This->ctx->global, TRUE, &exec_ctx); + hres = create_exec_ctx(This->ctx, This->ctx->global, TRUE, &exec_ctx); if(SUCCEEDED(hres)) { jsval_t r; IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, NULL, &r); + hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, &r); if(SUCCEEDED(hres)) { if(pvarResult) hres = jsval_to_variant(r, pvarResult);

1 0

Jacek Caban : jscript: Store variable object in call_frame_t.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: b8fb19f160183f480befd7a6b409adebce91b126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8fb19f160183f480befd7a6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 17:49:48 2016 +0100 jscript: Store variable object in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 24 +++++++++++------------- dlls/jscript/engine.h | 6 +++--- dlls/jscript/function.c | 4 ++-- dlls/jscript/global.c | 3 ++- dlls/jscript/jscript.c | 8 ++++---- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 15f71bd..349f932 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -295,8 +295,7 @@ void scope_release(scope_chain_t *scope) heap_free(scope); } -HRESULT create_exec_ctx(script_ctx_t *script_ctx, jsdisp_t *var_disp, - BOOL is_global, exec_ctx_t **ret) +HRESULT create_exec_ctx(script_ctx_t *script_ctx, BOOL is_global, exec_ctx_t **ret) { exec_ctx_t *ctx; @@ -308,9 +307,6 @@ HRESULT create_exec_ctx(script_ctx_t *script_ctx, jsdisp_t *var_disp, ctx->is_global = is_global; ctx->ret = jsval_undefined(); - jsdisp_addref(var_disp); - ctx->var_disp = var_disp; - script_addref(script_ctx); ctx->script = script_ctx; @@ -323,8 +319,6 @@ void exec_release(exec_ctx_t *ctx) if(--ctx->ref) return; - if(ctx->var_disp) - jsdisp_release(ctx->var_disp); if(ctx->script) script_release(ctx->script); jsval_release(ctx->ret); @@ -587,7 +581,7 @@ static HRESULT interp_var_set(script_ctx_t *ctx) TRACE("%s\n", debugstr_w(name)); val = stack_pop(ctx); - hres = jsdisp_propput_name(ctx->call_ctx->exec_ctx->var_disp, name, val); + hres = jsdisp_propput_name(ctx->call_ctx->variable_obj, name, val); jsval_release(val); return hres; } @@ -2390,6 +2384,8 @@ OP_LIST static void release_call_frame(call_frame_t *frame) { + if(frame->variable_obj) + jsdisp_release(frame->variable_obj); if(frame->this_obj) IDispatch_Release(frame->this_obj); if(frame->scope) @@ -2536,7 +2532,7 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis } static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, - IDispatch *this_obj) + IDispatch *this_obj, jsdisp_t *variable_obj) { call_frame_t *frame; @@ -2572,6 +2568,8 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ frame->this_obj = to_disp(ctx->script->global); IDispatch_AddRef(frame->this_obj); + frame->variable_obj = jsdisp_addref(variable_obj); + frame->exec_ctx = ctx; frame->prev_frame = ctx->script->call_ctx; @@ -2580,7 +2578,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ } HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, scope_chain_t *scope, - IDispatch *this_obj, jsval_t *ret) + IDispatch *this_obj, jsdisp_t *variable_obj, jsval_t *ret) { jsval_t val; unsigned i; @@ -2599,7 +2597,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, sc if(func->funcs[i].event_target) hres = bind_event_target(ctx->script, func->funcs+i, func_obj); else - hres = jsdisp_propput_name(ctx->var_disp, func->funcs[i].name, jsval_obj(func_obj)); + hres = jsdisp_propput_name(variable_obj, func->funcs[i].name, jsval_obj(func_obj)); jsdisp_release(func_obj); if(FAILED(hres)) return hres; @@ -2609,13 +2607,13 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, sc if(!ctx->is_global || !lookup_global_members(ctx->script, func->variables[i], NULL)) { DISPID id = 0; - hres = jsdisp_get_id(ctx->var_disp, func->variables[i], fdexNameEnsure, &id); + hres = jsdisp_get_id(variable_obj, func->variables[i], fdexNameEnsure, &id); if(FAILED(hres)) return hres; } } - hres = setup_call_frame(ctx, code, func, scope, this_obj); + hres = setup_call_frame(ctx, code, func, scope, this_obj, variable_obj); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index cd4051f..55ce72a 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -199,6 +199,7 @@ typedef struct _call_frame_t { scope_chain_t *base_scope; IDispatch *this_obj; + jsdisp_t *variable_obj; bytecode_t *bytecode; function_code_t *function; @@ -211,7 +212,6 @@ struct _exec_ctx_t { LONG ref; script_ctx_t *script; - jsdisp_t *var_disp; BOOL is_global; jsval_t ret; @@ -223,6 +223,6 @@ static inline void exec_addref(exec_ctx_t *ctx) } void exec_release(exec_ctx_t*) DECLSPEC_HIDDEN; -HRESULT create_exec_ctx(script_ctx_t*,jsdisp_t*,BOOL,exec_ctx_t**) DECLSPEC_HIDDEN; -HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT create_exec_ctx(script_ctx_t*,BOOL,exec_ctx_t**) DECLSPEC_HIDDEN; +HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 05792bd..8cd363d 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -239,13 +239,13 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis hres = scope_push(function->scope_chain, var_disp, to_disp(var_disp), &scope); if(SUCCEEDED(hres)) { - hres = create_exec_ctx(ctx, var_disp, FALSE, &exec_ctx); + hres = create_exec_ctx(ctx, FALSE, &exec_ctx); if(SUCCEEDED(hres)) { jsdisp_t *prev_args; prev_args = function->arguments; function->arguments = arg_disp; - hres = exec_source(exec_ctx, function->code, function->func_code, scope, this_obj, r); + hres = exec_source(exec_ctx, function->code, function->func_code, scope, this_obj, var_disp, r); function->arguments = prev_args; exec_release(exec_ctx); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 5574f50..73bee82 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -223,7 +223,8 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return throw_syntax_error(ctx, hres, NULL); } - hres = exec_source(ctx->call_ctx->exec_ctx, code, &code->global_code, frame->scope, frame->this_obj, r); + hres = exec_source(ctx->call_ctx->exec_ctx, code, &code->global_code, frame->scope, + frame->this_obj, frame->variable_obj, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 3dda22c..88c1616 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -105,14 +105,14 @@ static HRESULT exec_global_code(JScript *This, bytecode_t *code) exec_ctx_t *exec_ctx; HRESULT hres; - hres = create_exec_ctx(This->ctx, This->ctx->global, TRUE, &exec_ctx); + hres = create_exec_ctx(This->ctx, TRUE, &exec_ctx); if(FAILED(hres)) return hres; IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, NULL); + hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, This->ctx->global, NULL); exec_release(exec_ctx); IActiveScriptSite_OnLeaveScript(This->site); @@ -776,14 +776,14 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(dwFlags & SCRIPTTEXT_ISEXPRESSION) { exec_ctx_t *exec_ctx; - hres = create_exec_ctx(This->ctx, This->ctx->global, TRUE, &exec_ctx); + hres = create_exec_ctx(This->ctx, TRUE, &exec_ctx); if(SUCCEEDED(hres)) { jsval_t r; IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, &r); + hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, This->ctx->global, &r); if(SUCCEEDED(hres)) { if(pvarResult) hres = jsval_to_variant(r, pvarResult);

1 0

Jacek Caban : jscript: Store return value in call_frame_t.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 932ffa0de935734abd1eed030054bd54818bb154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=932ffa0de935734abd1eed030… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 17:49:56 2016 +0100 jscript: Store return value in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 23 ++++++++++++----------- dlls/jscript/engine.h | 4 ++-- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 349f932..0a46b58 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -305,7 +305,6 @@ HRESULT create_exec_ctx(script_ctx_t *script_ctx, BOOL is_global, exec_ctx_t **r ctx->ref = 1; ctx->is_global = is_global; - ctx->ret = jsval_undefined(); script_addref(script_ctx); ctx->script = script_ctx; @@ -321,7 +320,6 @@ void exec_release(exec_ctx_t *ctx) if(ctx->script) script_release(ctx->script); - jsval_release(ctx->ret); heap_free(ctx); } @@ -2361,10 +2359,12 @@ static HRESULT interp_ret(script_ctx_t *ctx) static HRESULT interp_setret(script_ctx_t *ctx) { + call_frame_t *frame = ctx->call_ctx; + TRACE("\n"); - jsval_release(ctx->call_ctx->exec_ctx->ret); - ctx->call_ctx->exec_ctx->ret = stack_pop(ctx); + jsval_release(frame->ret); + frame->ret = stack_pop(ctx); return S_OK; } @@ -2390,6 +2390,7 @@ static void release_call_frame(call_frame_t *frame) IDispatch_Release(frame->this_obj); if(frame->scope) scope_release(frame->scope); + jsval_release(frame->ret); heap_free(frame); } @@ -2447,7 +2448,6 @@ static HRESULT unwind_exception(script_ctx_t *ctx) static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t *ret) { - exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; call_frame_t *frame; jsop_t op; HRESULT hres = S_OK; @@ -2484,14 +2484,14 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t assert(ctx->stack_top == frame->stack_base); assert(frame->scope == frame->base_scope); ctx->call_ctx = frame->prev_frame; - release_call_frame(frame); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) { + *ret = frame->ret; + frame->ret = jsval_undefined(); + } - *ret = exec_ctx->ret; - exec_ctx->ret = jsval_undefined(); - return S_OK; + release_call_frame(frame); + return hres; } static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdisp_t *func_obj) @@ -2556,6 +2556,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ frame->function = function; frame->ip = function->instr_off; frame->stack_base = ctx->script->stack_top; + frame->ret = jsval_undefined(); if(scope) frame->base_scope = frame->scope = scope_addref(scope); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 55ce72a..8b54bd2 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -198,6 +198,8 @@ typedef struct _call_frame_t { scope_chain_t *scope; scope_chain_t *base_scope; + jsval_t ret; + IDispatch *this_obj; jsdisp_t *variable_obj; @@ -213,8 +215,6 @@ struct _exec_ctx_t { script_ctx_t *script; BOOL is_global; - - jsval_t ret; }; static inline void exec_addref(exec_ctx_t *ctx)

1 0

Jacek Caban : jscript: Store is_global flag in call_frame_t.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 00ce4419b4151297559720911d3095bac1757487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ce4419b4151297559720911… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 17:50:06 2016 +0100 jscript: Store is_global flag in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 12 ++++++------ dlls/jscript/engine.h | 6 +++--- dlls/jscript/function.c | 4 ++-- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0a46b58..27c8ad7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -295,7 +295,7 @@ void scope_release(scope_chain_t *scope) heap_free(scope); } -HRESULT create_exec_ctx(script_ctx_t *script_ctx, BOOL is_global, exec_ctx_t **ret) +HRESULT create_exec_ctx(script_ctx_t *script_ctx, exec_ctx_t **ret) { exec_ctx_t *ctx; @@ -304,7 +304,6 @@ HRESULT create_exec_ctx(script_ctx_t *script_ctx, BOOL is_global, exec_ctx_t **r return E_OUTOFMEMORY; ctx->ref = 1; - ctx->is_global = is_global; script_addref(script_ctx); ctx->script = script_ctx; @@ -2532,7 +2531,7 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis } static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, - IDispatch *this_obj, jsdisp_t *variable_obj) + IDispatch *this_obj, BOOL is_global, jsdisp_t *variable_obj) { call_frame_t *frame; @@ -2569,6 +2568,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ frame->this_obj = to_disp(ctx->script->global); IDispatch_AddRef(frame->this_obj); + frame->is_global = is_global; frame->variable_obj = jsdisp_addref(variable_obj); frame->exec_ctx = ctx; @@ -2579,7 +2579,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ } HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, scope_chain_t *scope, - IDispatch *this_obj, jsdisp_t *variable_obj, jsval_t *ret) + IDispatch *this_obj, BOOL is_global, jsdisp_t *variable_obj, jsval_t *ret) { jsval_t val; unsigned i; @@ -2605,7 +2605,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, sc } for(i=0; i < func->var_cnt; i++) { - if(!ctx->is_global || !lookup_global_members(ctx->script, func->variables[i], NULL)) { + if(!is_global || !lookup_global_members(ctx->script, func->variables[i], NULL)) { DISPID id = 0; hres = jsdisp_get_id(variable_obj, func->variables[i], fdexNameEnsure, &id); @@ -2614,7 +2614,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, sc } } - hres = setup_call_frame(ctx, code, func, scope, this_obj, variable_obj); + hres = setup_call_frame(ctx, code, func, scope, this_obj, is_global, variable_obj); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 8b54bd2..b7bb1d2 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -202,6 +202,7 @@ typedef struct _call_frame_t { IDispatch *this_obj; jsdisp_t *variable_obj; + BOOL is_global; bytecode_t *bytecode; function_code_t *function; @@ -214,7 +215,6 @@ struct _exec_ctx_t { LONG ref; script_ctx_t *script; - BOOL is_global; }; static inline void exec_addref(exec_ctx_t *ctx) @@ -223,6 +223,6 @@ static inline void exec_addref(exec_ctx_t *ctx) } void exec_release(exec_ctx_t*) DECLSPEC_HIDDEN; -HRESULT create_exec_ctx(script_ctx_t*,BOOL,exec_ctx_t**) DECLSPEC_HIDDEN; -HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT create_exec_ctx(script_ctx_t*,exec_ctx_t**) DECLSPEC_HIDDEN; +HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*,BOOL,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 8cd363d..84ef469 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -239,13 +239,13 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis hres = scope_push(function->scope_chain, var_disp, to_disp(var_disp), &scope); if(SUCCEEDED(hres)) { - hres = create_exec_ctx(ctx, FALSE, &exec_ctx); + hres = create_exec_ctx(ctx, &exec_ctx); if(SUCCEEDED(hres)) { jsdisp_t *prev_args; prev_args = function->arguments; function->arguments = arg_disp; - hres = exec_source(exec_ctx, function->code, function->func_code, scope, this_obj, var_disp, r); + hres = exec_source(exec_ctx, function->code, function->func_code, scope, this_obj, FALSE, var_disp, r); function->arguments = prev_args; exec_release(exec_ctx); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 73bee82..3249a02 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -224,7 +224,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns } hres = exec_source(ctx->call_ctx->exec_ctx, code, &code->global_code, frame->scope, - frame->this_obj, frame->variable_obj, r); + frame->this_obj, frame->is_global, frame->variable_obj, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 88c1616..2a85dd4 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -105,14 +105,14 @@ static HRESULT exec_global_code(JScript *This, bytecode_t *code) exec_ctx_t *exec_ctx; HRESULT hres; - hres = create_exec_ctx(This->ctx, TRUE, &exec_ctx); + hres = create_exec_ctx(This->ctx, &exec_ctx); if(FAILED(hres)) return hres; IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, This->ctx->global, NULL); + hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, TRUE, This->ctx->global, NULL); exec_release(exec_ctx); IActiveScriptSite_OnLeaveScript(This->site); @@ -776,14 +776,14 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(dwFlags & SCRIPTTEXT_ISEXPRESSION) { exec_ctx_t *exec_ctx; - hres = create_exec_ctx(This->ctx, TRUE, &exec_ctx); + hres = create_exec_ctx(This->ctx, &exec_ctx); if(SUCCEEDED(hres)) { jsval_t r; IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, This->ctx->global, &r); + hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, TRUE, This->ctx->global, &r); if(SUCCEEDED(hres)) { if(pvarResult) hres = jsval_to_variant(r, pvarResult);

1 0

Jacek Caban : jscript: Get rid of no longer needed exec_ctx_t.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 32d9c59868423570a2b0d2aaef31fb6e6ba30fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d9c59868423570a2b0d2aae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 17:50:16 2016 +0100 jscript: Get rid of no longer needed exec_ctx_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 53 +++++++++++-------------------------------------- dlls/jscript/engine.h | 16 +-------------- dlls/jscript/function.c | 16 +++++---------- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 33 ++++++++++-------------------- dlls/jscript/jscript.h | 1 - 6 files changed, 29 insertions(+), 92 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 27c8ad7..f6ade36 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -295,33 +295,6 @@ void scope_release(scope_chain_t *scope) heap_free(scope); } -HRESULT create_exec_ctx(script_ctx_t *script_ctx, exec_ctx_t **ret) -{ - exec_ctx_t *ctx; - - ctx = heap_alloc_zero(sizeof(exec_ctx_t)); - if(!ctx) - return E_OUTOFMEMORY; - - ctx->ref = 1; - - script_addref(script_ctx); - ctx->script = script_ctx; - - *ret = ctx; - return S_OK; -} - -void exec_release(exec_ctx_t *ctx) -{ - if(--ctx->ref) - return; - - if(ctx->script) - script_release(ctx->script); - heap_free(ctx); -} - static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, const WCHAR *name, BSTR name_bstr, DWORD flags, DISPID *id) { IDispatchEx *dispex; @@ -2530,7 +2503,7 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis return hres; } -static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, +static HRESULT setup_call_frame(script_ctx_t *ctx, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, IDispatch *this_obj, BOOL is_global, jsdisp_t *variable_obj) { call_frame_t *frame; @@ -2554,7 +2527,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ frame->bytecode = bytecode; frame->function = function; frame->ip = function->instr_off; - frame->stack_base = ctx->script->stack_top; + frame->stack_base = ctx->stack_top; frame->ret = jsval_undefined(); if(scope) @@ -2562,23 +2535,21 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ if(this_obj) frame->this_obj = this_obj; - else if(ctx->script->host_global) - frame->this_obj = ctx->script->host_global; + else if(ctx->host_global) + frame->this_obj = ctx->host_global; else - frame->this_obj = to_disp(ctx->script->global); + frame->this_obj = to_disp(ctx->global); IDispatch_AddRef(frame->this_obj); frame->is_global = is_global; frame->variable_obj = jsdisp_addref(variable_obj); - frame->exec_ctx = ctx; - - frame->prev_frame = ctx->script->call_ctx; - ctx->script->call_ctx = frame; + frame->prev_frame = ctx->call_ctx; + ctx->call_ctx = frame; return S_OK; } -HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, scope_chain_t *scope, +HRESULT exec_source(script_ctx_t *ctx, bytecode_t *code, function_code_t *func, scope_chain_t *scope, IDispatch *this_obj, BOOL is_global, jsdisp_t *variable_obj, jsval_t *ret) { jsval_t val; @@ -2591,12 +2562,12 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, sc if(!func->funcs[i].name) continue; - hres = create_source_function(ctx->script, code, func->funcs+i, scope, &func_obj); + hres = create_source_function(ctx, code, func->funcs+i, scope, &func_obj); if(FAILED(hres)) return hres; if(func->funcs[i].event_target) - hres = bind_event_target(ctx->script, func->funcs+i, func_obj); + hres = bind_event_target(ctx, func->funcs+i, func_obj); else hres = jsdisp_propput_name(variable_obj, func->funcs[i].name, jsval_obj(func_obj)); jsdisp_release(func_obj); @@ -2605,7 +2576,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, sc } for(i=0; i < func->var_cnt; i++) { - if(!is_global || !lookup_global_members(ctx->script, func->variables[i], NULL)) { + if(!is_global || !lookup_global_members(ctx, func->variables[i], NULL)) { DISPID id = 0; hres = jsdisp_get_id(variable_obj, func->variables[i], fdexNameEnsure, &id); @@ -2618,7 +2589,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, sc if(FAILED(hres)) return hres; - hres = enter_bytecode(ctx->script, func, &val); + hres = enter_bytecode(ctx, func, &val); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index b7bb1d2..3af3eac 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -208,21 +208,7 @@ typedef struct _call_frame_t { function_code_t *function; struct _call_frame_t *prev_frame; - exec_ctx_t *exec_ctx; } call_frame_t; -struct _exec_ctx_t { - LONG ref; - - script_ctx_t *script; -}; - -static inline void exec_addref(exec_ctx_t *ctx) -{ - ctx->ref++; -} - -void exec_release(exec_ctx_t*) DECLSPEC_HIDDEN; -HRESULT create_exec_ctx(script_ctx_t*,exec_ctx_t**) DECLSPEC_HIDDEN; -HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*,BOOL,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; +HRESULT exec_source(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*,BOOL,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 84ef469..0a531a5 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -206,7 +206,6 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis jsval_t *r) { jsdisp_t *var_disp, *arg_disp; - exec_ctx_t *exec_ctx; scope_chain_t *scope; HRESULT hres; @@ -239,17 +238,12 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis hres = scope_push(function->scope_chain, var_disp, to_disp(var_disp), &scope); if(SUCCEEDED(hres)) { - hres = create_exec_ctx(ctx, &exec_ctx); - if(SUCCEEDED(hres)) { - jsdisp_t *prev_args; + jsdisp_t *prev_args; - prev_args = function->arguments; - function->arguments = arg_disp; - hres = exec_source(exec_ctx, function->code, function->func_code, scope, this_obj, FALSE, var_disp, r); - function->arguments = prev_args; - - exec_release(exec_ctx); - } + prev_args = function->arguments; + function->arguments = arg_disp; + hres = exec_source(ctx, function->code, function->func_code, scope, this_obj, FALSE, var_disp, r); + function->arguments = prev_args; scope_release(scope); } diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 3249a02..60a7332 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -223,7 +223,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return throw_syntax_error(ctx, hres, NULL); } - hres = exec_source(ctx->call_ctx->exec_ctx, code, &code->global_code, frame->scope, + hres = exec_source(ctx, code, &code->global_code, frame->scope, frame->this_obj, frame->is_global, frame->variable_obj, r); release_bytecode(code); return hres; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 2a85dd4..ef176db 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -102,18 +102,12 @@ static inline BOOL is_started(script_ctx_t *ctx) static HRESULT exec_global_code(JScript *This, bytecode_t *code) { - exec_ctx_t *exec_ctx; HRESULT hres; - hres = create_exec_ctx(This->ctx, &exec_ctx); - if(FAILED(hres)) - return hres; - IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, TRUE, This->ctx->global, NULL); - exec_release(exec_ctx); + hres = exec_source(This->ctx, code, &code->global_code, NULL, NULL, TRUE, This->ctx->global, NULL); IActiveScriptSite_OnLeaveScript(This->site); return hres; @@ -774,26 +768,19 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, return hres; if(dwFlags & SCRIPTTEXT_ISEXPRESSION) { - exec_ctx_t *exec_ctx; - - hres = create_exec_ctx(This->ctx, &exec_ctx); - if(SUCCEEDED(hres)) { - jsval_t r; - - IActiveScriptSite_OnEnterScript(This->site); + jsval_t r; - clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, NULL, NULL, TRUE, This->ctx->global, &r); - if(SUCCEEDED(hres)) { - if(pvarResult) - hres = jsval_to_variant(r, pvarResult); - jsval_release(r); - } - exec_release(exec_ctx); + IActiveScriptSite_OnEnterScript(This->site); - IActiveScriptSite_OnLeaveScript(This->site); + clear_ei(This->ctx); + hres = exec_source(This->ctx, code, &code->global_code, NULL, NULL, TRUE, This->ctx->global, &r); + if(SUCCEEDED(hres)) { + if(pvarResult) + hres = jsval_to_variant(r, pvarResult); + jsval_release(r); } + IActiveScriptSite_OnLeaveScript(This->site); return hres; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 1c7303e..53272c9 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -36,7 +36,6 @@ typedef struct _jsval_t jsval_t; typedef struct _jsstr_t jsstr_t; typedef struct _script_ctx_t script_ctx_t; -typedef struct _exec_ctx_t exec_ctx_t; typedef struct _dispex_prop_t dispex_prop_t; typedef struct {

1 0

Henri Verbeet : wined3d: Replace context_generate_rt_mask_from_surface() with context_generate_rt_mask_from_resource().
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: adb495ec374ec53730258eca3b281436a4dc7c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb495ec374ec53730258eca3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 25 17:52:25 2016 +0100 wined3d: Replace context_generate_rt_mask_from_surface() with context_generate_rt_mask_from_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d28ebd3..9dbb25d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -335,9 +335,15 @@ static inline DWORD context_generate_rt_mask(GLenum buffer) return buffer ? (1u << 31) | buffer : 0; } -static inline DWORD context_generate_rt_mask_from_surface(const struct wined3d_surface *target) +static inline DWORD context_generate_rt_mask_from_resource(struct wined3d_resource *resource) { - return (1u << 31) | wined3d_texture_get_gl_buffer(target->container); + if (resource->type != WINED3D_RTYPE_TEXTURE_2D) + { + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); + return 0; + } + + return (1u << 31) | wined3d_texture_get_gl_buffer(wined3d_texture_from_resource(resource)); } static inline void context_set_fbo_key_for_surface(const struct wined3d_context *context, @@ -2442,7 +2448,7 @@ static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *conte if (!rt || rt->container->resource.format->id == WINED3DFMT_NULL) return 0; else if (rt->container->swapchain) - return context_generate_rt_mask_from_surface(rt); + return context_generate_rt_mask_from_resource(&rt->container->resource); else return context_generate_rt_mask(context_get_offscreen_gl_buffer(context)); } @@ -2471,7 +2477,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine { context->current_fbo = NULL; context_bind_fbo(context, GL_FRAMEBUFFER, 0); - rt_mask = context_generate_rt_mask_from_surface(rt); + rt_mask = context_generate_rt_mask_from_resource(&rt->container->resource); } } else @@ -2555,7 +2561,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win { context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, WINED3D_LOCATION_DRAWABLE, WINED3D_LOCATION_DRAWABLE); - rt_mask = context_generate_rt_mask_from_surface(wined3d_rendertarget_view_get_surface(rts[0])); + rt_mask = context_generate_rt_mask_from_resource(rts[0]->resource); } /* If the framebuffer is not the device's fb the device's fb has to be reapplied @@ -2633,7 +2639,7 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) return context_generate_rt_mask_no_fbo(context, wined3d_rendertarget_view_get_surface(rts[0])); else if (!context->render_offscreen) - return context_generate_rt_mask_from_surface(wined3d_rendertarget_view_get_surface(rts[0])); + return context_generate_rt_mask_from_resource(rts[0]->resource); rt_mask = ps ? ps->reg_maps.rt_mask : 1; rt_mask &= context->d3d_info->valid_rt_mask;

1 0

Henri Verbeet : wined3d: Pass a texture instead of a surface to context_generate_rt_mask_no_fbo().
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: ee800283faf6f62e9942a4baf1664585da6bc670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee800283faf6f62e9942a4baf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 25 17:52:26 2016 +0100 wined3d: Pass a texture instead of a surface to context_generate_rt_mask_no_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9dbb25d..096cbac 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2443,12 +2443,12 @@ GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) } } -static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *context, const struct wined3d_surface *rt) +static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *context, struct wined3d_texture *rt) { - if (!rt || rt->container->resource.format->id == WINED3DFMT_NULL) + if (!rt || rt->resource.format->id == WINED3DFMT_NULL) return 0; - else if (rt->container->swapchain) - return context_generate_rt_mask_from_resource(&rt->container->resource); + else if (rt->swapchain) + return context_generate_rt_mask_from_resource(&rt->resource); else return context_generate_rt_mask(context_get_offscreen_gl_buffer(context)); } @@ -2482,7 +2482,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine } else { - rt_mask = context_generate_rt_mask_no_fbo(context, rt); + rt_mask = context_generate_rt_mask_no_fbo(context, rt->container); } cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; @@ -2572,7 +2572,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win else { rt_mask = context_generate_rt_mask_no_fbo(context, - rt_count ? wined3d_rendertarget_view_get_surface(rts[0]) : NULL); + rt_count ? wined3d_rendertarget_view_get_surface(rts[0])->container : NULL); } } else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO @@ -2587,7 +2587,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win else { rt_mask = context_generate_rt_mask_no_fbo(context, - rt_count ? wined3d_rendertarget_view_get_surface(rts[0]) : NULL); + rt_count ? wined3d_rendertarget_view_get_surface(rts[0])->container : NULL); } cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; @@ -2637,7 +2637,7 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const unsigned int i; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) - return context_generate_rt_mask_no_fbo(context, wined3d_rendertarget_view_get_surface(rts[0])); + return context_generate_rt_mask_no_fbo(context, wined3d_rendertarget_view_get_surface(rts[0])->container); else if (!context->render_offscreen) return context_generate_rt_mask_from_resource(rts[0]->resource);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_blt() in wined3d_device_copy_resource().
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: f1985edffa88878ef861545e11e252933c5f496b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1985edffa88878ef861545e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 25 17:52:27 2016 +0100 wined3d: Use wined3d_texture_blt() in wined3d_device_copy_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dbfa86c..e2c6e5d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3825,10 +3825,9 @@ float CDECL wined3d_device_get_npatch_mode(const struct wined3d_device *device) void CDECL wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource) { - struct wined3d_surface *dst_surface, *src_surface; struct wined3d_texture *dst_texture, *src_texture; RECT dst_rect, src_rect; - unsigned int i, count; + unsigned int i, j; HRESULT hr; TRACE("device %p, dst_resource %p, src_resource %p.\n", device, dst_resource, src_resource); @@ -3892,17 +3891,22 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, return; } - count = dst_texture->layer_count * dst_texture->level_count; - for (i = 0; i < count; ++i) + for (i = 0; i < dst_texture->level_count; ++i) { - dst_surface = surface_from_resource(wined3d_texture_get_sub_resource(dst_texture, i)); - src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, i)); + SetRect(&dst_rect, 0, 0, + wined3d_texture_get_level_width(dst_texture, i), + wined3d_texture_get_level_height(dst_texture, i)); + SetRect(&src_rect, 0, 0, + wined3d_texture_get_level_width(src_texture, i), + wined3d_texture_get_level_height(dst_texture, i)); + for (j = 0; j < dst_texture->layer_count; ++j) + { + unsigned int idx = j * dst_texture->level_count + i; - SetRect(&dst_rect, 0, 0, dst_surface->resource.width, dst_surface->resource.height); - SetRect(&src_rect, 0, 0, src_surface->resource.width, src_surface->resource.height); - if (FAILED(hr = wined3d_surface_blt(dst_surface, &dst_rect, - src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) - ERR("Failed to blit, sub-resource %u, hr %#x.\n", i, hr); + if (FAILED(hr = wined3d_texture_blt(dst_texture, idx, &dst_rect, + src_texture, idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) + ERR("Failed to blit, sub-resource %u, hr %#x.\n", idx, hr); + } } }

1 0