September 2008 - Wine-commits

Jacek Caban : jscript: Added '>>>' expression implementation.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: 13790a640b463aa97caae8bbfd1e393d5c001f4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=13790a640b463aa97caae8bbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 19 00:44:49 2008 +0200 jscript: Added '>>>' expression implementation. --- dlls/jscript/engine.c | 27 +++++++++++++++++++++++++-- dlls/jscript/tests/lang.js | 6 ++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 25120af..5f93ace 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2807,10 +2807,33 @@ HRESULT right_shift_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD return binary_expr_eval(ctx, expr, rshift_eval, ei, ret); } +/* ECMA-262 3rd Edition 11.7.3 */ +static HRESULT rshift2_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) +{ + DWORD li, ri; + HRESULT hres; + + hres = to_uint32(ctx->parser->script, lval, ei, &li); + if(FAILED(hres)) + return hres; + + hres = to_uint32(ctx->parser->script, rval, ei, &ri); + if(FAILED(hres)) + return hres; + + V_VT(retv) = VT_I4; + V_I4(retv) = li >> (ri&0x1f); + return S_OK; +} + +/* ECMA-262 3rd Edition 11.7.3 */ HRESULT right2_shift_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 binary_expr_eval(ctx, expr, rshift2_eval, ei, ret); } /* ECMA-262 3rd Edition 11.13.1 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 7599340..45bdd4e 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -301,6 +301,12 @@ ok(tmp === 2, "8 >> 2 = " + tmp); tmp = -64 >> 4; ok(tmp === -4, "-64 >> 4 = " + tmp); +tmp = 8 >>> 2; +ok(tmp === 2, "8 >> 2 = " + tmp); + +tmp = -64 >>> 4; +ok(tmp === 0x0ffffffc, "-64 >>> 4 = " + tmp); + tmp = 10; ok((tmp &= 8) === 8, "tmp(10) &= 8 !== 8"); ok(getVT(tmp) === "VT_I4", "getVT(tmp &= 8) = " + getVT(tmp));

1 0

Jacek Caban : jscript: Added delete expression implementation.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: 4e9749bf921e8ec4cd40dcfb3447a9e85a5cd3ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e9749bf921e8ec4cd40dcfb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 19 00:43:37 2008 +0200 jscript: Added delete expression implementation. --- dlls/jscript/engine.c | 38 ++++++++++++++++++++++-- dlls/jscript/tests/lang.js | 7 ++++ dlls/jscript/tests/run.c | 70 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 111 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 520398f..f4b065f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2014,10 +2014,42 @@ HRESULT mod_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, js return E_NOTIMPL; } -HRESULT delete_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.4.2 */ +HRESULT delete_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; + VARIANT_BOOL b = VARIANT_FALSE; + exprval_t exprval; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression, EXPR_STRREF, ei, &exprval); + if(FAILED(hres)) + return hres; + + switch(exprval.type) { + case EXPRVAL_NAMEREF: { + IDispatchEx *dispex; + + hres = IDispatch_QueryInterface(exprval.u.nameref.disp, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_DeleteMemberByName(dispex, exprval.u.nameref.name, fdexNameCaseSensitive); + b = VARIANT_TRUE; + IDispatchEx_Release(dispex); + } + break; + } + default: + FIXME("unsupported type %d\n", exprval.type); + hres = E_NOTIMPL; + } + + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + return return_bool(ret, b); } /* ECMA-262 3rd Edition 11.4.2 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 1e5fcf9..4359ca4 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -650,4 +650,11 @@ ok(arr["test1"] === true, "arr[test1] !== true"); ok(arr["test2"] === true, "arr[test2] !== true"); ok(arr["test3"] === true, "arr[test3] !== true"); +tmp = new Object(); +tmp.test = false; +ok((delete tmp.test) === true, "delete returned false"); +ok(typeof(tmp.test) === "undefined", "tmp.test type = " + typeof(tmp.test)); +for(iter in tmp) + ok(false, "tmp has prop " + iter); + reportSuccess(); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index ee9cccc..c40653a 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -63,6 +63,7 @@ DEFINE_EXPECT(global_propput_d); DEFINE_EXPECT(global_propput_i); DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); +DEFINE_EXPECT(testobj_delete); #define DISPID_GLOBAL_TESTPROPGET 0x1000 #define DISPID_GLOBAL_TESTPROPPUT 0x1001 @@ -70,6 +71,7 @@ DEFINE_EXPECT(global_success_i); #define DISPID_GLOBAL_TRACE 0x1003 #define DISPID_GLOBAL_OK 0x1004 #define DISPID_GLOBAL_GETVT 0x1005 +#define DISPID_GLOBAL_TESTOBJ 0x1006 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -195,6 +197,48 @@ static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown return E_NOTIMPL; } +static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testObj_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) +{ + CHECK_EXPECT(testobj_delete); + + ok(!strcmp_wa(bstrName, "deleteTest"), "unexpected name %s\n", debugstr_w(bstrName)); + ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); + return S_OK; +} + +static IDispatchExVtbl testObjVtbl = { + DispatchEx_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + DispatchEx_GetDispID, + DispatchEx_InvokeEx, + testObj_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx testObj = { &testObjVtbl }; + static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { if(!strcmp_wa(bstrName, "ok")) { @@ -230,6 +274,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_GETVT; return S_OK; } + if(!strcmp_wa(bstrName, "testObj")) { + ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); + *pid = DISPID_GLOBAL_TESTOBJ; + return S_OK; + } if(strict_dispid_check) ok(0, "unexpected call %s\n", debugstr_w(bstrName)); @@ -361,7 +410,22 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, } return S_OK; - } + + case DISPID_GLOBAL_TESTOBJ: + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgvarg, "rgvarg != NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch*)&testObj; + return S_OK; + } ok(0, "unexpected call %x\n", id); return DISP_E_MEMBERNOTFOUND; @@ -584,6 +648,10 @@ static void run_tests(void) CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + SET_EXPECT(testobj_delete); + parse_script_a("delete testObj.deleteTest;"); + CHECK_CALLED(testobj_delete); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Jacek Caban : jscript: Added with statement implementation.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: dfb867af56f4b15986482deef588d33d2458b101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb867af56f4b15986482deef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 19 00:43:53 2008 +0200 jscript: Added with statement implementation. --- dlls/jscript/engine.c | 44 +++++++++++++++++++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 4 ++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f4b065f..b89d808 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -924,12 +924,50 @@ HRESULT return_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t return S_OK; } -HRESULT with_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) +/* ECMA-262 3rd Edition 12.10 */ +HRESULT with_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) { - FIXME("\n"); - return E_NOTIMPL; + with_statement_t *stat = (with_statement_t*)_stat; + exprval_t exprval; + IDispatch *disp; + DispatchEx *obj; + VARIANT val; + 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; + + 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->scope_chain, obj, &ctx->scope_chain); + jsdisp_release(obj); + if(FAILED(hres)); + + hres = stat_eval(ctx, stat->statement, rt, ret); + + scope_pop(&ctx->scope_chain); + return hres; } +/* ECMA-262 3rd Edition 12.12 */ HRESULT labelled_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) { FIXME("\n"); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 4359ca4..9ad1cc3 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -657,4 +657,8 @@ ok(typeof(tmp.test) === "undefined", "tmp.test type = " + typeof(tmp.test)); for(iter in tmp) ok(false, "tmp has prop " + iter); +tmp.testWith = true; +with(tmp) + ok(testWith === true, "testWith !== true"); + reportSuccess();

1 0

Jacek Caban : jscript: Added '<<' expression implementation.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: ef78010df4975ccdd98c0f7496327505f39026c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef78010df4975ccdd98c0f749… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 19 00:44:11 2008 +0200 jscript: Added '<<' expression implementation. --- dlls/jscript/engine.c | 28 ++++++++++++++++++++++++++-- dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 14 ++++++++++++++ dlls/jscript/tests/lang.js | 6 ++++++ 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b89d808..ae41df4 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2747,10 +2747,34 @@ HRESULT logical_negation_expression_eval(exec_ctx_t *ctx, expression_t *_expr, D return return_bool(ret, !b); } +/* ECMA-262 3rd Edition 11.7.1 */ +static HRESULT lshift_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) +{ + DWORD ri; + INT li; + HRESULT hres; + + hres = to_int32(ctx->parser->script, lval, ei, &li); + if(FAILED(hres)) + return hres; + + hres = to_uint32(ctx->parser->script, rval, ei, &ri); + if(FAILED(hres)) + return hres; + + V_VT(retv) = VT_I4; + V_I4(retv) = li << (ri&0x1f); + return S_OK; +} + +/* ECMA-262 3rd Edition 11.7.1 */ HRESULT left_shift_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 binary_expr_eval(ctx, expr, lshift_eval, ei, ret); } HRESULT right_shift_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 776a2a3..603b279 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -142,6 +142,7 @@ HRESULT to_boolean(VARIANT*,VARIANT_BOOL*); HRESULT to_number(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*); HRESULT to_integer(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*); HRESULT to_int32(script_ctx_t*,VARIANT*,jsexcept_t*,INT*); +HRESULT to_uint32(script_ctx_t*,VARIANT*,jsexcept_t*,DWORD*); 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 027b077..4913568 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -273,6 +273,20 @@ HRESULT to_int32(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, INT *ret) return S_OK; } +/* ECMA-262 3rd Edition 9.6 */ +HRESULT to_uint32(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, DWORD *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) : (DWORD)V_R8(&num); + return S_OK; +} + static BSTR int_to_bstr(INT i) { WCHAR buf[12], *p; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 9ad1cc3..c7a79d8 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -289,6 +289,12 @@ tmp = (-3.5) & 0xffffffff; ok(tmp === -3, "-3.5 & 0xffff !== -3"); ok(getVT(tmp) === "VT_I4", "getVT(3.5&0xffff) = " + getVT(tmp)); +tmp = 2 << 3; +ok(tmp === 16, "2 << 3 = " + tmp); + +tmp = 2 << 35; +ok(tmp === 16, "2 << 35 = " + tmp); + tmp = 10; ok((tmp &= 8) === 8, "tmp(10) &= 8 !== 8"); ok(getVT(tmp) === "VT_I4", "getVT(tmp &= 8) = " + getVT(tmp));

1 0

Jacek Caban : jscript: Added void expression implementation.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: 536573934afb2722fc5867c39233a283f378c227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=536573934afb2722fc5867c39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 19 00:42:33 2008 +0200 jscript: Added void expression implementation. --- dlls/jscript/engine.c | 27 ++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 80bc9d9..a526431 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1939,12 +1939,33 @@ HRESULT delete_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, return E_NOTIMPL; } -HRESULT void_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.4.2 */ +HRESULT void_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 tmp; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx->parser->script, &exprval, ei, &tmp); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + VariantClear(&tmp); + + ret->type = EXPRVAL_VARIANT; + V_VT(&ret->u.var) = VT_EMPTY; + return S_OK; } +/* ECMA-262 3rd Edition 11.4.3 */ HRESULT typeof_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { unary_expression_t *expr = (unary_expression_t*)_expr; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 3b0d130..0ea4ef5 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -615,4 +615,6 @@ for(var fi=0; fi < 4; fi++) ok(fi < 4, "fi = " + fi); ok(fi === 4, "fi !== 4"); +ok((void 1) === undefined, "(void 1) !== undefined"); + reportSuccess();

1 0

Jacek Caban : jscript: Added String.charAt implementation.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: 4731f174352033a2d2c226afdf94b334b5a4ef22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4731f174352033a2d2c226afd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 19 00:43:03 2008 +0200 jscript: Added String.charAt implementation. --- dlls/jscript/engine.c | 11 ---------- dlls/jscript/jscript.h | 12 +++++++++++ dlls/jscript/jsutils.c | 20 +++++++++++++++++++ dlls/jscript/string.c | 46 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 19 ++++++++++++++++++ 5 files changed, 95 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a526431..0175bc7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -288,17 +288,6 @@ static inline DOUBLE num_val(const VARIANT *v) return V_VT(v) == VT_I4 ? V_I4(v) : V_R8(v); } -static inline void num_set_val(VARIANT *v, DOUBLE d) -{ - if(d == (DOUBLE)(INT)d) { - V_VT(v) = VT_I4; - V_I4(v) = d; - }else { - V_VT(v) = VT_R8; - V_R8(v) = d; - } -} - /* ECMA-262 3rd Edition 11.9.6 */ HRESULT equal2_values(VARIANT *lval, VARIANT *rval, BOOL *ret) { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 7c0c07b..776a2a3 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_integer(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**); @@ -204,6 +205,17 @@ static inline DWORD arg_cnt(const DISPPARAMS *dp) return dp->cArgs - dp->cNamedArgs; } +static inline void num_set_val(VARIANT *v, DOUBLE d) +{ + if(d == (DOUBLE)(INT)d) { + V_VT(v) = VT_I4; + V_I4(v) = d; + }else { + V_VT(v) = VT_R8; + V_R8(v) = d; + } +} + const char *debugstr_variant(const VARIANT*); HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 7184cb9..027b077 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> + #include "jscript.h" #include "engine.h" @@ -239,6 +241,24 @@ HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) return S_OK; } +/* ECMA-262 3rd Edition 9.4 */ +HRESULT to_integer(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) +{ + VARIANT num; + HRESULT hres; + + hres = to_number(ctx, v, ei, &num); + if(FAILED(hres)) + return hres; + + if(V_VT(&num) == VT_I4) + *ret = *v; + else + num_set_val(ret, V_R8(&num) >= 0.0 ? floor(V_R8(&num)) : -floor(-V_R8(&num))); + + return S_OK; +} + /* ECMA-262 3rd Edition 9.5 */ HRESULT to_int32(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, INT *ret) { diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 0831532..12140d5 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -130,11 +130,52 @@ static HRESULT String_bold(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.5.4.5 */ static HRESULT String_charAt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + StringInstance *strobj; + BSTR str; + INT pos = 0; + HRESULT hres; + + TRACE("\n"); + + if(dispex->builtin_info->class != JSCLASS_STRING) { + FIXME("not string this not supported\n"); + return E_NOTIMPL; + } + + strobj = (StringInstance*)dispex; + + if(arg_cnt(dp)) { + VARIANT num; + + hres = to_integer(dispex->ctx, get_arg(dp, 0), ei, &num); + if(FAILED(hres)) + return hres; + + if(V_VT(&num) == VT_I4) { + pos = V_I4(&num); + }else { + WARN("pos = %lf\n", V_R8(&num)); + pos = -1; + } + } + + if(!retv) + return S_OK; + + if(0 <= pos && pos < strobj->length) + str = SysAllocStringLen(strobj->str+pos, 1); + else + str = SysAllocStringLen(NULL, 0); + if(!str) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = str; + return S_OK; } static HRESULT String_charCodeAt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -200,6 +241,7 @@ static HRESULT String_link(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.5.4.10 */ static HRESULT String_match(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d6893e0..45765ed 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -16,11 +16,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +var tmp; + ok("".length === 0, "\"\".length = " + "".length); ok(getVT("".length) == "VT_I4", "\"\".length = " + "".length); ok("abc".length === 3, "\"abc\".length = " + "abc".length); ok(String.prototype.length === 0, "String.prototype.length = " + String.prototype.length); +tmp = "abc".charAt(0); +ok(tmp === "a", "'abc',charAt(0) = " + tmp); +tmp = "abc".charAt(1); +ok(tmp === "b", "'abc',charAt(1) = " + tmp); +tmp = "abc".charAt(2); +ok(tmp === "c", "'abc',charAt(2) = " + tmp); +tmp = "abc".charAt(3); +ok(tmp === "", "'abc',charAt(3) = " + tmp); +tmp = "abc".charAt(4); +ok(tmp === "", "'abc',charAt(4) = " + tmp); +tmp = "abc".charAt(); +ok(tmp === "a", "'abc',charAt() = " + tmp); +tmp = "abc".charAt(-1); +ok(tmp === "", "'abc',charAt(-1) = " + tmp); +tmp = "abc".charAt(0,2); +ok(tmp === "a", "'abc',charAt(0.2) = " + tmp); + var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); ok((arr.length === 0), "arr.length is not 0");

1 0

Jacek Caban : jscript: Added for..in statement implementation.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: 8e162404674d6981248fe940fca332ef58b9a785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e162404674d6981248fe940f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 19 00:43:21 2008 +0200 jscript: Added for..in statement implementation. --- dlls/jscript/dispex.c | 2 + dlls/jscript/engine.c | 100 ++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/lang.js | 33 ++++++++++++++ 3 files changed, 131 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 193a5b5..1c643f6 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -381,6 +381,8 @@ static HRESULT fill_protrefs(DispatchEx *This) fill_protrefs(This->prototype); for(iter = This->prototype->props; iter < This->prototype->props+This->prototype->prop_cnt; iter++) { + if(!iter->name) + continue; hres = find_prop_name(This, iter->name, &prop); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0175bc7..520398f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -764,10 +764,102 @@ HRESULT for_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t *r return S_OK; } -HRESULT forin_statement_eval(exec_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) -{ - FIXME("\n"); - return E_NOTIMPL; +/* ECMA-262 3rd Edition 12.6.4 */ +HRESULT forin_statement_eval(exec_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, EXPR_NEWREF, &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; + + if(V_VT(&val) != VT_DISPATCH) { + FIXME("in vt %d\n", V_VT(&val)); + VariantClear(&val); + return E_NOTIMPL; + } + + hres = IDispatch_QueryInterface(V_DISPATCH(&val), &IID_IDispatchEx, (void**)&in_obj); + IDispatch_Release(V_DISPATCH(&val)); + if(FAILED(hres)) { + FIXME("Object doesn't support IDispatchEx\n"); + return E_NOTIMPL; + } + + 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, &exprval); + else + hres = expr_eval(ctx, stat->expr, EXPR_NEWREF, &rt->ei, &exprval); + if(SUCCEEDED(hres)) { + V_VT(&name) = VT_BSTR; + V_BSTR(&name) = str; + hres = put_value(ctx->parser->script, &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.7 */ diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 0ea4ef5..1e5fcf9 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -617,4 +617,37 @@ ok(fi === 4, "fi !== 4"); ok((void 1) === undefined, "(void 1) !== undefined"); +var inobj = new Object(); + +for(var iter in inobj) + ok(false, "unexpected iter = " + iter); + +inobj.test = true; +tmp = 0; +for(iter in inobj) { + ok(iter == "test", "unexpected iter = " + iter); + tmp++; +} +ok(tmp === 1, "for..in tmp = " + tmp); + +function forinTestObj() {} + +forinTestObj.prototype.test3 = true; + +var arr = new Array(); +inobj = new forinTestObj(); +inobj.test1 = true; +inobj.test2 = true; + +tmp = 0; +for(iter in inobj) { + arr[iter] = true; + tmp++; +} + +ok(tmp === 3, "for..in tmp = " + tmp); +ok(arr["test1"] === true, "arr[test1] !== true"); +ok(arr["test2"] === true, "arr[test2] !== true"); +ok(arr["test3"] === true, "arr[test3] !== true"); + reportSuccess();

1 0

Alexandre Julliard : gdi32/tests: Skip test that depends on Tahoma if it isn't installed.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: ff6f7a57b9ddcd5396811074991fdf16b535efb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff6f7a57b9ddcd53968110749… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 19 12:07:32 2008 +0200 gdi32/tests: Skip test that depends on Tahoma if it isn't installed. --- dlls/gdi32/tests/font.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 7d2c036..b92aa74 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2328,6 +2328,12 @@ static void test_GetTextFace(void) HDC dc; int n; + if(!is_font_installed("Tahoma")) + { + skip("Tahoma is not installed so skipping this test\n"); + return; + } + /* 'A' case. */ memcpy(fA.lfFaceName, faceA, sizeof faceA); f = CreateFontIndirectA(&fA);

1 0

Christian Costa : d3dxof: Fix IDirectXFileDataImpl_GetType.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: 5c518d91e0070d2a8a45840c8cd3ec4e6e9bef6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c518d91e0070d2a8a45840c8… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Sep 18 21:47:40 2008 +0200 d3dxof: Fix IDirectXFileDataImpl_GetType. --- dlls/d3dxof/d3dxof.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 08d2885..23e4847 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1390,8 +1390,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetType(IDirectXFileData* iface, cons if (!pguid) return DXFILEERR_BADVALUE; - /* Native dll returns object guid instead of object template one */ - memcpy(&guid, &This->pobj->class_id, 16); + memcpy(&guid, &This->pobj->type, 16); *pguid = &guid; return DXFILE_OK; @@ -1803,6 +1802,7 @@ static BOOL parse_object(parse_buffer * buf) if (!strcmp((char*)buf->value, buf->pdxf->xtemplates[i].name)) { buf->pxt[buf->level] = &buf->pdxf->xtemplates[i]; + memcpy(&buf->pxo->type, &buf->pdxf->xtemplates[i].class_id, 16); break; } } @@ -1811,6 +1811,7 @@ static BOOL parse_object(parse_buffer * buf) FIXME("Unknown template %s\n", (char*)buf->value); return FALSE; } + if (check_TOKEN(buf) == TOKEN_NAME) { parse_TOKEN(buf);

1 0

Detlef Riekenberg : dlls: Do not use __WINE_ALLOC_SIZE between void and *.
by Alexandre Julliard 19 Sep '08

19 Sep '08

Module: wine Branch: master Commit: 9593c9e6f55409b26b77ee1f7ff02d697c6f4df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9593c9e6f55409b26b77ee1f7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Sep 19 05:35:49 2008 +0200 dlls: Do not use __WINE_ALLOC_SIZE between void and *. --- dlls/hhctrl.ocx/hhctrl.h | 8 ++++---- dlls/localspl/localspl_private.h | 7 ++++++- dlls/mshtml/mshtml_private.h | 6 +++--- dlls/riched20/editor.h | 4 ++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index f529a59..795bea4 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -141,22 +141,22 @@ BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR); /* memory allocation functions */ -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc(size_t len) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc_zero(size_t len) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } -static inline void __WINE_ALLOC_SIZE(2) *heap_realloc(void *mem, size_t len) +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), 0, mem, len); } -static inline void __WINE_ALLOC_SIZE(2) *heap_realloc_zero(void *mem, size_t len) +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); } diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index 614e108..8e67ed3 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -51,11 +51,16 @@ extern HINSTANCE LOCALSPL_hInstance; /* ## Memory allocation functions ## */ -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc( size_t len ) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) { return HeapAlloc( GetProcessHeap(), 0, len ); } +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); +} + static inline BOOL heap_free( void *mem ) { return HeapFree( GetProcessHeap(), 0, mem ); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4b4675b..5a9f533 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -654,17 +654,17 @@ extern LONG module_ref; /* memory allocation functions */ -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc(size_t len) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc_zero(size_t len) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } -static inline void __WINE_ALLOC_SIZE(2) *heap_realloc(void *mem, size_t len) +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), 0, mem, len); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index cbebdba..2c68378 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -25,7 +25,7 @@ struct _RTF_Info; extern HANDLE me_heap; -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc( size_t len ) +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) { return HeapAlloc( me_heap, 0, len ); } @@ -35,7 +35,7 @@ static inline BOOL heap_free( void *ptr ) return HeapFree( me_heap, 0, ptr ); } -static inline void __WINE_ALLOC_SIZE(2) *heap_realloc( void *ptr, size_t len ) +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc( void *ptr, size_t len ) { return HeapReAlloc( me_heap, 0, ptr, len ); }

1 0