September 2008 - Wine-Commits

Jacek Caban : jscript: Added Object default value implementation.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: c6188fdffcb2e2b0c6129d8777499378999393b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6188fdffcb2e2b0c6129d877… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:39:38 2008 +0200 jscript: Added Object default value implementation. --- dlls/jscript/object.c | 19 +++++++++++++++++-- dlls/jscript/tests/api.js | 3 +++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 2f021f7..02d80de 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -30,6 +30,8 @@ static const WCHAR propertyIsEnumerableW[] = {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; +static const WCHAR default_valueW[] = {'[','o','b','j','e','c','t',' ','O','b','j','e','c','t',']',0}; + static HRESULT Object_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -75,8 +77,21 @@ static HRESULT Object_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, D static HRESULT Object_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + switch(flags) { + case DISPATCH_PROPERTYGET: + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(default_valueW); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + break; + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static void Object_destructor(DispatchEx *dispex) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 0dfa178..f04eb55 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -18,6 +18,9 @@ var tmp; +tmp = "" + new Object(); +ok(tmp === "[object Object]", "'' + new Object() = " + tmp); + ok("".length === 0, "\"\".length = " + "".length); ok(getVT("".length) == "VT_I4", "\"\".length = " + "".length); ok("abc".length === 3, "\"abc\".length = " + "abc".length);

1 0

Jacek Caban : jscript: Added Array.concat implementation.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 5fa649cae6c95114ad7ecaaae216b4b9c8262be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa649cae6c95114ad7ecaaae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:39:18 2008 +0200 jscript: Added Array.concat implementation. --- dlls/jscript/array.c | 85 +++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 17 +++++++++ 2 files changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 11ae558..4dd59be 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -69,11 +69,90 @@ static HRESULT Array_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM return S_OK; } +static HRESULT concat_array(DispatchEx *array, ArrayInstance *obj, DWORD *len, LCID lcid, + jsexcept_t *ei, IServiceProvider *caller) +{ + VARIANT var; + DWORD i; + HRESULT hres; + + for(i=0; i < obj->length; i++) { + hres = jsdisp_propget_idx(&obj->dispex, i, lcid, &var, ei, caller); + if(hres == DISP_E_UNKNOWNNAME) + continue; + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_idx(array, *len+i, lcid, &var, ei, caller); + VariantClear(&var); + if(FAILED(hres)) + return hres; + } + + *len += obj->length; + return S_OK; +} + +static HRESULT concat_obj(DispatchEx *array, IDispatch *obj, DWORD *len, LCID lcid, jsexcept_t *ei, IServiceProvider *caller) +{ + DispatchEx *jsobj; + VARIANT var; + HRESULT hres; + + jsobj = iface_to_jsdisp((IUnknown*)obj); + if(jsobj) { + if(is_class(jsobj, JSCLASS_ARRAY)) { + hres = concat_array(array, (ArrayInstance*)jsobj, len, lcid, ei, caller); + jsdisp_release(jsobj); + return hres; + } + jsdisp_release(jsobj); + } + + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = obj; + return jsdisp_propput_idx(array, (*len)++, lcid, &var, ei, caller); +} + static HRESULT Array_concat(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + DispatchEx *ret; + DWORD len = 0; + HRESULT hres; + + TRACE("\n"); + + hres = create_array(dispex->ctx, 0, &ret); + if(FAILED(hres)) + return hres; + + hres = concat_obj(ret, (IDispatch*)_IDispatchEx_(dispex), &len, lcid, ei, caller); + if(SUCCEEDED(hres)) { + VARIANT *arg; + DWORD i; + + for(i=0; i < arg_cnt(dp); i++) { + arg = get_arg(dp, i); + if(V_VT(arg) == VT_DISPATCH) + hres = concat_obj(ret, V_DISPATCH(arg), &len, lcid, ei, caller); + else + hres = jsdisp_propput_idx(ret, len++, lcid, arg, ei, caller); + if(FAILED(hres)) + break; + } + } + + if(FAILED(hres)) + return hres; + + if(retv) { + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(ret); + }else { + jsdisp_release(ret); + } + return S_OK; } static HRESULT array_join(DispatchEx *array, LCID lcid, DWORD length, const WCHAR *sep, VARIANT *retv, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 9fa392e..0dfa178 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -104,6 +104,23 @@ ok(arr.sort() === arr, "arr.sort() !== arr"); for(var i=0; i < arr.length; i++) ok(arr[i] === tmp[i], "arr[" + i + "] = " + arr[i] + " expected " + tmp[i]); +var num = new Number(6); +arr = [0,1,2]; +tmp = arr.concat(3, [4,5], num); +ok(tmp !== arr, "tmp === arr"); +for(var i=0; i<6; i++) + ok(tmp[i] === i, "tmp[" + i + "] = " + tmp[i]); +ok(tmp[6] === num, "tmp[6] !== num"); +ok(tmp.length === 7, "tmp.length = " + tmp.length); + +arr = [].concat(); +ok(arr.length === 0, "arr.length = " + arr.lrngth); + +arr = [1,]; +tmp = arr.concat([2]); +ok(tmp.length === 3, "tmp.length = " + tmp.length); +ok(tmp[1] === undefined, "tmp[1] = " + tmp[1]); + var num = new Number(2); ok(num.toString() === "2", "num(2).toString !== 2"); var num = new Number();

1 0

Jacek Caban : jscript: Fixed array literal length calculation.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 45cd5bc4a22926fe3a896992ae8606e4e8bc8e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45cd5bc4a22926fe3a896992a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:38:52 2008 +0200 jscript: Fixed array literal length calculation. --- dlls/jscript/parser.y | 2 +- dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index a6cb5eb..c7c6fb4 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -725,7 +725,7 @@ ArrayLiteral : '[' Elision_opt ']' { $$ = new_array_literal_expression(ctx, NULL, $2); } | '[' ElementList ']' { $$ = new_array_literal_expression(ctx, $2, 0); } | '[' ElementList ',' Elision_opt ']' - { $$ = new_array_literal_expression(ctx, $2, $4); } + { $$ = new_array_literal_expression(ctx, $2, $4+1); } /* ECMA-262 3rd Edition 11.1.4 */ ElementList diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 484d192..5f13b05 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -592,6 +592,8 @@ ok(tmp["3"] === 2, "tmp[3] !== 2"); ok(tmp["6"] === true, "tmp[6] !== true"); ok(tmp[2] === 1, "tmp[2] !== 1"); +ok([1,].length === 2, "[1,].length !== 2"); + tmp = 0; while(tmp < 4) { ok(tmp < 4, "tmp >= 4");

1 0

Jacek Caban : jscript: Added Array.sort implementation.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: f1f2e8e6c575922d28216fd9a7be42458a770c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f2e8e6c575922d28216fd9a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:38:28 2008 +0200 jscript: Added Array.sort implementation. --- dlls/jscript/array.c | 210 ++++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/engine.c | 10 -- dlls/jscript/jscript.h | 10 ++ dlls/jscript/tests/api.js | 20 +++++ 4 files changed, 237 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 9d7c8d8..11ae558 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -265,11 +265,215 @@ static HRESULT Array_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS return E_NOTIMPL; } +static HRESULT sort_cmp(script_ctx_t *ctx, DispatchEx *cmp_func, VARIANT *v1, VARIANT *v2, jsexcept_t *ei, + IServiceProvider *caller, INT *cmp) +{ + HRESULT hres; + + if(cmp_func) { + VARIANTARG args[2]; + DISPPARAMS dp = {args, NULL, 2, 0}; + VARIANT tmp; + VARIANT res; + + args[0] = *v2; + args[1] = *v1; + + hres = jsdisp_call_value(cmp_func, ctx->lcid, DISPATCH_METHOD, &dp, &res, ei, caller); + if(FAILED(hres)) + return hres; + + hres = to_number(ctx, &res, ei, &tmp); + VariantClear(&res); + if(FAILED(hres)) + return hres; + + if(V_VT(&tmp) == VT_I4) + *cmp = V_I4(&tmp); + else + *cmp = V_R8(&tmp) > 0.0 ? 1 : -1; + }else if(is_num_vt(V_VT(v1))) { + if(is_num_vt(V_VT(v2))) { + DOUBLE d = num_val(v1)-num_val(v2); + if(d > 0.0) + *cmp = 1; + else if(d < -0.0) + *cmp = -1; + else + *cmp = 0; + }else { + *cmp = -1; + } + }else if(is_num_vt(V_VT(v2))) { + *cmp = 1; + }else if(V_VT(v1) == VT_BSTR) { + if(V_VT(v2) == VT_BSTR) + *cmp = strcmpW(V_BSTR(v1), V_BSTR(v2)); + else + *cmp = -1; + }else if(V_VT(v2) == VT_BSTR) { + *cmp = 1; + }else { + *cmp = 0; + } + + return S_OK; +} + +/* ECMA-262 3rd Edition 15.4.4.11 */ static HRESULT Array_sort(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + DispatchEx *cmp_func = NULL; + VARIANT *vtab, **sorttab = NULL; + DWORD length; + DWORD i; + HRESULT hres = S_OK; + + TRACE("\n"); + + if(is_class(dispex, JSCLASS_ARRAY)) { + length = ((ArrayInstance*)dispex)->length; + }else { + FIXME("unsupported this not array\n"); + return E_NOTIMPL; + } + + if(arg_cnt(dp) > 1) { + WARN("invalid arg_cnt %d\n", arg_cnt(dp)); + return E_FAIL; + } + + if(arg_cnt(dp) == 1) { + VARIANT *arg = get_arg(dp, 0); + + if(V_VT(arg) != VT_DISPATCH) { + WARN("arg is not dispatch\n"); + return E_FAIL; + } + + + cmp_func = iface_to_jsdisp((IUnknown*)V_DISPATCH(arg)); + if(!is_class(cmp_func, JSCLASS_FUNCTION)) { + WARN("cmp_func is not a function\n"); + jsdisp_release(cmp_func); + return E_FAIL; + } + } + + if(!length) { + if(cmp_func) + jsdisp_release(cmp_func); + if(retv) { + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(dispex); + IDispatchEx_AddRef(_IDispatchEx_(dispex)); + } + return S_OK; + } + + vtab = heap_alloc_zero(length * sizeof(VARIANT)); + if(vtab) { + for(i=0; i<length; i++) { + hres = jsdisp_propget_idx(dispex, i, lcid, vtab+i, ei, caller); + if(FAILED(hres) && hres != DISP_E_UNKNOWNNAME) { + WARN("Could not get elem %d: %08x\n", i, hres); + break; + } + } + }else { + hres = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hres)) { + sorttab = heap_alloc(length*2*sizeof(VARIANT*)); + if(!sorttab) + hres = E_OUTOFMEMORY; + } + + /* merge-sort */ + if(SUCCEEDED(hres)) { + VARIANT *tmpv, **tmpbuf; + INT cmp; + + tmpbuf = sorttab + length; + for(i=0; i < length; i++) + sorttab[i] = vtab+i; + + for(i=0; i < length/2; i++) { + hres = sort_cmp(dispex->ctx, cmp_func, sorttab[2*i+1], sorttab[2*i], ei, caller, &cmp); + if(FAILED(hres)) + break; + + if(cmp < 0) { + tmpv = sorttab[2*i]; + sorttab[2*i] = sorttab[2*i+1]; + sorttab[2*i+1] = tmpv; + } + } + + if(SUCCEEDED(hres)) { + DWORD k, a, b, bend; + + for(k=2; k < length; k *= 2) { + for(i=0; i+k < length; i += 2*k) { + a = b = 0; + if(i+2*k <= length) + bend = k; + else + bend = length - (i+k); + + memcpy(tmpbuf, sorttab+i, k*sizeof(VARIANT*)); + + while(a < k && b < bend) { + hres = sort_cmp(dispex->ctx, cmp_func, tmpbuf[a], sorttab[i+k+b], ei, caller, &cmp); + if(FAILED(hres)) + break; + + if(cmp < 0) { + sorttab[i+a+b] = tmpbuf[a]; + a++; + }else { + sorttab[i+a+b] = sorttab[i+k+b]; + b++; + } + } + + if(FAILED(hres)) + break; + + if(a < k) + memcpy(sorttab+i+a+b, tmpbuf+a, (k-a)*sizeof(VARIANT*)); + } + + if(FAILED(hres)) + break; + } + } + + for(i=0; SUCCEEDED(hres) && i < length; i++) + hres = jsdisp_propput_idx(dispex, i, lcid, sorttab[i], ei, caller); + } + + if(vtab) { + for(i=0; i < length; i++) + VariantClear(vtab+i); + heap_free(vtab); + } + heap_free(sorttab); + if(cmp_func) + jsdisp_release(cmp_func); + + if(FAILED(hres)) + return hres; + + if(retv) { + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(dispex); + IDispatch_AddRef(_IDispatchEx_(dispex)); + } + + return S_OK; } static HRESULT Array_splice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f0f5062..86ddbdd 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -278,16 +278,6 @@ static HRESULT disp_cmp(IDispatch *disp1, IDispatch *disp2, BOOL *ret) return S_OK; } -static inline BOOL is_num_vt(enum VARENUM vt) -{ - return vt == VT_I4 || vt == VT_R8; -} - -static inline DOUBLE num_val(const VARIANT *v) -{ - return V_VT(v) == VT_I4 ? V_I4(v) : V_R8(v); -} - /* 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 1857459..ed248c1 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -214,6 +214,16 @@ static inline BOOL is_class(DispatchEx *jsdisp, jsclass_t class) return jsdisp->builtin_info->class == class; } +static inline BOOL is_num_vt(enum VARENUM vt) +{ + return vt == VT_I4 || vt == VT_R8; +} + +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) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index ecc6da4..9fa392e 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -84,6 +84,26 @@ ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); tmp = arr.toString("test"); ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); +arr = [5,true,2,-1,3,false,"2.5"]; +tmp = arr.sort(function(x,y) { return y-x; }); +ok(tmp === arr, "tmp !== arr"); +tmp = [5,3,"2.5",2,true,false,-1]; +for(var i=0; i < arr.length; i++) + ok(arr[i] === tmp[i], "arr[" + i + "] = " + arr[i] + " expected " + tmp[i]); + +arr = [5,false,2,0,"abc",3,"a",-1]; +tmp = arr.sort(); +ok(tmp === arr, "tmp !== arr"); +tmp = [-1,0,2,3,5,"a","abc",false]; +for(var i=0; i < arr.length; i++) + ok(arr[i] === tmp[i], "arr[" + i + "] = " + arr[i] + " expected " + tmp[i]); + +arr = ["a", "b", "ab"]; +tmp = ["a", "ab", "b"]; +ok(arr.sort() === arr, "arr.sort() !== arr"); +for(var i=0; i < arr.length; i++) + ok(arr[i] === tmp[i], "arr[" + i + "] = " + arr[i] + " expected " + tmp[i]); + var num = new Number(2); ok(num.toString() === "2", "num(2).toString !== 2"); var num = new Number();

1 0

Jacek Caban : jscript: Added Number function implementation.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 53e831e2cb62fda468bf63c02ece2d31de5428d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e831e2cb62fda468bf63c02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:37:57 2008 +0200 jscript: Added Number function implementation. --- dlls/jscript/number.c | 17 +++++++++++++++++ dlls/jscript/tests/api.js | 4 ++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 5106deb..4ace40b 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -167,6 +167,23 @@ static HRESULT NumberConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DIS TRACE("\n"); switch(flags) { + case INVOKE_FUNC: + if(!arg_cnt(dp)) { + if(retv) { + V_VT(retv) = VT_I4; + V_I4(retv) = 0; + } + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &num); + if(FAILED(hres)) + return hres; + + if(retv) + *retv = num; + break; + case DISPATCH_CONSTRUCT: { DispatchEx *obj; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2e426be..ecc6da4 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -89,4 +89,8 @@ ok(num.toString() === "2", "num(2).toString !== 2"); var num = new Number(); ok(num.toString() === "0", "num().toString !== 0"); +ok(Number() === 0, "Number() = " + Number()); +ok(Number(false) === 0, "Number(false) = " + Number(false)); +ok(Number("43") === 43, "Number('43') = " + Number("43")); + reportSuccess();

1 0

Jacek Caban : jscript: Added Number.toString implementation.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: c3e2a6f9d7897d9615e35ebcc971723238d11376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e2a6f9d7897d9615e35ebcc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:37:32 2008 +0200 jscript: Added Number.toString implementation. --- dlls/jscript/number.c | 32 ++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 3 +++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index ebdbcf7..5106deb 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -39,11 +39,39 @@ static const WCHAR propertyIsEnumerableW[] = {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; +/* ECMA-262 3rd Edition 15.7.4.2 */ static HRESULT Number_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + NumberInstance *number; + BSTR str; + HRESULT hres; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_NUMBER)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + number = (NumberInstance*)dispex; + + if(arg_cnt(dp) != 0) { + FIXME("unsupported args\n"); + return E_NOTIMPL; + } + + hres = to_string(dispex->ctx, &number->num, ei, &str); + if(FAILED(hres)) + return hres; + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = str; + }else { + SysFreeString(str); + } + return S_OK; } static HRESULT Number_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 715b8dd..2e426be 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -85,5 +85,8 @@ tmp = arr.toString("test"); ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); var num = new Number(2); +ok(num.toString() === "2", "num(2).toString !== 2"); +var num = new Number(); +ok(num.toString() === "0", "num().toString !== 0"); reportSuccess();

1 0

Jacek Caban : jscript: Added Number constructor implementation.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 9b74d6a91cdd1d46e7543cb312f759ab586055bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b74d6a91cdd1d46e7543cb31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:37:15 2008 +0200 jscript: Added Number constructor implementation. --- dlls/jscript/number.c | 40 ++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 108cfff..ebdbcf7 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -133,8 +133,44 @@ static const builtin_info_t Number_info = { static HRESULT NumberConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT num; + HRESULT hres; + + TRACE("\n"); + + switch(flags) { + case DISPATCH_CONSTRUCT: { + DispatchEx *obj; + + switch(arg_cnt(dp)) { + case 0: + V_VT(&num) = VT_I4; + V_I4(&num) = 0; + break; + case 1: + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &num); + if(FAILED(hres)) + return hres; + break; + default: + FIXME("unimplemented args\n"); + return E_NOTIMPL; + } + + hres = create_number(dispex->ctx, &num, &obj); + if(FAILED(hres)) + return hres; + + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(obj); + break; + } + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT alloc_number(script_ctx_t *ctx, BOOL use_constr, NumberInstance **ret) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 78c0425..715b8dd 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -84,4 +84,6 @@ ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); tmp = arr.toString("test"); ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); +var num = new Number(2); + reportSuccess();

1 0

Jacek Caban : jscript: Added Array.join implementation.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: f62dd2a9fdc2a768205f93177285e89173caa093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62dd2a9fdc2a768205f93177… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:36:26 2008 +0200 jscript: Added Array.join implementation. --- dlls/jscript/array.c | 130 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/dispex.c | 28 ++++++++++ dlls/jscript/jscript.h | 6 ++ dlls/jscript/tests/api.js | 11 ++++ 4 files changed, 172 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 18ee3f5..944c0e8 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -47,6 +47,7 @@ static const WCHAR propertyIsEnumerableW[] = {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; +const WCHAR default_separatorW[] = {',',0}; static HRESULT Array_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) @@ -75,11 +76,134 @@ static HRESULT Array_concat(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM return E_NOTIMPL; } +static HRESULT array_join(DispatchEx *array, LCID lcid, DWORD length, const WCHAR *sep, VARIANT *retv, + jsexcept_t *ei, IServiceProvider *caller) +{ + BSTR *str_tab, ret = NULL; + VARIANT var; + DWORD i; + HRESULT hres = E_FAIL; + + if(!length) { + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocStringLen(NULL, 0); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + return S_OK; + } + + str_tab = heap_alloc_zero(length * sizeof(BSTR)); + if(!str_tab) + return E_OUTOFMEMORY; + + for(i=0; i < length; i++) { + hres = jsdisp_propget_idx(array, i, lcid, &var, ei, caller); + if(FAILED(hres)) + break; + + if(V_VT(&var) != VT_EMPTY && V_VT(&var) != VT_NULL) + hres = to_string(array->ctx, &var, ei, str_tab+i); + VariantClear(&var); + if(FAILED(hres)) + break; + } + + if(SUCCEEDED(hres)) { + DWORD seplen = 0, len = 0; + WCHAR *ptr; + + seplen = strlenW(sep); + + if(str_tab[0]) + len = SysStringLen(str_tab[0]); + for(i=1; i < length; i++) + len += seplen + SysStringLen(str_tab[i]); + + ret = SysAllocStringLen(NULL, len); + if(ret) { + DWORD tmplen = 0; + + if(str_tab[0]) { + tmplen = SysStringLen(str_tab[0]); + memcpy(ret, str_tab[0], tmplen*sizeof(WCHAR)); + } + + ptr = ret + tmplen; + for(i=1; i < length; i++) { + if(seplen) { + memcpy(ptr, sep, seplen*sizeof(WCHAR)); + ptr += seplen; + } + + if(str_tab[i]) { + tmplen = SysStringLen(str_tab[i]); + memcpy(ptr, str_tab[i], tmplen*sizeof(WCHAR)); + ptr += tmplen; + } + } + *ptr=0; + }else { + hres = E_OUTOFMEMORY; + } + } + + for(i=0; i < length; i++) + SysFreeString(str_tab[i]); + heap_free(str_tab); + if(FAILED(hres)) + return hres; + + TRACE("= %s\n", debugstr_w(ret)); + + if(retv) { + if(!ret) { + ret = SysAllocStringLen(NULL, 0); + if(!ret) + return E_OUTOFMEMORY; + } + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + }else { + SysFreeString(ret); + } + + return S_OK; +} + +/* ECMA-262 3rd Edition 15.4.4.5 */ static HRESULT Array_join(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + DWORD length; + HRESULT hres; + + TRACE("\n"); + + if(is_class(dispex, JSCLASS_ARRAY)) { + length = ((ArrayInstance*)dispex)->length; + }else { + FIXME("dispid is not Array\n"); + return E_NOTIMPL; + } + + if(arg_cnt(dp)) { + BSTR sep; + + hres = to_string(dispex->ctx, dp->rgvarg + dp->cArgs-1, ei, &sep); + if(FAILED(hres)) + return hres; + + hres = array_join(dispex, lcid, length, sep, retv, ei, caller); + + SysFreeString(sep); + }else { + hres = array_join(dispex, lcid, length, default_separatorW, retv, ei, caller); + } + + return hres; } static HRESULT Array_pop(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 1c643f6..7f7dd8c 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -931,6 +931,34 @@ HRESULT disp_propput(IDispatch *disp, DISPID id, LCID lcid, VARIANT *val, jsexce return hres; } +static HRESULT jsdisp_propget_name(DispatchEx *obj, const WCHAR *name, LCID lcid, VARIANT *var, + jsexcept_t *ei, IServiceProvider *caller) +{ + DISPPARAMS dp = {NULL, NULL, 0, 0}; + dispex_prop_t *prop; + HRESULT hres; + + hres = find_prop_name_prot(obj, name, FALSE, &prop); + if(FAILED(hres)) + return hres; + + V_VT(var) = VT_EMPTY; + if(!prop) + return S_OK; + + return prop_get(obj, prop, lcid, &dp, var, ei, caller); +} + +HRESULT jsdisp_propget_idx(DispatchEx *obj, DWORD idx, LCID lcid, VARIANT *var, jsexcept_t *ei, IServiceProvider *caller) +{ + WCHAR buf[12]; + + static const WCHAR formatW[] = {'%','d',0}; + + sprintfW(buf, formatW, idx); + return jsdisp_propget_name(obj, buf, lcid, var, ei, caller); +} + HRESULT disp_propget(IDispatch *disp, DISPID id, LCID lcid, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) { DISPPARAMS dp = {NULL,NULL,0,0}; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 6c4e272..1857459 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -126,6 +126,7 @@ HRESULT disp_propget(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvide HRESULT disp_propput(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propput_name(DispatchEx*,const WCHAR*,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propput_idx(DispatchEx*,DWORD,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); +HRESULT jsdisp_propget_idx(DispatchEx*,DWORD,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,DWORD,DispatchEx*,DispatchEx**); @@ -208,6 +209,11 @@ static inline DWORD arg_cnt(const DISPPARAMS *dp) return dp->cArgs - dp->cNamedArgs; } +static inline BOOL is_class(DispatchEx *jsdisp, jsclass_t class) +{ + return jsdisp->builtin_info->class == class; +} + static inline void num_set_val(VARIANT *v, DOUBLE d) { if(d == (DOUBLE)(INT)d) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c76a485..f331670 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -68,4 +68,15 @@ ok(arr.push(true, 'b', false) === 10, "arr.push(true, 'b', false) !== 10"); ok(arr[8] === "b", "arr[8] != 'b'"); ok(arr.length === 10, "arr.length != 10"); +arr = [1,2,null,false,undefined,,"a"]; + +tmp = arr.join(); +ok(tmp === "1,2,,false,,,a", "arr.join() = " + tmp); +tmp = arr.join(";"); +ok(tmp === "1;2;;false;;;a", "arr.join(';') = " + tmp); +tmp = arr.join(";","test"); +ok(tmp === "1;2;;false;;;a", "arr.join(';') = " + tmp); +tmp = arr.join(""); +ok(tmp === "12falsea", "arr.join('') = " + tmp); + reportSuccess();

1 0

Jacek Caban : jscript: Added Array.toString implementation.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 8b13719cd23f3e7bc29d4d3b6e0ffba2638ed835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b13719cd23f3e7bc29d4d3b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:36:46 2008 +0200 jscript: Added Array.toString implementation. --- dlls/jscript/array.c | 11 +++++++++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 944c0e8..9d7c8d8 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -279,11 +279,18 @@ static HRESULT Array_splice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.4.4.2 */ static HRESULT Array_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_ARRAY)) { + WARN("not Array object\n"); + return E_FAIL; + } + + return array_join(dispex, lcid, ((ArrayInstance*)dispex)->length, default_separatorW, retv, ei, sp); } static HRESULT Array_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f331670..78c0425 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -79,4 +79,9 @@ ok(tmp === "1;2;;false;;;a", "arr.join(';') = " + tmp); tmp = arr.join(""); ok(tmp === "12falsea", "arr.join('') = " + tmp); +tmp = arr.toString(); +ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); +tmp = arr.toString("test"); +ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); + reportSuccess();

1 0

Alistair Leslie-Hughes : mshtml: Implement IDispatch for IHTMLDOMChildrenCollection.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: bf84d3bc2debc8fbf5c240f250263436cc1c74cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf84d3bc2debc8fbf5c240f25… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Sep 20 20:03:28 2008 +1000 mshtml: Implement IDispatch for IHTMLDOMChildrenCollection. --- dlls/mshtml/htmlnode.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 6618c55..e923795 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -102,25 +102,21 @@ static ULONG WINAPI HTMLDOMChildrenCollection_Release(IHTMLDOMChildrenCollection static HRESULT WINAPI HTMLDOMChildrenCollection_GetTypeInfoCount(IHTMLDOMChildrenCollection *iface, UINT *pctinfo) { HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->dispex), pctinfo); } static HRESULT WINAPI HTMLDOMChildrenCollection_GetTypeInfo(IHTMLDOMChildrenCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLDOMChildrenCollection_GetIDsOfNames(IHTMLDOMChildrenCollection *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLDOMChildrenCollection_Invoke(IHTMLDOMChildrenCollection *iface, DISPID dispIdMember, @@ -128,9 +124,8 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_Invoke(IHTMLDOMChildrenCollectio VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLDOMChildrenCollection *This = HTMLCHILDCOL_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(DISPATCHEX(&This->dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLDOMChildrenCollection_get_length(IHTMLDOMChildrenCollection *iface, long *p)

1 0