December 2011 - Wine-Commits

Jacek Caban : jscript: Moved instr_off from statement_t to source_elements_t.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: ee6e6986fb8d93632ba02c63f3f2015cd125c048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee6e6986fb8d93632ba02c63f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:09:29 2011 +0100 jscript: Moved instr_off from statement_t to source_elements_t. --- dlls/jscript/engine.c | 6 +++--- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1cd96a7..9a4ac64 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2755,10 +2755,10 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so rt.type = RT_NORMAL; if(source->statement) { - if(source->statement->instr_off == -1) - hres = compile_subscript_stat(ctx->parser, source->statement, &source->statement->instr_off); + if(source->instr_off == -1) + hres = compile_subscript_stat(ctx->parser, source->statement, &source->instr_off); if(SUCCEEDED(hres)) - hres = enter_bytecode(script, source->statement->instr_off, &rt, &val); + hres = enter_bytecode(script, source->instr_off, &rt, &val); } script->exec_ctx = prev_ctx; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index c984ade..530a65a 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -320,7 +320,6 @@ typedef enum { struct _statement_t { statement_type_t type; statement_eval_t eval; - unsigned instr_off; statement_t *next; }; @@ -508,6 +507,7 @@ struct _source_elements_t { statement_t *statement_tail; function_declaration_t *functions; var_list_t *variables; + unsigned instr_off; }; struct _function_expression_t { diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index a3fe42a..c45fb6e 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -845,7 +845,6 @@ static void *new_statement(parser_ctx_t *ctx, statement_type_t type, size_t size stat->type = type; stat->eval = NULL; - stat->instr_off = -1; stat->next = NULL; return stat; @@ -1472,6 +1471,7 @@ static source_elements_t *new_source_elements(parser_ctx_t *ctx) source_elements_t *ret = parser_alloc(ctx, sizeof(source_elements_t)); memset(ret, 0, sizeof(*ret)); + ret->instr_off = -1; return ret; }

1 0

Jacek Caban : jscript: Always use bytecode for while statement.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: 2dcb8d412f41283d9f7b83a8d1bb55868bda31da URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dcb8d412f41283d9f7b83a8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:07:49 2011 +0100 jscript: Always use bytecode for while statement. --- dlls/jscript/compile.c | 9 +------ dlls/jscript/engine.c | 60 +----------------------------------------------- dlls/jscript/engine.h | 1 - 3 files changed, 2 insertions(+), 68 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 636cdff..127d967 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1015,11 +1015,9 @@ static HRESULT compile_if_statement(compiler_ctx_t *ctx, if_statement_t *stat) static HRESULT compile_while_statement(compiler_ctx_t *ctx, while_statement_t *stat) { statement_ctx_t stat_ctx = {0, FALSE, FALSE}; - unsigned off_backup, jmp_off; + unsigned jmp_off; HRESULT hres; - off_backup = ctx->code_off; - stat_ctx.break_label = alloc_label(ctx); if(stat_ctx.break_label == -1) return E_OUTOFMEMORY; @@ -1050,11 +1048,6 @@ static HRESULT compile_while_statement(compiler_ctx_t *ctx, while_statement_t *s } hres = compile_statement(ctx, &stat_ctx, stat->statement); - if(hres == E_NOTIMPL) { - ctx->code_off = off_backup; - stat->stat.eval = while_statement_eval; - return compile_interp_fallback(ctx, &stat->stat); - } if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 62fdf23..781814a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -56,11 +56,6 @@ struct _except_frame_t { except_frame_t *next; }; -static inline HRESULT stat_eval(script_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) -{ - return stat->eval(ctx, stat, rt, ret); -} - static HRESULT expr_eval(script_ctx_t*,expression_t*,jsexcept_t*,VARIANT*); static HRESULT stack_push(exec_ctx_t *ctx, VARIANT *v) @@ -671,59 +666,6 @@ static HRESULT interp_var_set(exec_ctx_t *ctx) return hres; } -/* ECMA-262 3rd Edition 12.6.2 */ -HRESULT while_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) -{ - while_statement_t *stat = (while_statement_t*)_stat; - VARIANT val, tmp; - VARIANT_BOOL b; - BOOL test_expr; - HRESULT hres; - - TRACE("\n"); - - V_VT(&val) = VT_EMPTY; - test_expr = !stat->do_while; - - while(1) { - if(test_expr) { - hres = expr_eval(ctx, stat->expr, &rt->ei, &tmp); - if(FAILED(hres)) - break; - - hres = to_boolean(&tmp, &b); - VariantClear(&tmp); - if(FAILED(hres) || !b) - break; - }else { - test_expr = TRUE; - } - - hres = stat_eval(ctx, stat->statement, rt, &tmp); - if(FAILED(hres)) - break; - - VariantClear(&val); - val = tmp; - - if(rt->type == RT_CONTINUE) - rt->type = RT_NORMAL; - if(rt->type != RT_NORMAL) - break; - } - - if(FAILED(hres)) { - VariantClear(&val); - return hres; - } - - if(rt->type == RT_BREAK) - rt->type = RT_NORMAL; - - *ret = val; - return S_OK; -} - /* ECMA-262 3rd Edition 12.6.4 */ static HRESULT interp_forin(exec_ctx_t *ctx) { @@ -2649,7 +2591,7 @@ static HRESULT interp_tree(exec_ctx_t *ctx) TRACE("\n"); - hres = stat_eval(ctx->parser->script, instr->arg1.stat, ctx->rt, &v); + hres = instr->arg1.stat->eval(ctx->parser->script, instr->arg1.stat, ctx->rt, &v); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 424000e..4ac5e6a 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -413,7 +413,6 @@ typedef struct { } try_statement_t; HRESULT compiled_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT while_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT continue_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT break_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT return_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Always use bytecode for for statement.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: f904bc8e78cb6b11ae47d8cbd0f159e6b473ef57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f904bc8e78cb6b11ae47d8cbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:06:53 2011 +0100 jscript: Always use bytecode for for statement. --- dlls/jscript/compile.c | 9 +---- dlls/jscript/engine.c | 94 ------------------------------------------------ dlls/jscript/engine.h | 1 - 3 files changed, 1 insertions(+), 103 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index da9b107..e4c5332 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1084,11 +1084,9 @@ static HRESULT compile_while_statement(compiler_ctx_t *ctx, while_statement_t *s static HRESULT compile_for_statement(compiler_ctx_t *ctx, for_statement_t *stat) { statement_ctx_t stat_ctx = {0, FALSE, FALSE}; - unsigned off_backup, expr_off; + unsigned expr_off; HRESULT hres; - off_backup = ctx->code_off; - if(stat->variable_list) { hres = compile_variable_list(ctx, stat->variable_list); if(FAILED(hres)) @@ -1131,11 +1129,6 @@ static HRESULT compile_for_statement(compiler_ctx_t *ctx, for_statement_t *stat) return E_OUTOFMEMORY; hres = compile_statement(ctx, &stat_ctx, stat->statement); - if(hres == E_NOTIMPL) { - ctx->code_off = off_backup; - stat->stat.eval = for_statement_eval; - return compile_interp_fallback(ctx, &stat->stat); - } if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 896fc9a..6e8ae3c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -657,31 +657,6 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, DWORD flags, } /* ECMA-262 3rd Edition 12.2 */ -static HRESULT variable_list_eval(script_ctx_t *ctx, variable_declaration_t *var_list, jsexcept_t *ei) -{ - variable_declaration_t *iter; - HRESULT hres = S_OK; - - for(iter = var_list; iter; iter = iter->next) { - VARIANT val; - - if(!iter->expr) - continue; - - hres = expr_eval(ctx, iter->expr, ei, &val); - if(FAILED(hres)) - break; - - hres = jsdisp_propput_name(ctx->exec_ctx->var_disp, iter->identifier, &val, ei, NULL/*FIXME*/); - VariantClear(&val); - if(FAILED(hres)) - break; - } - - return hres; -} - -/* ECMA-262 3rd Edition 12.2 */ static HRESULT interp_var_set(exec_ctx_t *ctx) { const BSTR name = ctx->parser->code->instrs[ctx->ip].arg1.bstr; @@ -749,75 +724,6 @@ HRESULT while_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_ return S_OK; } -/* ECMA-262 3rd Edition 12.6.3 */ -HRESULT for_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) -{ - for_statement_t *stat = (for_statement_t*)_stat; - VARIANT val, tmp, retv; - VARIANT_BOOL b; - HRESULT hres; - - TRACE("\n"); - - if(stat->variable_list) { - hres = variable_list_eval(ctx, stat->variable_list, &rt->ei); - if(FAILED(hres)) - return hres; - }else if(stat->begin_expr) { - hres = expr_eval(ctx, stat->begin_expr, &rt->ei, &val); - if(FAILED(hres)) - return hres; - - VariantClear(&val); - } - - V_VT(&retv) = VT_EMPTY; - - while(1) { - if(stat->expr) { - hres = expr_eval(ctx, stat->expr, &rt->ei, &tmp); - if(FAILED(hres)) - break; - - hres = to_boolean(&tmp, &b); - VariantClear(&tmp); - if(FAILED(hres) || !b) - break; - } - - hres = stat_eval(ctx, stat->statement, rt, &tmp); - if(FAILED(hres)) - break; - - VariantClear(&retv); - retv = tmp; - - if(rt->type == RT_CONTINUE) - rt->type = RT_NORMAL; - else if(rt->type != RT_NORMAL) - break; - - if(stat->end_expr) { - hres = expr_eval(ctx, stat->end_expr, &rt->ei, &val); - if(FAILED(hres)) - break; - - VariantClear(&val); - } - } - - if(FAILED(hres)) { - VariantClear(&retv); - return hres; - } - - if(rt->type == RT_BREAK) - rt->type = RT_NORMAL; - - *ret = retv; - return S_OK; -} - /* ECMA-262 3rd Edition 12.6.4 */ static HRESULT interp_forin(exec_ctx_t *ctx) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index f137d8b..f4f06c1 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -414,7 +414,6 @@ typedef struct { HRESULT compiled_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT while_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT for_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT continue_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT break_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT return_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Always use bytecode for try statement.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: c6932d8069335a8da436244e7fbee678667129c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6932d8069335a8da436244e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:07:22 2011 +0100 jscript: Always use bytecode for try statement. --- dlls/jscript/compile.c | 19 +------------- dlls/jscript/engine.c | 63 ------------------------------------------------ dlls/jscript/engine.h | 1 - 3 files changed, 1 insertions(+), 82 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 076b768..636cdff 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1432,12 +1432,10 @@ static HRESULT compile_try_statement(compiler_ctx_t *ctx, try_statement_t *stat) { statement_ctx_t try_ctx = {0, FALSE, TRUE, -1, -1}, catch_ctx = {0, TRUE, FALSE, -1, -1}; statement_ctx_t finally_ctx = {2, FALSE, FALSE, -1, -1}; - unsigned off_backup, push_except; + unsigned push_except; BSTR ident; HRESULT hres; - off_backup = ctx->code_off; - push_except = push_instr(ctx, OP_push_except); if(push_except == -1) return E_OUTOFMEMORY; @@ -1456,11 +1454,6 @@ static HRESULT compile_try_statement(compiler_ctx_t *ctx, try_statement_t *stat) try_ctx.stack_use = 2; hres = compile_statement(ctx, &try_ctx, stat->try_statement); - if(hres == E_NOTIMPL) { - ctx->code_off = off_backup; - stat->stat.eval = try_statement_eval; - return compile_interp_fallback(ctx, &stat->stat); - } if(FAILED(hres)) return hres; @@ -1477,11 +1470,6 @@ static HRESULT compile_try_statement(compiler_ctx_t *ctx, try_statement_t *stat) instr_ptr(ctx, push_except)->arg1.uint = ctx->code_off; hres = compile_statement(ctx, &catch_ctx, stat->catch_block->statement); - if(hres == E_NOTIMPL) { - ctx->code_off = off_backup; - stat->stat.eval = try_statement_eval; - return compile_interp_fallback(ctx, &stat->stat); - } if(FAILED(hres)) return hres; @@ -1499,11 +1487,6 @@ static HRESULT compile_try_statement(compiler_ctx_t *ctx, try_statement_t *stat) return E_OUTOFMEMORY; hres = compile_statement(ctx, stat->catch_block ? NULL : &finally_ctx, stat->finally_statement); - if(hres == E_NOTIMPL) { - ctx->code_off = off_backup; - stat->stat.eval = try_statement_eval; - return compile_interp_fallback(ctx, &stat->stat); - } if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 746002f..62fdf23 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -944,69 +944,6 @@ static HRESULT interp_throw_type(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 12.14 */ -static HRESULT catch_eval(script_ctx_t *ctx, catch_block_t *block, return_type_t *rt, VARIANT *ret) -{ - jsdisp_t *var_disp; - VARIANT ex, val; - HRESULT hres; - - ex = rt->ei.var; - memset(&rt->ei, 0, sizeof(jsexcept_t)); - - hres = create_dispex(ctx, NULL, NULL, &var_disp); - if(SUCCEEDED(hres)) { - hres = jsdisp_propput_name(var_disp, block->identifier, &ex, &rt->ei, NULL/*FIXME*/); - if(SUCCEEDED(hres)) { - hres = scope_push(ctx->exec_ctx->scope_chain, var_disp, &ctx->exec_ctx->scope_chain); - if(SUCCEEDED(hres)) { - hres = stat_eval(ctx, block->statement, rt, &val); - scope_pop(&ctx->exec_ctx->scope_chain); - } - } - - jsdisp_release(var_disp); - } - - VariantClear(&ex); - if(FAILED(hres)) - return hres; - - *ret = val; - return S_OK; -} - -/* ECMA-262 3rd Edition 12.14 */ -HRESULT try_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) -{ - try_statement_t *stat = (try_statement_t*)_stat; - VARIANT val; - HRESULT hres; - - TRACE("\n"); - - hres = stat_eval(ctx, stat->try_statement, rt, &val); - if(FAILED(hres)) { - TRACE("EXCEPTION\n"); - if(!stat->catch_block) - return hres; - - hres = catch_eval(ctx, stat->catch_block, rt, &val); - if(FAILED(hres)) - return hres; - } - - if(stat->finally_statement) { - VariantClear(&val); - hres = stat_eval(ctx, stat->finally_statement, rt, &val); - if(FAILED(hres)) - return hres; - } - - *ret = val; - return S_OK; -} - -/* ECMA-262 3rd Edition 12.14 */ static HRESULT interp_push_except(exec_ctx_t *ctx) { const unsigned arg1 = ctx->parser->code->instrs[ctx->ip].arg1.uint; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 385778e..424000e 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -417,7 +417,6 @@ HRESULT while_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) HRESULT continue_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT break_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT return_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT try_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; typedef struct { enum {

1 0

Jacek Caban : jscript: Always use bytecode for with statement.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: 1c0fe6002de00ac96f42f706bf9fb041028b9217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c0fe6002de00ac96f42f706b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:06:13 2011 +0100 jscript: Always use bytecode for with statement. --- dlls/jscript/compile.c | 8 -------- dlls/jscript/engine.c | 38 -------------------------------------- dlls/jscript/engine.h | 1 - 3 files changed, 0 insertions(+), 47 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 9d1081e..0f1e3af 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1313,11 +1313,8 @@ static HRESULT compile_break_statement(compiler_ctx_t *ctx, branch_statement_t * static HRESULT compile_with_statement(compiler_ctx_t *ctx, with_statement_t *stat) { statement_ctx_t stat_ctx = {0, TRUE, FALSE, -1, -1}; - unsigned off_backup; HRESULT hres; - off_backup = ctx->code_off; - hres = compile_expression(ctx, stat->expr); if(FAILED(hres)) return hres; @@ -1326,11 +1323,6 @@ static HRESULT compile_with_statement(compiler_ctx_t *ctx, with_statement_t *sta return E_OUTOFMEMORY; hres = compile_statement(ctx, &stat_ctx, stat->statement); - if(hres == E_NOTIMPL) { - ctx->code_off = off_backup; - stat->stat.eval = with_statement_eval; - return compile_interp_fallback(ctx, &stat->stat); - } if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0d97765..30222b8 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1068,44 +1068,6 @@ HRESULT return_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type } /* ECMA-262 3rd Edition 12.10 */ -HRESULT with_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) -{ - with_statement_t *stat = (with_statement_t*)_stat; - IDispatch *disp; - jsdisp_t *obj; - VARIANT val; - HRESULT hres; - - TRACE("\n"); - - hres = expr_eval(ctx, stat->expr, &rt->ei, &val); - if(FAILED(hres)) - return hres; - - hres = to_object(ctx, &val, &disp); - VariantClear(&val); - if(FAILED(hres)) - return hres; - - obj = iface_to_jsdisp((IUnknown*)disp); - IDispatch_Release(disp); - if(!obj) { - FIXME("disp id not jsdisp\n"); - return E_NOTIMPL; - } - - hres = scope_push(ctx->exec_ctx->scope_chain, obj, &ctx->exec_ctx->scope_chain); - jsdisp_release(obj); - if(FAILED(hres)) - return hres; - - hres = stat_eval(ctx, stat->statement, rt, ret); - - scope_pop(&ctx->exec_ctx->scope_chain); - return hres; -} - -/* ECMA-262 3rd Edition 12.10 */ HRESULT interp_push_scope(exec_ctx_t *ctx) { IDispatch *disp; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 1b827b2..4f088b5 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -419,7 +419,6 @@ HRESULT forin_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) HRESULT continue_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT break_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT return_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT with_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT switch_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT try_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Use a region to render geometric and wide pens in LineTo.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: f5549ae1d00d8bc0e02d14ec66aacbf9d14ce695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5549ae1d00d8bc0e02d14ec6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 09:57:41 2011 +0100 gdi32: Use a region to render geometric and wide pens in LineTo. --- dlls/gdi32/dibdrv/graphics.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 00d0e2a..4fb1126 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -444,6 +444,10 @@ BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) PHYSDEV next = GET_NEXT_PHYSDEV( dev, pLineTo ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); POINT pts[2]; + HRGN region = 0; + BOOL ret; + + if(defer_pen(pdev)) return next->funcs->pLineTo( next, x, y ); GetCurrentPositionEx(dev->hdc, pts); pts[1].x = x; @@ -451,12 +455,19 @@ BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) LPtoDP(dev->hdc, pts, 2); + if (pdev->pen_uses_region && !(region = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; + reset_dash_origin(pdev); - if(defer_pen(pdev) || !pdev->pen_lines(pdev, 2, pts, FALSE, 0)) - return next->funcs->pLineTo( next, x, y ); + ret = pdev->pen_lines(pdev, 2, pts, FALSE, region); - return TRUE; + if (region) + { + if (pdev->clip) CombineRgn( region, region, pdev->clip, RGN_AND ); + ret = pen_rect( pdev, NULL, region, GetROP2(dev->hdc) ); + DeleteObject( region ); + } + return ret; } /***********************************************************************

1 0

Alexandre Julliard : gdi32: Implement returning a region for 1-pixel wide dashed pen lines.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: 9ee690c984b22b9af936bd481a445a20444d3d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee690c984b22b9af936bd481… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 14:28:06 2011 +0100 gdi32: Implement returning a region for 1-pixel wide dashed pen lines. --- dlls/gdi32/dibdrv/objects.c | 153 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 145 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index bb68029..dd7ddb7 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1047,21 +1047,158 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) return TRUE; } +static BOOL dashed_pen_line_region(dibdrv_physdev *pdev, POINT *start, POINT *end, HRGN region) +{ + int i, dash_len; + RECT rect; + + rect.left = start->x; + rect.top = start->y; + rect.right = start->x + 1; + rect.bottom = start->y + 1; + + if (start->y == end->y) /* hline */ + { + if (start->x <= end->x) + { + for (i = start->x; i < end->x; i += dash_len) + { + dash_len = min( pdev->dash_pos.left_in_dash, end->x - i ); + if (pdev->dash_pos.mark) + { + rect.left = i; + rect.right = i + dash_len; + add_rect_to_region( region, &rect ); + } + skip_dash(pdev, dash_len); + } + } + else + { + for (i = start->x; i > end->x; i -= dash_len) + { + dash_len = min( pdev->dash_pos.left_in_dash, i - end->x ); + if (pdev->dash_pos.mark) + { + rect.left = i - dash_len + 1; + rect.right = i + 1; + add_rect_to_region( region, &rect ); + } + skip_dash(pdev, dash_len); + } + } + } + else if (start->x == end->x) /* vline */ + { + if (start->y <= end->y) + { + for (i = start->y; i < end->y; i += dash_len) + { + dash_len = min( pdev->dash_pos.left_in_dash, end->y - i ); + if (pdev->dash_pos.mark) + { + rect.top = i; + rect.bottom = i + dash_len; + add_rect_to_region( region, &rect ); + } + skip_dash(pdev, dash_len); + } + } + else + { + for (i = start->y; i > end->y; i -= dash_len) + { + dash_len = min( pdev->dash_pos.left_in_dash, i - end->y ); + if (pdev->dash_pos.mark) + { + rect.top = i - dash_len + 1; + rect.bottom = i + 1; + add_rect_to_region( region, &rect ); + } + skip_dash(pdev, dash_len); + } + } + } + else + { + INT dx = end->x - start->x, dy = end->y - start->y; + INT abs_dx = abs(dx), abs_dy = abs(dy); + DWORD octant = get_octant_mask(dx, dy); + INT bias = get_bias( octant ); + int x_inc = is_x_increasing( octant ) ? 1 : -1; + int y_inc = is_y_increasing( octant ) ? 1 : -1; + + if (is_xmajor( octant )) + { + int err_add_1 = 2 * abs_dy - 2 * abs_dx; + int err_add_2 = 2 * abs_dy; + int err = 2 * abs_dy - abs_dx; + + while (abs_dx--) + { + if (pdev->dash_pos.mark) add_rect_to_region( region, &rect ); + skip_dash(pdev, 1); + rect.left += x_inc; + rect.right += x_inc; + if (err + bias > 0) + { + rect.top += y_inc; + rect.bottom += y_inc; + err += err_add_1; + } + else err += err_add_2; + } + + } + else + { + int err_add_1 = 2 * abs_dx - 2 * abs_dy; + int err_add_2 = 2 * abs_dx; + int err = 2 * abs_dx - abs_dy; + + while (abs_dy--) + { + if (pdev->dash_pos.mark) add_rect_to_region( region, &rect ); + skip_dash(pdev, 1); + rect.top += y_inc; + rect.bottom += y_inc; + if (err + bias > 0) + { + rect.left += x_inc; + rect.right += x_inc; + err += err_add_1; + } + else err += err_add_2; + } + } + } + return TRUE; +} + static BOOL dashed_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region) { int i; - get_color_masks( pdev, GetROP2(pdev->dev.hdc), pdev->pen_colorref, - pdev->pen_is_ext ? TRANSPARENT : GetBkMode(pdev->dev.hdc), - &pdev->dash_masks[1], &pdev->dash_masks[0] ); - assert( num >= 2 ); - for (i = 0; i < num - 1; i++) - if (!dashed_pen_line( pdev, pts + i, pts + i + 1 )) - return FALSE; - if (close) return dashed_pen_line( pdev, pts + num - 1, pts ); + if (region) + { + for (i = 0; i < num - 1; i++) + if (!dashed_pen_line_region( pdev, pts + i, pts + i + 1, region )) + return FALSE; + if (close) return dashed_pen_line_region( pdev, pts + num - 1, pts, region ); + } + else + { + get_color_masks( pdev, GetROP2(pdev->dev.hdc), pdev->pen_colorref, + pdev->pen_is_ext ? TRANSPARENT : GetBkMode(pdev->dev.hdc), + &pdev->dash_masks[1], &pdev->dash_masks[0] ); + for (i = 0; i < num - 1; i++) + if (!dashed_pen_line( pdev, pts + i, pts + i + 1 )) + return FALSE; + if (close) return dashed_pen_line( pdev, pts + num - 1, pts ); + } return TRUE; }

1 0

Alexandre Julliard : gdi32: Implement returning a region for 1-pixel wide solid pen lines.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: 3188c3022971abe4bb441be8ae97496ab13aab7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3188c3022971abe4bb441be8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 12:21:07 2011 +0100 gdi32: Implement returning a region for 1-pixel wide solid pen lines. --- dlls/gdi32/dibdrv/objects.c | 136 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 128 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index bf821f2..bb68029 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -631,21 +631,141 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD return TRUE; } +static BOOL solid_pen_line_region( dibdrv_physdev *pdev, POINT *start, POINT *end, HRGN region ) +{ + RECT rect; + + rect.left = start->x; + rect.top = start->y; + rect.right = start->x + 1; + rect.bottom = start->y + 1; + + if (start->y == end->y) + { + rect.right = end->x; + order_end_points(&rect.left, &rect.right); + add_rect_to_region( region, &rect ); + } + else if(start->x == end->x) + { + rect.bottom = end->y; + order_end_points(&rect.top, &rect.bottom); + add_rect_to_region( region, &rect ); + } + else + { + INT dx = end->x - start->x, dy = end->y - start->y; + INT abs_dx = abs(dx), abs_dy = abs(dy); + DWORD octant = get_octant_mask(dx, dy); + INT bias = get_bias( octant ); + + if (is_xmajor( octant )) + { + int y_inc = is_y_increasing( octant ) ? 1 : -1; + int err_add_1 = 2 * abs_dy - 2 * abs_dx; + int err_add_2 = 2 * abs_dy; + int err = 2 * abs_dy - abs_dx; + + if (is_x_increasing( octant )) + { + for (rect.right = start->x + 1; rect.right <= end->x; rect.right++) + { + if (err + bias > 0) + { + add_rect_to_region( region, &rect ); + rect.left = rect.right; + rect.top += y_inc; + rect.bottom += y_inc; + err += err_add_1; + } + else err += err_add_2; + } + } + else + { + for (rect.left = start->x; rect.left > end->x; rect.left--) + { + if (err + bias > 0) + { + add_rect_to_region( region, &rect ); + rect.right = rect.left; + rect.top += y_inc; + rect.bottom += y_inc; + err += err_add_1; + } + else err += err_add_2; + } + } + } + else + { + int x_inc = is_x_increasing( octant ) ? 1 : -1; + int err_add_1 = 2 * abs_dx - 2 * abs_dy; + int err_add_2 = 2 * abs_dx; + int err = 2 * abs_dx - abs_dy; + + if (is_y_increasing( octant )) + { + for (rect.bottom = start->y + 1; rect.bottom <= end->y; rect.bottom++) + { + if (err + bias > 0) + { + add_rect_to_region( region, &rect ); + rect.top = rect.bottom; + rect.left += x_inc; + rect.right += x_inc; + err += err_add_1; + } + else err += err_add_2; + } + } + else + { + for (rect.top = start->y; rect.top > end->y; rect.top--) + { + if (err + bias > 0) + { + add_rect_to_region( region, &rect ); + rect.bottom = rect.top; + rect.left += x_inc; + rect.right += x_inc; + err += err_add_1; + } + else err += err_add_2; + } + } + } + /* add final rect */ + add_rect_to_region( region, &rect ); + } + return TRUE; +} + static BOOL solid_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close, HRGN region) { int i; - DWORD color, and, xor; - - color = get_pixel_color( pdev, pdev->pen_colorref, TRUE ); - calc_and_xor_masks( GetROP2(pdev->dev.hdc), color, &and, &xor ); assert( num >= 2 ); - for (i = 0; i < num - 1; i++) - if (!solid_pen_line( pdev, pts + i, pts + i + 1, and, xor )) - return FALSE; - if (close) return solid_pen_line( pdev, pts + num - 1, pts, and, xor ); + if (region) + { + for (i = 0; i < num - 1; i++) + if (!solid_pen_line_region( pdev, pts + i, pts + i + 1, region )) + return FALSE; + if (close) return solid_pen_line_region( pdev, pts + num - 1, pts, region ); + } + else + { + DWORD color, and, xor; + + color = get_pixel_color( pdev, pdev->pen_colorref, TRUE ); + calc_and_xor_masks( GetROP2(pdev->dev.hdc), color, &and, &xor ); + for (i = 0; i < num - 1; i++) + if (!solid_pen_line( pdev, pts + i, pts + i + 1, and, xor )) + return FALSE; + if (close) return solid_pen_line( pdev, pts + num - 1, pts, and, xor ); + } return TRUE; }

1 0

Alexandre Julliard : gdi32: Use a region to render geometric and wide pens in Rectangle.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: da8ae113001051d8118b7dd7acb5e17f3b5a2334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8ae113001051d8118b7dd7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 00:18:44 2011 +0100 gdi32: Use a region to render geometric and wide pens in Rectangle. --- dlls/gdi32/dibdrv/graphics.c | 40 ++++++++++++++++++++++++++++++++-------- 1 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index d43b30b..00d0e2a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -579,6 +579,9 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) dibdrv_physdev *pdev = get_dibdrv_pdev(dev); RECT rect = get_device_rect( dev->hdc, left, top, right, bottom, TRUE ); POINT pts[4]; + BOOL ret; + INT rop = GetROP2( dev->hdc ); + HRGN outline = 0; TRACE("(%p, %d, %d, %d, %d)\n", dev, left, top, right, bottom); @@ -595,22 +598,43 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) rect.bottom -= (pdev->pen_width - 1) / 2; } + if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; + + rect.right--; + rect.bottom--; reset_dash_origin(pdev); /* 4 pts going anti-clockwise starting from top-right */ - pts[0].x = pts[3].x = rect.right - 1; + pts[0].x = pts[3].x = rect.right; pts[0].y = pts[1].y = rect.top; pts[1].x = pts[2].x = rect.left; - pts[2].y = pts[3].y = rect.bottom - 1; + pts[2].y = pts[3].y = rect.bottom; - pdev->pen_lines(pdev, 4, pts, TRUE, 0); + pdev->pen_lines(pdev, 4, pts, TRUE, outline); - rect.left += (pdev->pen_width + 1) / 2; - rect.top += (pdev->pen_width + 1) / 2; - rect.right -= (pdev->pen_width + 2) / 2; - rect.bottom -= (pdev->pen_width + 2) / 2; + if (outline) + { + HRGN interior = CreateRectRgnIndirect( &rect ); - return brush_rect( pdev, &rect, pdev->clip, GetROP2(dev->hdc) ); + CombineRgn( interior, interior, outline, RGN_DIFF ); + if (pdev->clip) + { + CombineRgn( outline, outline, pdev->clip, RGN_AND ); + CombineRgn( interior, interior, pdev->clip, RGN_AND ); + } + ret = pen_rect( pdev, NULL, outline, rop ) && brush_rect( pdev, NULL, interior, rop ); + DeleteObject( outline ); + DeleteObject( interior ); + } + else + { + rect.left += (pdev->pen_width + 1) / 2; + rect.top += (pdev->pen_width + 1) / 2; + rect.right -= pdev->pen_width / 2; + rect.bottom -= pdev->pen_width / 2; + ret = brush_rect( pdev, &rect, pdev->clip, rop ); + } + return ret; } /***********************************************************************

1 0

Jacek Caban : jscript: Always use bytecode for for..in statement.
by Alexandre Julliard Dec. 29, 2011

Dec. 29, 2011

Module: wine Branch: master Commit: 2c0920f8c349ebe66fa52927ddac27d35f8a2e81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c0920f8c349ebe66fa52927d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:06:41 2011 +0100 jscript: Always use bytecode for for..in statement. --- dlls/jscript/compile.c | 6 -- dlls/jscript/engine.c | 222 ------------------------------------------------ dlls/jscript/engine.h | 1 - 3 files changed, 0 insertions(+), 229 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0f1e3af..da9b107 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1164,7 +1164,6 @@ static HRESULT compile_for_statement(compiler_ctx_t *ctx, for_statement_t *stat) static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *stat) { statement_ctx_t stat_ctx = {4, FALSE, FALSE}; - unsigned off_backup = ctx->code_off; HRESULT hres; if(stat->variable) { @@ -1216,11 +1215,6 @@ static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *s return E_OUTOFMEMORY; hres = compile_statement(ctx, &stat_ctx, stat->statement); - if(hres == E_NOTIMPL) { - ctx->code_off = off_backup; - stat->stat.eval = forin_statement_eval; - return compile_interp_fallback(ctx, &stat->stat); - } if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 30222b8..896fc9a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -388,15 +388,6 @@ static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, BSTR name, DWORD return hres; } -/* ECMA-262 3rd Edition 8.7.2 */ -static HRESULT put_value(script_ctx_t *ctx, exprval_t *ref, VARIANT *v, jsexcept_t *ei) -{ - if(ref->type != EXPRVAL_IDREF) - return throw_reference_error(ctx, ei, JS_E_ILLEGAL_ASSIGN, NULL); - - return disp_propput(ctx, ref->u.idref.disp, ref->u.idref.id, v, ei, NULL/*FIXME*/); -} - static inline BOOL is_null(const VARIANT *v) { return V_VT(v) == VT_NULL || (V_VT(v) == VT_DISPATCH && !V_DISPATCH(v)); @@ -827,124 +818,6 @@ HRESULT for_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t return S_OK; } -static HRESULT array_expression_eval(script_ctx_t*,expression_t*,jsexcept_t*,exprval_t*); -static HRESULT member_expression_eval(script_ctx_t*,expression_t*,jsexcept_t*,exprval_t*); -static HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,jsexcept_t*,exprval_t*); - -/* ECMA-262 3rd Edition 12.6.4 */ -HRESULT forin_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) -{ - forin_statement_t *stat = (forin_statement_t*)_stat; - VARIANT val, name, retv, tmp; - DISPID id = DISPID_STARTENUM; - BSTR str, identifier = NULL; - IDispatchEx *in_obj; - exprval_t exprval; - HRESULT hres; - - TRACE("\n"); - - if(stat->variable) { - hres = variable_list_eval(ctx, stat->variable, &rt->ei); - if(FAILED(hres)) - return hres; - } - - hres = expr_eval(ctx, stat->in_expr, &rt->ei, &val); - if(FAILED(hres)) - return hres; - - if(V_VT(&val) != VT_DISPATCH) { - TRACE("in vt %d\n", V_VT(&val)); - VariantClear(&val); - V_VT(ret) = VT_EMPTY; - return S_OK; - } - - hres = IDispatch_QueryInterface(V_DISPATCH(&val), &IID_IDispatchEx, (void**)&in_obj); - IDispatch_Release(V_DISPATCH(&val)); - if(FAILED(hres)) { - TRACE("Object doesn't support IDispatchEx\n"); - V_VT(ret) = VT_EMPTY; - return S_OK; - } - - V_VT(&retv) = VT_EMPTY; - - if(stat->variable) - identifier = SysAllocString(stat->variable->identifier); - - while(1) { - hres = IDispatchEx_GetNextDispID(in_obj, fdexEnumDefault, id, &id); - if(FAILED(hres) || hres == S_FALSE) - break; - - hres = IDispatchEx_GetMemberName(in_obj, id, &str); - if(FAILED(hres)) - break; - - TRACE("iter %s\n", debugstr_w(str)); - - if(stat->variable) { - hres = identifier_eval(ctx, identifier, 0, NULL, &exprval); - }else { - switch(stat->expr->type) { - case EXPR_ARRAY: - hres = array_expression_eval(ctx, stat->expr, &rt->ei, &exprval); - break; - case EXPR_IDENT: - hres = identifier_expression_eval(ctx, stat->expr, &rt->ei, &exprval); - break; - case EXPR_MEMBER: - hres = member_expression_eval(ctx, stat->expr, &rt->ei, &exprval); - break; - default: - hres = expr_eval(ctx, stat->expr, &rt->ei, &tmp); - if(FAILED(hres)) - break; - - VariantClear(&tmp); - hres = throw_reference_error(ctx, &rt->ei, JS_E_ILLEGAL_ASSIGN, NULL); - break; - } - } - if(SUCCEEDED(hres)) { - V_VT(&name) = VT_BSTR; - V_BSTR(&name) = str; - hres = put_value(ctx, &exprval, &name, &rt->ei); - exprval_release(&exprval); - } - SysFreeString(str); - if(FAILED(hres)) - break; - - hres = stat_eval(ctx, stat->statement, rt, &tmp); - if(FAILED(hres)) - break; - - VariantClear(&retv); - retv = tmp; - - if(rt->type == RT_CONTINUE) - rt->type = RT_NORMAL; - else if(rt->type != RT_NORMAL) - break; - } - - SysFreeString(identifier); - IDispatchEx_Release(in_obj); - if(FAILED(hres)) { - VariantClear(&retv); - return hres; - } - - if(rt->type == RT_BREAK) - rt->type = RT_NORMAL; - - *ret = retv; - return S_OK; -} - /* ECMA-262 3rd Edition 12.6.4 */ static HRESULT interp_forin(exec_ctx_t *ctx) { @@ -1389,46 +1262,6 @@ static HRESULT interp_func(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.2.1 */ -static HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - VARIANT member, val; - DISPID id; - BSTR str; - IDispatch *obj = NULL; - HRESULT hres; - - TRACE("\n"); - - hres = expr_eval(ctx, expr->expression1, ei, &member); - if(FAILED(hres)) - return hres; - - hres = expr_eval(ctx, expr->expression2, ei, &val); - if(SUCCEEDED(hres)) { - hres = to_object(ctx, &member, &obj); - if(FAILED(hres)) - VariantClear(&val); - } - VariantClear(&member); - if(SUCCEEDED(hres)) { - hres = to_string(ctx, &val, ei, &str); - VariantClear(&val); - if(SUCCEEDED(hres)) { - hres = disp_get_id(ctx, obj, str, fdexNameEnsure, &id); - SysFreeString(str); - } - - if(SUCCEEDED(hres)) - exprval_set_idref(ret, obj, id); - - IDispatch_Release(obj); - } - - return hres; -} - -/* ECMA-262 3rd Edition 11.2.1 */ static HRESULT interp_array(exec_ctx_t *ctx) { VARIANT v, *namev; @@ -1470,42 +1303,6 @@ static HRESULT interp_array(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.2.1 */ -static HRESULT member_expression_eval(script_ctx_t *ctx, expression_t *_expr, jsexcept_t *ei, exprval_t *ret) -{ - member_expression_t *expr = (member_expression_t*)_expr; - IDispatch *obj = NULL; - VARIANT member; - DISPID id; - BSTR str; - HRESULT hres; - - TRACE("\n"); - - hres = expr_eval(ctx, expr->expression, ei, &member); - if(FAILED(hres)) - return hres; - - hres = to_object(ctx, &member, &obj); - VariantClear(&member); - if(FAILED(hres)) - return hres; - - str = SysAllocString(expr->identifier); - if(!str) { - IDispatch_Release(obj); - return E_OUTOFMEMORY; - } - - hres = disp_get_id(ctx, obj, str, fdexNameEnsure, &id); - SysFreeString(str); - if(SUCCEEDED(hres)) - exprval_set_idref(ret, obj, id); - - IDispatch_Release(obj); - return hres; -} - -/* ECMA-262 3rd Edition 11.2.1 */ static HRESULT interp_member(exec_ctx_t *ctx) { const BSTR arg = ctx->parser->code->instrs[ctx->ip].arg1.bstr; @@ -1715,25 +1512,6 @@ static HRESULT interp_this(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 10.1.4 */ -static HRESULT identifier_expression_eval(script_ctx_t *ctx, expression_t *_expr, jsexcept_t *ei, exprval_t *ret) -{ - identifier_expression_t *expr = (identifier_expression_t*)_expr; - BSTR identifier; - HRESULT hres; - - TRACE("\n"); - - identifier = SysAllocString(expr->identifier); - if(!identifier) - return E_OUTOFMEMORY; - - hres = identifier_eval(ctx, identifier, fdexNameEnsure, ei, ret); - - SysFreeString(identifier); - return hres; -} - -/* ECMA-262 3rd Edition 10.1.4 */ static HRESULT interp_ident(exec_ctx_t *ctx) { const BSTR arg = ctx->parser->code->instrs[ctx->ip].arg1.bstr; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 4f088b5..f137d8b 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -415,7 +415,6 @@ typedef struct { HRESULT compiled_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT while_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT for_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT forin_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT continue_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT break_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT return_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN;

1 0