September 2008 - Wine-Commits

Jacek Caban : jscript: Added '|' expression implementation.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: ec6411a7fca04c41b843f4776a481d712bd4952b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec6411a7fca04c41b843f4776… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:31:02 2008 +0200 jscript: Added '|' expression implementation. --- dlls/jscript/engine.c | 29 ++++++++++++++++++++++++++--- dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 14 ++++++++++++++ dlls/jscript/tests/lang.js | 12 ++++++++++++ 4 files changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index ab9f434..fc4c1df 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1484,10 +1484,33 @@ HRESULT logical_and_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD return S_OK; } -HRESULT binary_or_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.10 */ +static HRESULT bitor_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) { - FIXME("\n"); - return E_NOTIMPL; + INT li, ri; + HRESULT hres; + + hres = to_int32(ctx->parser->script, lval, ei, &li); + if(FAILED(hres)) + return hres; + + hres = to_int32(ctx->parser->script, rval, ei, &ri); + if(FAILED(hres)) + return hres; + + V_VT(retv) = VT_I4; + V_I4(retv) = li|ri; + return S_OK; +} + +/* ECMA-262 3rd Edition 11.10 */ +HRESULT binary_or_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +{ + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return binary_expr_eval(ctx, expr, bitor_eval, ei, ret); } HRESULT binary_xor_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 4b384c7..7c0c07b 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -140,6 +140,7 @@ HRESULT create_number(script_ctx_t*,VARIANT*,DispatchEx**); HRESULT to_primitive(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*); HRESULT to_boolean(VARIANT*,VARIANT_BOOL*); HRESULT to_number(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*); +HRESULT to_int32(script_ctx_t*,VARIANT*,jsexcept_t*,INT*); HRESULT to_string(script_ctx_t*,VARIANT*,jsexcept_t*,BSTR*); HRESULT to_object(exec_ctx_t*,VARIANT*,IDispatch**); diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 616369e..09eed5b 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -231,6 +231,20 @@ HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) return S_OK; } +/* ECMA-262 3rd Edition 9.5 */ +HRESULT to_int32(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, INT *ret) +{ + VARIANT num; + HRESULT hres; + + hres = to_number(ctx, v, ei, &num); + if(FAILED(hres)) + return hres; + + *ret = V_VT(&num) == VT_I4 ? V_I4(&num) : (INT)V_R8(&num); + return S_OK; +} + /* ECMA-262 3rd Edition 9.8 */ HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str) { diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index af865e5..c3362aa 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -261,6 +261,18 @@ ok(tmp === "test", "true && \"test\" is not \"test\""); tmp = true && 0; ok(tmp === 0, "true && 0 is not 0"); +tmp = 3 | 4; +ok(tmp === 7, "3 | 4 !== 7"); +ok(getVT(tmp) === "VT_I4", "getVT(3|4) = " + getVT(tmp)); + +tmp = 3.5 | 0; +ok(tmp === 3, "3.5 | 0 !== 3"); +ok(getVT(tmp) === "VT_I4", "getVT(3.5|0) = " + getVT(tmp)); + +tmp = -3.5 | 0; +ok(tmp === -3, "-3.5 | 0 !== -3"); +ok(getVT(tmp) === "VT_I4", "getVT(3.5|0) = " + getVT(tmp)); + ok(1 < 3.4, "1 < 3.4 failed"); ok(!(3.4 < 1), "3.4 < 1"); ok("abc" < "abcd", "abc < abcd failed");

1 0

Jacek Caban : jscript: Added 'new' expression implementation.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: c0f3c78954e1e7f65644fba97cfc52c60f9b5cf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f3c78954e1e7f65644fba97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:29:58 2008 +0200 jscript: Added 'new' expression implementation. --- dlls/jscript/engine.c | 17 ++++++----------- dlls/jscript/engine.h | 4 +--- dlls/jscript/parser.y | 11 +++++------ dlls/jscript/tests/lang.js | 3 +++ 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 6f5beb4..6833954 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -41,7 +41,8 @@ static void exprval_release(exprval_t *val) { switch(val->type) { case EXPRVAL_VARIANT: - VariantClear(&val->u.var); + if(V_VT(&val->u.var) != VT_EMPTY) + VariantClear(&val->u.var); return; case EXPRVAL_IDREF: if(val->u.idref.disp) @@ -1054,7 +1055,7 @@ HRESULT member_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags return S_OK; } - hres = disp_get_id(obj, str, flags & EXPR_NEW ? fdexNameEnsure : 0, &id); + hres = disp_get_id(obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); SysFreeString(str); if(SUCCEEDED(hres)) { exprval_set_idref(ret, obj, id); @@ -1085,11 +1086,11 @@ static HRESULT args_to_param(exec_ctx_t *ctx, argument_t *args, jsexcept_t *ei, HRESULT hres = S_OK; memset(dp, 0, sizeof(*dp)); + if(!args) + return S_OK; for(iter = args; iter; iter = iter->next) cnt++; - if(!cnt) - return S_OK; vargs = heap_alloc_zero(cnt * sizeof(*vargs)); if(!vargs) @@ -1117,7 +1118,7 @@ static HRESULT args_to_param(exec_ctx_t *ctx, argument_t *args, jsexcept_t *ei, } /* ECMA-262 3rd Edition 11.2.2 */ -HRESULT member_new_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT new_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { call_expression_t *expr = (call_expression_t*)_expr; exprval_t exprval; @@ -1847,12 +1848,6 @@ HRESULT pre_decrement_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWOR return S_OK; } -HRESULT new_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - FIXME("\n"); - return E_NOTIMPL; -} - /* ECMA-262 3rd Edition 11.9.3 */ static HRESULT equal_values(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, BOOL *ret) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index c37bc24..5c64853 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -395,7 +395,6 @@ typedef enum { EXPR_POSTDEC, EXPR_PREINC, EXPR_PREDEC, - EXPR_NEW, EXPR_EQ, EXPR_EQEQ, EXPR_NOTEQ, @@ -427,7 +426,7 @@ HRESULT function_expression_eval(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exp HRESULT conditional_expression_eval(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); HRESULT array_expression_eval(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); HRESULT member_expression_eval(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); -HRESULT member_new_expression_eval(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); +HRESULT new_expression_eval(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); HRESULT call_expression_eval(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); HRESULT this_expression_eval(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); HRESULT identifier_expression_eval(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); @@ -457,7 +456,6 @@ HRESULT post_increment_expression_eval(exec_ctx_t*,expression_t*,DWORD,jsexcept_ HRESULT post_decrement_expression_eval(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); HRESULT pre_increment_expression_eval(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); HRESULT pre_decrement_expression_eval(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); -HRESULT new_expression_eval(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); HRESULT equal_expression_eval(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); HRESULT equal2_expression_eval(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); HRESULT not_equal_expression_eval(exec_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index f721a8e..998ab81 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -126,7 +126,7 @@ static expression_t *new_unary_expression(parser_ctx_t*,expression_type_t,expres static expression_t *new_conditional_expression(parser_ctx_t*,expression_t*,expression_t*,expression_t*); static expression_t *new_array_expression(parser_ctx_t*,expression_t*,expression_t*); static expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*); -static expression_t *new_member_new_expression(parser_ctx_t*,expression_t*,argument_list_t*); +static expression_t *new_new_expression(parser_ctx_t*,expression_t*,argument_list_t*); static expression_t *new_call_expression(parser_ctx_t*,expression_t*,argument_list_t*); static expression_t *new_this_expression(parser_ctx_t*); static expression_t *new_identifier_expression(parser_ctx_t*,const WCHAR*); @@ -676,7 +676,7 @@ LeftHandSideExpression /* ECMA-262 3rd Edition 11.2 */ NewExpression : MemberExpression { $$ = $1; } - | kNEW NewExpression { $$ = new_unary_expression(ctx, EXPR_NEW, $2); } + | kNEW NewExpression { $$ = new_new_expression(ctx, $2, NULL); } /* ECMA-262 3rd Edition 11.2 */ MemberExpression @@ -687,7 +687,7 @@ MemberExpression | MemberExpression '.' tIdentifier { $$ = new_member_expression(ctx, $1, $3); } | kNEW MemberExpression Arguments - { $$ = new_member_new_expression(ctx, $2, $3); } + { $$ = new_new_expression(ctx, $2, $3); } /* ECMA-262 3rd Edition 11.2 */ CallExpression @@ -1281,7 +1281,6 @@ static const expression_eval_t expression_eval_table[] = { post_decrement_expression_eval, pre_increment_expression_eval, pre_decrement_expression_eval, - new_expression_eval, equal_expression_eval, equal2_expression_eval, not_equal_expression_eval, @@ -1366,11 +1365,11 @@ static expression_t *new_member_expression(parser_ctx_t *ctx, expression_t *expr return &ret->expr; } -static expression_t *new_member_new_expression(parser_ctx_t *ctx, expression_t *expression, argument_list_t *argument_list) +static expression_t *new_new_expression(parser_ctx_t *ctx, expression_t *expression, argument_list_t *argument_list) { call_expression_t *ret = parser_alloc(ctx, sizeof(call_expression_t)); - ret->expr.eval = member_new_expression_eval; + ret->expr.eval = new_expression_eval; ret->expression = expression; ret->argument_list = argument_list ? argument_list->head : NULL; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 5f9848e..32bafc6 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -133,6 +133,9 @@ obj2.pvar = 3; testConstr1.prototype.pvar = 1; ok(obj2.pvar === 3, "obj2.pvar is not 3"); +var obj3 = new Object; +ok(typeof(obj3) === "object", "typeof(obj3) is not object"); + tmp = 0; if(true) tmp = 1;

1 0

Jacek Caban : jscript: Added break statement implementation.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: 32a3a167b6d133f6836a3fc264b0251c315ac783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32a3a167b6d133f6836a3fc26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:30:37 2008 +0200 jscript: Added break statement implementation. --- dlls/jscript/engine.c | 17 ++++++++++++++--- dlls/jscript/tests/lang.js | 16 ++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 649ff47..ab9f434 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -671,10 +671,21 @@ HRESULT continue_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_ return E_NOTIMPL; } -HRESULT break_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +/* ECMA-262 3rd Edition 12.8 */ +HRESULT break_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) { - FIXME("\n"); - return E_NOTIMPL; + branch_statement_t *stat = (branch_statement_t*)_stat; + + TRACE("\n"); + + if(stat->identifier) { + FIXME("indentifier not implemented\n"); + return E_NOTIMPL; + } + + rt->type = RT_BREAK; + V_VT(ret) = VT_EMPTY; + return S_OK; } /* ECMA-262 3rd Edition 12.9 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 19b7cbe..af865e5 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -446,4 +446,20 @@ case false: } ok(state === "false", "state = " + state); +state = ""; +switch(1) { +case "1": + ok(false, "unexpected case \"1\""); +case 1: + ok(state === "", "case 1: state = " + state); + state = "1"; +default: + ok(state === "1", "default: state = " + state); + state = "default"; + break; +case false: + ok(false, "unexpected case false"); +} +ok(state === "default", "state = " + state); + reportSuccess();

1 0

Jacek Caban : jscript: Added switch statement implementation.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: 2b16387708b2fc1842f726b899e8584eaf5c639f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b16387708b2fc1842f726b89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:30:20 2008 +0200 jscript: Added switch statement implementation. --- dlls/jscript/engine.c | 79 ++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/parser.y | 6 ++-- dlls/jscript/tests/lang.js | 30 ++++++++++++++++ 3 files changed, 109 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 6833954..649ff47 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -717,10 +717,83 @@ HRESULT labelled_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_ return E_NOTIMPL; } -HRESULT switch_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +/* ECMA-262 3rd Edition 12.13 */ +HRESULT switch_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) { - FIXME("\n"); - return E_NOTIMPL; + switch_statement_t *stat = (switch_statement_t*)_stat; + case_clausule_t *iter, *default_clausule = NULL; + statement_t *stat_iter; + VARIANT val, cval; + exprval_t exprval; + BOOL b; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx->parser->script, &exprval, &rt->ei, &val); + exprval_release(&exprval); + 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, 0, &rt->ei, &exprval); + if(FAILED(hres)) + break; + + hres = exprval_to_value(ctx->parser->script, &exprval, &rt->ei, &cval); + exprval_release(&exprval); + 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 */ diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 998ab81..5cef648 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -977,14 +977,14 @@ static case_clausule_t *new_case_block(parser_ctx_t *ctx, case_list_t *case_list if(!ret) return NULL; - for(iter = ret->next; iter->next; iter = iter->next) { - for(iter2 = iter; iter2 && !iter2->expr; iter2 = iter2->next); + for(iter = ret; iter; iter = iter->next) { + for(iter2 = iter; iter2 && !iter2->stat; iter2 = iter2->next); if(!iter2) break; while(iter != iter2) { iter->stat = iter2->stat; - iter2 = iter2->next; + iter = iter->next; } if(stat) { diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 32bafc6..19b7cbe 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -416,4 +416,34 @@ try { } ok(state === "finally", "state = " + state + " expected finally"); +state = ""; +switch(1) { +case "1": + ok(false, "unexpected case \"1\""); +case 1: + ok(state === "", "case 1: state = " + state); + state = "1"; +default: + ok(state === "1", "default: state = " + state); + state = "default"; +case false: + ok(state === "default", "case false: state = " + state); + state = "false"; +} +ok(state === "false", "state = " + state); + +state = ""; +switch("") { +case "1": +case 1: + ok(false, "unexpected case 1"); +default: + ok(state === "", "default: state = " + state); + state = "default"; +case false: + ok(state === "default", "case false: state = " + state); + state = "false"; +} +ok(state === "false", "state = " + state); + reportSuccess();

1 0

Alexandre Julliard : winex11: Don' t try to retrieve the X11 size on ShowWindow for zero-sized windows.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: 3cb23d3455f4efb7efc2124535df67c2f13f1406 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb23d3455f4efb7efc212453… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 17 21:13:11 2008 +0200 winex11: Don't try to retrieve the X11 size on ShowWindow for zero-sized windows. --- dlls/winex11.drv/window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index fb64299..4c03b4a 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2116,6 +2116,7 @@ UINT X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) if (!data || !data->whole_window || !data->managed || !data->mapped || data->iconic) return swp; if (style & WS_MINIMIZE) return swp; + if (IsRectEmpty( rect )) return swp; /* only fetch the new rectangle if the ShowWindow was a result of a window manager event */

1 0

Jacek Caban : jscript: Added '==' expression implementation.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: d699834892c0a47362c2f004a3222713ebda39ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d699834892c0a47362c2f004a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:29:16 2008 +0200 jscript: Added '==' expression implementation. --- dlls/jscript/engine.c | 119 ++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/lang.js | 12 +++++ 2 files changed, 128 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2b663d3..65eeaf7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1853,10 +1853,123 @@ HRESULT new_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, js return E_NOTIMPL; } -HRESULT equal_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.9.3 */ +static HRESULT equal_values(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, BOOL *ret) { - FIXME("\n"); - return E_NOTIMPL; + if(V_VT(lval) == V_VT(rval) || (is_num_vt(V_VT(lval)) && is_num_vt(V_VT(rval)))) + return equal2_values(lval, rval, ret); + + /* FIXME: NULL disps should be handled in more general way */ + if(V_VT(lval) == VT_DISPATCH && !V_DISPATCH(lval)) { + VARIANT v; + V_VT(&v) = VT_NULL; + return equal_values(ctx, &v, rval, ei, ret); + } + + if(V_VT(rval) == VT_DISPATCH && !V_DISPATCH(rval)) { + VARIANT v; + V_VT(&v) = VT_NULL; + return equal_values(ctx, lval, &v, ei, ret); + } + + if((V_VT(lval) == VT_NULL && V_VT(rval) == VT_EMPTY) || + (V_VT(lval) == VT_EMPTY && V_VT(rval) == VT_NULL)) { + *ret = TRUE; + return S_OK; + } + + if(V_VT(lval) == VT_BSTR && is_num_vt(V_VT(rval))) { + VARIANT v; + HRESULT hres; + + hres = to_number(ctx->parser->script, lval, ei, &v); + if(FAILED(hres)) + return hres; + + return equal_values(ctx, &v, rval, ei, ret); + } + + if(V_VT(rval) == VT_BSTR && is_num_vt(V_VT(lval))) { + VARIANT v; + HRESULT hres; + + hres = to_number(ctx->parser->script, rval, ei, &v); + if(FAILED(hres)) + return hres; + + return equal_values(ctx, lval, &v, ei, ret); + } + + if(V_VT(rval) == VT_BOOL) { + VARIANT v; + + V_VT(&v) = VT_I4; + V_I4(&v) = V_BOOL(rval) ? 1 : 0; + return equal_values(ctx, lval, &v, ei, ret); + } + + if(V_VT(lval) == VT_BOOL) { + VARIANT v; + + V_VT(&v) = VT_I4; + V_I4(&v) = V_BOOL(lval) ? 1 : 0; + return equal_values(ctx, &v, rval, ei, ret); + } + + + if(V_VT(rval) == VT_DISPATCH && (V_VT(lval) == VT_BSTR || is_num_vt(V_VT(lval)))) { + VARIANT v; + HRESULT hres; + + hres = to_primitive(ctx->parser->script, rval, ei, &v); + if(FAILED(hres)) + return hres; + + hres = equal_values(ctx, lval, &v, ei, ret); + + VariantClear(&v); + return hres; + } + + + if(V_VT(lval) == VT_DISPATCH && (V_VT(rval) == VT_BSTR || is_num_vt(V_VT(rval)))) { + VARIANT v; + HRESULT hres; + + hres = to_primitive(ctx->parser->script, lval, ei, &v); + if(FAILED(hres)) + return hres; + + hres = equal_values(ctx, &v, rval, ei, ret); + + VariantClear(&v); + return hres; + } + + + *ret = FALSE; + return S_OK; +} + +/* ECMA-262 3rd Edition 11.9.1 */ +HRESULT equal_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +{ + binary_expression_t *expr = (binary_expression_t*)_expr; + VARIANT rval, lval; + BOOL b; + HRESULT hres; + + TRACE("\n"); + + hres = get_binary_expr_values(ctx, expr, ei, &rval, &lval); + if(FAILED(hres)) + return hres; + + hres = equal_values(ctx, &rval, &lval, ei, &b); + if(FAILED(hres)) + return hres; + + return return_bool(ret, b); } /* ECMA-262 3rd Edition 11.9.4 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index bd2cfc9..c231180 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -37,6 +37,18 @@ ok(!(undefined === null), "!(undefined === null) is false"); ok(1 !== 2, "1 !== 2 is false"); ok(null !== undefined, "null !== undefined is false"); +ok(1 == 1, "1 == 1 is false"); +ok(!(1 == 2), "!(1 == 2) is false"); +ok(1.0 == 1, "1.0 == 1 is false"); +ok("abc" == "abc", "\"abc\" == \"abc\" is false"); +ok(true == true, "true == true is false"); +ok(null == null, "null == null is false"); +ok(undefined == undefined, "undefined == undefined is false"); +ok(undefined == null, "undefined == null is false"); +ok(true == 1, "true == 1 is false"); +ok(!(true == 2), "true == 2"); +ok(0 == false, "0 == false is false"); + var trueVar = true; ok(trueVar, "trueVar is not true");

1 0

Alexandre Julliard : winex11: Ignore the initial WM_STATE transition out of withdrawn state.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: ecf579b8c4425ad370a636c8edf86e2cfa47abad URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf579b8c4425ad370a636c8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 17 21:13:38 2008 +0200 winex11: Ignore the initial WM_STATE transition out of withdrawn state. --- dlls/winex11.drv/event.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index b45cecf..56abd7d 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -911,16 +911,21 @@ static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent switch(event->state) { case PropertyDelete: + TRACE( "%p/%lx: WM_STATE deleted from %d\n", data->hwnd, data->whole_window, data->wm_state ); data->wm_state = WithdrawnState; - TRACE( "%p/%lx: WM_STATE deleted\n", data->hwnd, data->whole_window ); break; case PropertyNewValue: { + int old_state = data->wm_state; int new_state = get_window_wm_state( event->display, data ); if (new_state != -1 && new_state != data->wm_state) { - TRACE( "%p/%lx: new WM_STATE %d\n", data->hwnd, data->whole_window, new_state ); + TRACE( "%p/%lx: new WM_STATE %d from %d\n", + data->hwnd, data->whole_window, new_state, old_state ); data->wm_state = new_state; + /* ignore the initial state transition out of withdrawn state */ + /* metacity does Withdrawn->NormalState->IconicState when mapping an iconic window */ + if (!old_state) return; } } break;

1 0

Jacek Caban : jscript: Added '!=' expression implementation.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: 47fcf8d0c7359865a99c10d5d1843580e8cc4d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47fcf8d0c7359865a99c10d5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:29:34 2008 +0200 jscript: Added '!=' expression implementation. --- dlls/jscript/engine.c | 18 ++++++++++++++++-- dlls/jscript/tests/lang.js | 3 +++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 65eeaf7..6f5beb4 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1993,11 +1993,25 @@ HRESULT equal2_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags return return_bool(ret, b); } +/* ECMA-262 3rd Edition 11.9.2 */ HRESULT not_equal_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { + binary_expression_t *expr = (binary_expression_t*)_expr; + VARIANT rval, lval; + BOOL b; + HRESULT hres; - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); + if(FAILED(hres)) + return hres; + + hres = equal_values(ctx, &lval, &rval, ei, &b); + if(FAILED(hres)) + return hres; + + return return_bool(ret, !b); } /* ECMA-262 3rd Edition 11.9.5 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index c231180..5f9848e 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -49,6 +49,9 @@ ok(true == 1, "true == 1 is false"); ok(!(true == 2), "true == 2"); ok(0 == false, "0 == false is false"); +ok(1 != 2, "1 != 2 is false"); +ok(false != 1, "false != 1 is false"); + var trueVar = true; ok(trueVar, "trueVar is not true");

1 0

Alexandre Julliard : winex11: Compare the window position against the cached position in ConfigureNotify .
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: 8e7dad93eff987e09bcf43264d988e5a145eadc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e7dad93eff987e09bcf43264… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 17 21:14:05 2008 +0200 winex11: Compare the window position against the cached position in ConfigureNotify. --- dlls/winex11.drv/event.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 56abd7d..a965b9f 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -825,12 +825,6 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) event->x, event->y, event->width, event->height ); X11DRV_X_to_window_rect( data, &rect ); - x = rect.left; - y = rect.top; - cx = rect.right - rect.left; - cy = rect.bottom - rect.top; - flags = SWP_NOACTIVATE | SWP_NOZORDER; - if (is_net_wm_state_maximized( event->display, data )) { if (!IsZoomed( data->hwnd )) @@ -852,21 +846,28 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) /* Compare what has changed */ - GetWindowRect( hwnd, &rect ); - if (rect.left == x && rect.top == y) flags |= SWP_NOMOVE; + x = rect.left; + y = rect.top; + cx = rect.right - rect.left; + cy = rect.bottom - rect.top; + flags = SWP_NOACTIVATE | SWP_NOZORDER; + + if (data->window_rect.left == x && data->window_rect.top == y) flags |= SWP_NOMOVE; else TRACE( "%p moving from (%d,%d) to (%d,%d)\n", - hwnd, rect.left, rect.top, x, y ); + hwnd, data->window_rect.left, data->window_rect.top, x, y ); - if ((rect.right - rect.left == cx && rect.bottom - rect.top == cy) || - (IsRectEmpty( &rect ) && event->width == 1 && event->height == 1)) + if ((data->window_rect.right - data->window_rect.left == cx && + data->window_rect.bottom - data->window_rect.top == cy) || + (IsRectEmpty( &data->window_rect ) && event->width == 1 && event->height == 1)) { if (flags & SWP_NOMOVE) return; /* if nothing changed, don't do anything */ flags |= SWP_NOSIZE; } else TRACE( "%p resizing from (%dx%d) to (%dx%d)\n", - hwnd, rect.right - rect.left, rect.bottom - rect.top, cx, cy ); + hwnd, data->window_rect.right - data->window_rect.left, + data->window_rect.bottom - data->window_rect.top, cx, cy ); SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); }

1 0

Alexandre Julliard : winex11: Force the X11 size of zero-sized window to always be 1x1.
by Alexandre Julliard Sept. 18, 2008

Sept. 18, 2008

Module: wine Branch: master Commit: 308476ef2f74d33126ecc51e0ea8d313b276b6a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=308476ef2f74d33126ecc51e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 17 21:11:47 2008 +0200 winex11: Force the X11 size of zero-sized window to always be 1x1. --- dlls/winex11.drv/window.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index bd370f6..fb64299 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1216,8 +1216,10 @@ static void sync_window_position( Display *display, struct x11drv_win_data *data /* resizing a managed maximized window is not allowed */ if (!(style & WS_MAXIMIZE) || !data->managed) { - if ((changes.width = data->whole_rect.right - data->whole_rect.left) <= 0) changes.width = 1; - if ((changes.height = data->whole_rect.bottom - data->whole_rect.top) <= 0) changes.height = 1; + changes.width = data->whole_rect.right - data->whole_rect.left; + changes.height = data->whole_rect.bottom - data->whole_rect.top; + /* if window rect is empty force size to 1x1 */ + if (changes.width <= 0 || changes.height <= 0) changes.width = changes.height = 1; mask |= CWWidth | CWHeight; }

1 0