December 2011 - Wine-commits

Jacek Caban : actxprxy: Added htiface.idl interfaces.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 676c017bc9670f90d1bfb6e6c2a6813e07310da6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=676c017bc9670f90d1bfb6e6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 15:26:30 2011 +0100 actxprxy: Added htiface.idl interfaces. --- .gitignore | 2 ++ dlls/actxprxy/Makefile.in | 2 ++ dlls/actxprxy/actxprxy_htiface.idl | 27 +++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index f8756f7..22d7762 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,8 @@ dlls/actxprxy/actxprxy_docobj.h dlls/actxprxy/actxprxy_docobj_p.c dlls/actxprxy/actxprxy_hlink.h dlls/actxprxy/actxprxy_hlink_p.c +dlls/actxprxy/actxprxy_htiface.h +dlls/actxprxy/actxprxy_htiface_p.c dlls/actxprxy/actxprxy_htiframe.h dlls/actxprxy/actxprxy_htiframe_p.c dlls/actxprxy/actxprxy_objsafe.h diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index b879903..6fabb3d 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -12,6 +12,7 @@ IDL_P_SRCS = \ actxprxy_comcat.idl \ actxprxy_docobj.idl \ actxprxy_hlink.idl \ + actxprxy_htiface.idl \ actxprxy_htiframe.idl \ actxprxy_objsafe.idl \ actxprxy_ocmm.idl \ @@ -25,6 +26,7 @@ IDL_R_SRCS = \ actxprxy_comcat.idl \ actxprxy_docobj.idl \ actxprxy_hlink.idl \ + actxprxy_htiface.idl \ actxprxy_htiframe.idl \ actxprxy_objsafe.idl \ actxprxy_ocmm.idl \ diff --git a/dlls/actxprxy/actxprxy_htiface.idl b/dlls/actxprxy/actxprxy_htiface.idl new file mode 100644 index 0000000..8ecf7e6 --- /dev/null +++ b/dlls/actxprxy/actxprxy_htiface.idl @@ -0,0 +1,27 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* just a wrapper for htiface.idl */ + +#include "htiface.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; }

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 06566b6427954ac62d5c5d35c25ff4fe8255dac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06566b6427954ac62d5c5d35c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 29 17:20:22 2011 +0300 po: Update Russian translation. --- po/ru.po | 109 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 56 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06566b6427954ac62d5c5…

1 0

Francois Gouget : comdlg32: Use sentence capitalization for group box labels.
by Alexandre Julliard 29 Dec '11

29 Dec '11

1 0

Francois Gouget : cryptui: Don't assign access keys to group box labels.
by Alexandre Julliard 29 Dec '11

29 Dec '11

1 0

Jacek Caban : jscript: Always use bytecode for for statement.
by Alexandre Julliard 29 Dec '11

29 Dec '11

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 switch statement.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 985c6a1943a96128b284c0032f717e7015496af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=985c6a1943a96128b284c0032… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:07:08 2011 +0100 jscript: Always use bytecode for switch statement. --- dlls/jscript/compile.c | 8 ----- dlls/jscript/engine.c | 68 ------------------------------------------------ dlls/jscript/engine.h | 1 - 3 files changed, 0 insertions(+), 77 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index e4c5332..076b768 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1327,11 +1327,8 @@ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t BOOL have_default = FALSE; statement_t *stat_iter; case_clausule_t *iter; - unsigned off_backup; HRESULT hres; - off_backup = ctx->code_off; - hres = compile_expression(ctx, stat->expr); if(FAILED(hres)) return hres; @@ -1394,11 +1391,6 @@ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t for(stat_iter = iter->stat; stat_iter && (!iter->next || iter->next->stat != stat_iter); stat_iter = stat_iter->next) { hres = compile_statement(ctx, &stat_ctx, stat_iter); - if(hres == E_NOTIMPL) { - ctx->code_off = off_backup; - stat->stat.eval = switch_statement_eval; - return compile_interp_fallback(ctx, &stat->stat); - } if(FAILED(hres)) break; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 6e8ae3c..746002f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -916,74 +916,6 @@ static HRESULT interp_case(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 12.13 */ -HRESULT switch_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) -{ - switch_statement_t *stat = (switch_statement_t*)_stat; - case_clausule_t *iter, *default_clausule = NULL; - statement_t *stat_iter; - VARIANT val, cval; - BOOL b; - HRESULT hres; - - TRACE("\n"); - - hres = expr_eval(ctx, stat->expr, &rt->ei, &val); - if(FAILED(hres)) - return hres; - - for(iter = stat->case_list; iter; iter = iter->next) { - if(!iter->expr) { - default_clausule = iter; - continue; - } - - hres = expr_eval(ctx, iter->expr, &rt->ei, &cval); - if(FAILED(hres)) - break; - - hres = equal2_values(&val, &cval, &b); - VariantClear(&cval); - if(FAILED(hres) || b) - break; - } - - VariantClear(&val); - if(FAILED(hres)) - return hres; - - if(!iter) - iter = default_clausule; - - V_VT(&val) = VT_EMPTY; - if(iter) { - VARIANT tmp; - - for(stat_iter = iter->stat; stat_iter; stat_iter = stat_iter->next) { - hres = stat_eval(ctx, stat_iter, rt, &tmp); - if(FAILED(hres)) - break; - - VariantClear(&val); - val = tmp; - - 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.13 */ static HRESULT interp_throw(exec_ctx_t *ctx) { TRACE("\n"); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index f4f06c1..385778e 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 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; typedef struct {

1 0

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

29 Dec '11

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 while statement.
by Alexandre Julliard 29 Dec '11

29 Dec '11

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: Moved exec_source to the bottom of the file.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: f08fcff4fde3c1949d2563c17575aeab3b48cbcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08fcff4fde3c1949d2563c17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:08:07 2011 +0100 jscript: Moved exec_source to the bottom of the file. --- dlls/jscript/engine.c | 162 ++++++++++++++++++++++++------------------------ 1 files changed, 81 insertions(+), 81 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 781814a..c792a66 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -499,87 +499,6 @@ static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t return FALSE; } -HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *source, BOOL from_eval, - jsexcept_t *ei, VARIANT *retv) -{ - script_ctx_t *script = parser->script; - function_declaration_t *func; - parser_ctx_t *prev_parser; - var_list_t *var; - VARIANT val; - exec_ctx_t *prev_ctx; - return_type_t rt; - HRESULT hres = S_OK; - - for(func = source->functions; func; func = func->next) { - jsdisp_t *func_obj; - VARIANT var; - - hres = create_source_function(parser, func->expr->parameter_list, func->expr->source_elements, - ctx->scope_chain, func->expr->src_str, func->expr->src_len, &func_obj); - if(FAILED(hres)) - return hres; - - var_set_jsdisp(&var, func_obj); - hres = jsdisp_propput_name(ctx->var_disp, func->expr->identifier, &var, ei, NULL); - jsdisp_release(func_obj); - if(FAILED(hres)) - return hres; - } - - for(var = source->variables; var; var = var->next) { - DISPID id = 0; - BSTR name; - - name = SysAllocString(var->identifier); - if(!name) - return E_OUTOFMEMORY; - - if(!ctx->is_global || !lookup_global_members(parser->script, name, NULL)) - hres = jsdisp_get_id(ctx->var_disp, var->identifier, fdexNameEnsure, &id); - SysFreeString(name); - if(FAILED(hres)) - return hres; - } - - prev_ctx = script->exec_ctx; - script->exec_ctx = ctx; - - prev_parser = ctx->parser; - ctx->parser = parser; - - V_VT(&val) = VT_EMPTY; - memset(&rt, 0, sizeof(rt)); - rt.type = RT_NORMAL; - - if(source->statement) { - if(source->statement->instr_off == -1) - hres = compile_subscript_stat(ctx->parser, source->statement, TRUE, &source->statement->instr_off); - if(SUCCEEDED(hres)) - hres = compiled_statement_eval(script, source->statement, &rt, &val); - } - - script->exec_ctx = prev_ctx; - ctx->parser = prev_parser; - - if(rt.type != RT_NORMAL && rt.type != RT_RETURN) { - FIXME("wrong rt %d\n", rt.type); - hres = E_FAIL; - } - - *ei = rt.ei; - if(FAILED(hres)) { - VariantClear(&val); - return hres; - } - - if(!retv || (!from_eval && rt.type != RT_RETURN)) - VariantClear(&val); - if(retv) - *retv = val; - return S_OK; -} - /* ECMA-262 3rd Edition 10.1.4 */ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, DWORD flags, jsexcept_t *ei, exprval_t *ret) { @@ -2787,3 +2706,84 @@ static HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, jsexcept_t *ei, *ret = *stack_pop(exec_ctx); return S_OK; } + +HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *source, BOOL from_eval, + jsexcept_t *ei, VARIANT *retv) +{ + script_ctx_t *script = parser->script; + function_declaration_t *func; + parser_ctx_t *prev_parser; + var_list_t *var; + VARIANT val; + exec_ctx_t *prev_ctx; + return_type_t rt; + HRESULT hres = S_OK; + + for(func = source->functions; func; func = func->next) { + jsdisp_t *func_obj; + VARIANT var; + + hres = create_source_function(parser, func->expr->parameter_list, func->expr->source_elements, + ctx->scope_chain, func->expr->src_str, func->expr->src_len, &func_obj); + if(FAILED(hres)) + return hres; + + var_set_jsdisp(&var, func_obj); + hres = jsdisp_propput_name(ctx->var_disp, func->expr->identifier, &var, ei, NULL); + jsdisp_release(func_obj); + if(FAILED(hres)) + return hres; + } + + for(var = source->variables; var; var = var->next) { + DISPID id = 0; + BSTR name; + + name = SysAllocString(var->identifier); + if(!name) + return E_OUTOFMEMORY; + + if(!ctx->is_global || !lookup_global_members(parser->script, name, NULL)) + hres = jsdisp_get_id(ctx->var_disp, var->identifier, fdexNameEnsure, &id); + SysFreeString(name); + if(FAILED(hres)) + return hres; + } + + prev_ctx = script->exec_ctx; + script->exec_ctx = ctx; + + prev_parser = ctx->parser; + ctx->parser = parser; + + V_VT(&val) = VT_EMPTY; + memset(&rt, 0, sizeof(rt)); + rt.type = RT_NORMAL; + + if(source->statement) { + if(source->statement->instr_off == -1) + hres = compile_subscript_stat(ctx->parser, source->statement, TRUE, &source->statement->instr_off); + if(SUCCEEDED(hres)) + hres = compiled_statement_eval(script, source->statement, &rt, &val); + } + + script->exec_ctx = prev_ctx; + ctx->parser = prev_parser; + + if(rt.type != RT_NORMAL && rt.type != RT_RETURN) { + FIXME("wrong rt %d\n", rt.type); + hres = E_FAIL; + } + + *ei = rt.ei; + if(FAILED(hres)) { + VariantClear(&val); + return hres; + } + + if(!retv || (!from_eval && rt.type != RT_RETURN)) + VariantClear(&val); + if(retv) + *retv = val; + return S_OK; +}

1 0

Jacek Caban : jscript: Get rid of stat_eval_table.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 6710e7ec6fbc4c68dbffabb02b7f78339d391b0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6710e7ec6fbc4c68dbffabb02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 29 11:08:34 2011 +0100 jscript: Get rid of stat_eval_table. --- dlls/jscript/compile.c | 10 ++++++++++ dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 21 +-------------------- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 127d967..5d63dbe 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1289,6 +1289,13 @@ static HRESULT compile_break_statement(compiler_ctx_t *ctx, branch_statement_t * return push_instr_uint(ctx, OP_jmp, pop_ctx->break_label); } +/* ECMA-262 3rd Edition 12.9 */ +static HRESULT compile_return_statement(compiler_ctx_t *ctx, expression_statement_t *stat) +{ + stat->stat.eval = return_statement_eval; + return compile_interp_fallback(ctx, &stat->stat); +} + /* ECMA-262 3rd Edition 12.10 */ static HRESULT compile_with_statement(compiler_ctx_t *ctx, with_statement_t *stat) { @@ -1527,6 +1534,9 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx, case STAT_LABEL: hres = push_instr(ctx, OP_label) == -1 ? E_OUTOFMEMORY : S_OK; /* FIXME */ break; + case STAT_RETURN: + hres = compile_return_statement(ctx, (expression_statement_t*)stat); + break; case STAT_SWITCH: hres = compile_switch_statement(ctx, (switch_statement_t*)stat); break; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 4ac5e6a..b42a2ba 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -412,7 +412,6 @@ typedef struct { statement_t *finally_statement; } try_statement_t; -HRESULT compiled_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; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 5cf0412..a3fe42a 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -835,25 +835,6 @@ static BOOL allow_auto_semicolon(parser_ctx_t *ctx) return ctx->nl || ctx->ptr == ctx->end || *(ctx->ptr-1) == '}'; } -static const statement_eval_t stat_eval_table[] = { - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - return_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval, - compiled_statement_eval -}; - static void *new_statement(parser_ctx_t *ctx, statement_type_t type, size_t size) { statement_t *stat; @@ -863,7 +844,7 @@ static void *new_statement(parser_ctx_t *ctx, statement_type_t type, size_t size return NULL; stat->type = type; - stat->eval = stat_eval_table[type]; + stat->eval = NULL; stat->instr_off = -1; stat->next = NULL;

1 0