September 2008 - Wine-commits

Jacek Caban : jscript: Added bool and null to number conversion implementation.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: 1bbc34f2f2c02b4e9087bd5f06c79804f6c94dfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bbc34f2f2c02b4e9087bd5f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:33:32 2008 +0200 jscript: Added bool and null to number conversion implementation. --- dlls/jscript/jsutils.c | 8 ++++++++ dlls/jscript/tests/lang.js | 3 +++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 09eed5b..19c3b8d 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -219,10 +219,18 @@ HRESULT to_boolean(VARIANT *v, VARIANT_BOOL *b) HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) { switch(V_VT(v)) { + case VT_NULL: + V_VT(ret) = VT_I4; + V_I4(ret) = 0; + break; case VT_I4: case VT_R8: *ret = *v; break; + case VT_BOOL: + V_VT(ret) = VT_I4; + V_I4(ret) = V_BOOL(v) ? 1 : 0; + break; default: FIXME("unimplemented for vt %d\n", V_VT(v)); return E_NOTIMPL; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index b4ab2b7..140ed0f 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -308,6 +308,9 @@ ok(getVT(tmp) === "VT_I4", "getVT(~1) = " + getVT(tmp)); ok((3,4) === 4, "(3,4) !== 4"); ok(+3 === 3, "+3 !== 3"); +ok(+true === 1, "+true !== 1"); +ok(+false === 0, "+false !== 0"); +ok(+null === 0, "+null !== 0"); ok(1 < 3.4, "1 < 3.4 failed"); ok(!(3.4 < 1), "3.4 < 1");

1 0

Jacek Caban : jscript: Added eval implementation.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: 44849c3fc90d09f18559d6f8e5ff190fc68efb0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=44849c3fc90d09f18559d6f8e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:34:05 2008 +0200 jscript: Added eval implementation. --- dlls/jscript/global.c | 43 ++++++++++++++++++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 26 ++++++++++++++++++++++++++ dlls/jscript/tests/run.c | 7 +++++-- 3 files changed, 71 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index a347101..70983fc 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -17,6 +17,7 @@ */ #include "jscript.h" +#include "engine.h" #include "wine/debug.h" @@ -169,11 +170,47 @@ static HRESULT JSGlobal_escape(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.1.2.1 */ static HRESULT JSGlobal_eval(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + parser_ctx_t *parser_ctx; + VARIANT *arg; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) + V_VT(retv) = VT_EMPTY; + return S_OK; + } + + arg = get_arg(dp, 0); + if(V_VT(arg) != VT_BSTR) { + if(retv) { + V_VT(retv) = VT_EMPTY; + return VariantCopy(retv, arg); + } + return S_OK; + } + + if(!dispex->ctx->exec_ctx) { + FIXME("No active exec_ctx\n"); + return E_UNEXPECTED; + } + + TRACE("parsing %s\n", debugstr_w(V_BSTR(arg))); + hres = script_parse(dispex->ctx, V_BSTR(arg), &parser_ctx); + if(FAILED(hres)) { + FIXME("parse failed: %08x\n", hres); + return hres; + } + + hres = exec_source(dispex->ctx->exec_ctx, parser_ctx, parser_ctx->source, ei, retv); + parser_release(parser_ctx); + + return hres; } static HRESULT JSGlobal_isNaN(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -274,7 +311,7 @@ static const builtin_prop_t JSGlobal_props[] = { {StringW, JSGlobal_String, PROPF_CONSTR}, {VBArrayW, JSGlobal_VBArray, PROPF_METHOD}, {escapeW, JSGlobal_escape, PROPF_METHOD}, - {evalW, JSGlobal_eval, PROPF_METHOD}, + {evalW, JSGlobal_eval, PROPF_METHOD|1}, {isFiniteW, JSGlobal_isFinite, PROPF_METHOD}, {isNaNW, JSGlobal_isNaN, PROPF_METHOD}, {parseFloatW, JSGlobal_parseFloat, PROPF_METHOD}, diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 140ed0f..8a47cf4 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -513,4 +513,30 @@ case false: } ok(state === "default", "state = " + state); +tmp = eval("1"); +ok(tmp === 1, "eval(\"1\") !== 1"); +eval("{ ok(tmp === 1, 'eval: tmp !== 1'); } tmp = 2;"); +ok(tmp === 2, "tmp !== 2"); + +ok(eval(false) === false, "eval(false) !== false"); +ok(eval() === undefined, "eval() !== undefined"); + +tmp = eval("1", "2"); +ok(tmp === 1, "eval(\"1\", \"2\") !== 1"); + +var state = ""; +try { + ok(state === "", "try: state = " + state); + state = "try"; + eval("throwFunc(true);"); +}catch(ex) { + ok(state === "try", "catch: state = " + state); + ok(ex === true, "ex is not true"); + state = "catch"; +}finally { + ok(state === "catch", "funally: state = " + state); + state = "finally"; +} +ok(state === "finally", "state = " + state + " expected finally"); + reportSuccess(); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 1b40237..ee9cccc 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -241,13 +241,16 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, { switch(id) { case DISPID_GLOBAL_OK: - ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); + ok(wFlags == INVOKE_FUNC || wFlags == (INVOKE_FUNC|INVOKE_PROPERTYGET), "wFlags = %x\n", wFlags); ok(pdp != NULL, "pdp == NULL\n"); ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); ok(pdp->cArgs == 2, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); - ok(!pvarRes, "pvarRes != NULL\n"); + if(wFlags & INVOKE_PROPERTYGET) + ok(pvarRes != NULL, "pvarRes == NULL\n"); + else + ok(!pvarRes, "pvarRes != NULL\n"); ok(pei != NULL, "pei == NULL\n"); ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg));

1 0

Jacek Caban : jscript: Added ',' expression implementation.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: c0bfbba859c99d4680d51bac73d7dd1661ac4758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0bfbba859c99d4680d51bac7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:32:43 2008 +0200 jscript: Added ',' expression implementation. --- dlls/jscript/engine.c | 20 +++++++++++++++++--- dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index cb2618b..d579485 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1388,10 +1388,24 @@ HRESULT property_value_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWO return S_OK; } -HRESULT comma_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.14 */ +HRESULT comma_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + VARIANT lval, rval; + HRESULT hres; + + TRACE("\n"); + + hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); + if(FAILED(hres)) + return hres; + + VariantClear(&lval); + + ret->type = EXPRVAL_VARIANT; + ret->u.var = rval; + return S_OK; } /* ECMA-262 3rd Edition 11.11 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index d57598d..18c0933 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -301,6 +301,8 @@ tmp = 5; ok((tmp ^= 3) === 6, "tmp(5) ^= 3 !== 6"); ok(getVT(tmp) === "VT_I4", "getVT(tmp ^= 3) = " + getVT(tmp)); +ok((3,4) === 4, "(3,4) !== 4"); + 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 plus expression implementation.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: 7c6b6c8ca840dc591d05bd3395163fb82eea7c3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6b6c8ca840dc591d05bd339… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:33:15 2008 +0200 jscript: Added plus expression implementation. --- dlls/jscript/engine.c | 28 +++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index ff20151..09b1efe 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1871,10 +1871,32 @@ HRESULT minus_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, return S_OK; } -HRESULT plus_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.4.6 */ +HRESULT plus_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + unary_expression_t *expr = (unary_expression_t*)_expr; + exprval_t exprval; + VARIANT val, num; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + hres = to_number(ctx->parser->script, &val, ei, &num); + if(FAILED(hres)) + return hres; + + ret->type = EXPRVAL_VARIANT; + ret->u.var = num; + return S_OK; } /* ECMA-262 3rd Edition 11.3.1 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 03c208a..b4ab2b7 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -307,6 +307,8 @@ ok(getVT(tmp) === "VT_I4", "getVT(~1) = " + getVT(tmp)); ok((3,4) === 4, "(3,4) !== 4"); +ok(+3 === 3, "+3 !== 3"); + 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 '~' expression implementation.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: 20bc98d5d86e6c0847a9be75b3272f4ba25d3712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20bc98d5d86e6c0847a9be75b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:32:59 2008 +0200 jscript: Added '~' expression implementation. --- dlls/jscript/engine.c | 30 +++++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 4 ++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d579485..ff20151 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2328,10 +2328,34 @@ HRESULT greatereq_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD fl return return_bool(ret, !b); } -HRESULT binary_negation_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.4.8 */ +HRESULT binary_negation_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + unary_expression_t *expr = (unary_expression_t*)_expr; + exprval_t exprval; + VARIANT val; + INT i; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + hres = to_int32(ctx->parser->script, &val, ei, &i); + if(FAILED(hres)) + return hres; + + ret->type = EXPRVAL_VARIANT; + V_VT(&ret->u.var) = VT_I4; + V_I4(&ret->u.var) = ~i; + return S_OK; } /* ECMA-262 3rd Edition 11.4.9 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 18c0933..03c208a 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -301,6 +301,10 @@ tmp = 5; ok((tmp ^= 3) === 6, "tmp(5) ^= 3 !== 6"); ok(getVT(tmp) === "VT_I4", "getVT(tmp ^= 3) = " + getVT(tmp)); +tmp = ~1; +ok(tmp === -2, "~1 !== -2"); +ok(getVT(tmp) === "VT_I4", "getVT(~1) = " + getVT(tmp)); + ok((3,4) === 4, "(3,4) !== 4"); ok(1 < 3.4, "1 < 3.4 failed");

1 0

Jacek Caban : jscript: Added '^=' expression implementation.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: 5288c5b07c8f0116d298cb6cece49b26d10cbf6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5288c5b07c8f0116d298cb6ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:32:27 2008 +0200 jscript: Added '^=' expression implementation. --- dlls/jscript/engine.c | 10 +++++++--- dlls/jscript/tests/lang.js | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 76e8830..cb2618b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2478,8 +2478,12 @@ HRESULT assign_or_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD fl return assign_oper_eval(ctx, expr->expression1, expr->expression2, bitor_eval, ei, ret); } -HRESULT assign_xor_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.13.2 */ +HRESULT assign_xor_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return assign_oper_eval(ctx, expr->expression1, expr->expression2, xor_eval, ei, ret); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index dd7c9fd..d57598d 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -297,6 +297,10 @@ tmp = 0xf0f0^0xff00; ok(tmp === 0x0ff0, "0xf0f0^0xff00 !== 0x0ff0"); ok(getVT(tmp) === "VT_I4", "getVT(0xf0f0^0xff00) = " + getVT(tmp)); +tmp = 5; +ok((tmp ^= 3) === 6, "tmp(5) ^= 3 !== 6"); +ok(getVT(tmp) === "VT_I4", "getVT(tmp ^= 3) = " + 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 '&' expression implementation.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: d2de1d310375d0fa97ff7f5b0b0cb93e1eca8d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2de1d310375d0fa97ff7f5b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:31:38 2008 +0200 jscript: Added '&' expression implementation. --- dlls/jscript/engine.c | 29 ++++++++++++++++++++++++++--- dlls/jscript/parser.y | 8 ++++---- dlls/jscript/tests/lang.js | 12 ++++++++++++ 3 files changed, 42 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index ee394a3..975a9bd 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1519,10 +1519,33 @@ HRESULT binary_xor_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD fl return E_NOTIMPL; } -HRESULT binary_and_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 bitand_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_and_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, bitand_eval, ei, ret); } HRESULT instanceof_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 5cef648..d8b876e 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -566,27 +566,27 @@ BitwiseORExpressionNoIn BitwiseXORExpression : BitwiseANDExpression { $$ = $1; } | BitwiseXORExpression '^' BitwiseANDExpression - { new_binary_expression(ctx, EXPR_BXOR, $1, $3); } + { $$ = new_binary_expression(ctx, EXPR_BXOR, $1, $3); } /* ECMA-262 3rd Edition 11.10 */ BitwiseXORExpressionNoIn : BitwiseANDExpressionNoIn { $$ = $1; } | BitwiseXORExpressionNoIn '^' BitwiseANDExpressionNoIn - { new_binary_expression(ctx, EXPR_BXOR, $1, $3); } + { $$ = new_binary_expression(ctx, EXPR_BXOR, $1, $3); } /* ECMA-262 3rd Edition 11.10 */ BitwiseANDExpression : EqualityExpression { $$ = $1; } | BitwiseANDExpression '&' EqualityExpression - { new_binary_expression(ctx, EXPR_BAND, $1, $3); } + { $$ = new_binary_expression(ctx, EXPR_BAND, $1, $3); } /* ECMA-262 3rd Edition 11.10 */ BitwiseANDExpressionNoIn : EqualityExpressionNoIn { $$ = $1; } | BitwiseANDExpressionNoIn '&' EqualityExpressionNoIn - { new_binary_expression(ctx, EXPR_BAND, $1, $3); } + { $$ = new_binary_expression(ctx, EXPR_BAND, $1, $3); } /* ECMA-262 3rd Edition 11.9 */ EqualityExpression diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 9d64505..4cb42ec 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -277,6 +277,18 @@ tmp = 10; ok((tmp |= 0x10) === 26, "tmp(10) |= 0x10 !== 26"); ok(getVT(tmp) === "VT_I4", "getVT(tmp |= 10) = " + getVT(tmp)); +tmp = 3 & 5; +ok(tmp === 1, "3 & 5 !== 1"); +ok(getVT(tmp) === "VT_I4", "getVT(3|5) = " + getVT(tmp)); + +tmp = 3.5 & 0xffff; +ok(tmp === 3, "3.5 & 0xffff !== 3 "); +ok(getVT(tmp) === "VT_I4", "getVT(3.5&0xffff) = " + getVT(tmp)); + +tmp = (-3.5) & 0xffffffff; +ok(tmp === -3, "-3.5 & 0xffff !== -3"); +ok(getVT(tmp) === "VT_I4", "getVT(3.5&0xffff) = " + 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 '&=' expression implementation.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: b8aeb15cb58f6ea5066dc847c11c62a8f52bd1a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8aeb15cb58f6ea5066dc847c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:31:54 2008 +0200 jscript: Added '&=' expression implementation. --- dlls/jscript/engine.c | 10 +++++++--- dlls/jscript/tests/lang.js | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 975a9bd..0da2d6e 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2435,10 +2435,14 @@ HRESULT assign_mod_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD fl return E_NOTIMPL; } -HRESULT assign_and_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.13.2 */ +HRESULT assign_and_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return assign_oper_eval(ctx, expr->expression1, expr->expression2, bitand_eval, ei, ret); } /* ECMA-262 3rd Edition 11.13.2 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 4cb42ec..9d64559 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -289,6 +289,10 @@ tmp = (-3.5) & 0xffffffff; ok(tmp === -3, "-3.5 & 0xffff !== -3"); ok(getVT(tmp) === "VT_I4", "getVT(3.5&0xffff) = " + getVT(tmp)); +tmp = 10; +ok((tmp &= 8) === 8, "tmp(10) &= 8 !== 8"); +ok(getVT(tmp) === "VT_I4", "getVT(tmp &= 8) = " + 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 '^' expression implementation.
by Alexandre Julliard 18 Sep '08

18 Sep '08

Module: wine Branch: master Commit: 7202197dfa0654a515dc85ebd0e77bad78b5c8a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7202197dfa0654a515dc85ebd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 23:32:11 2008 +0200 jscript: Added '^' expression implementation. --- dlls/jscript/engine.c | 29 ++++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 4 ++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0da2d6e..76e8830 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1513,10 +1513,33 @@ HRESULT binary_or_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD fl 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) +/* ECMA-262 3rd Edition 11.10 */ +static HRESULT xor_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_xor_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, xor_eval, ei, ret); } /* ECMA-262 3rd Edition 11.10 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 9d64559..dd7c9fd 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -293,6 +293,10 @@ tmp = 10; ok((tmp &= 8) === 8, "tmp(10) &= 8 !== 8"); ok(getVT(tmp) === "VT_I4", "getVT(tmp &= 8) = " + getVT(tmp)); +tmp = 0xf0f0^0xff00; +ok(tmp === 0x0ff0, "0xf0f0^0xff00 !== 0x0ff0"); +ok(getVT(tmp) === "VT_I4", "getVT(0xf0f0^0xff00) = " + 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 '|' expression implementation.
by Alexandre Julliard 18 Sep '08

18 Sep '08

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