September 2008 - Wine-Commits

Jacek Caban : jscript: Remove no longer used jsdisp_set_prototype.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 84b69fb1aaa9b05402cdcfd9663f0fbfd2ebf760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84b69fb1aaa9b05402cdcfd96… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:43:09 2008 +0200 jscript: Remove no longer used jsdisp_set_prototype. --- dlls/jscript/dispex.c | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 7f7dd8c..63f41fa 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -698,23 +698,6 @@ static IDispatchExVtbl DispatchExVtbl = { DispatchEx_GetNameSpaceParent }; -HRESULT jsdisp_set_prototype(DispatchEx *dispex, DispatchEx *prototype) -{ - VARIANT *var; - - if(!dispex->props[1].name) - return E_OUTOFMEMORY; - - dispex->props[1].type = PROP_VARIANT; - dispex->props[1].flags = 0; - - var = &dispex->props[1].u.var; - V_VT(var) = VT_DISPATCH; - V_DISPATCH(var) = (IDispatch*)_IDispatchEx_(prototype); - - return S_OK; -} - HRESULT init_dispex(DispatchEx *dispex, script_ctx_t *ctx, const builtin_info_t *builtin_info, DispatchEx *prototype) { TRACE("%p (%p)\n", dispex, prototype);

1 0

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

Sept. 22, 2008

Module: wine Branch: master Commit: f8537b6eb976ea65136d8ba0b0190c422974c5db URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8537b6eb976ea65136d8ba0b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:42:48 2008 +0200 jscript: Added parseInt implementation. --- dlls/jscript/global.c | 75 ++++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 21 ++++++++++++- 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 4404bff..adee371 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -228,10 +228,83 @@ static HRESULT JSGlobal_isFinite(DispatchEx *dispex, LCID lcid, WORD flags, DISP return E_NOTIMPL; } +static INT char_to_int(WCHAR c) +{ + if('0' <= c && c <= '9') + return c - '0'; + if('a' <= c && c <= 'z') + return c - 'a' + 10; + if('A' <= c && c <= 'Z') + return c - 'A' + 10; + return 100; +} + static HRESULT JSGlobal_parseInt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - return E_NOTIMPL; + DOUBLE ret = 0.0; + INT radix=10, i; + WCHAR *ptr; + BOOL neg = FALSE; + BSTR str; + HRESULT hres; + + if(!arg_cnt(dp)) { + FIXME("NAN\n"); + return E_NOTIMPL; + } + + if(arg_cnt(dp) >= 2) { + hres = to_int32(dispex->ctx, get_arg(dp, 1), ei, &radix); + if(FAILED(hres)) + return hres; + + if(!radix) { + radix = 10; + }else if(radix < 2 || radix > 36) { + WARN("radix %d out of range\n", radix); + return E_FAIL; + } + } + + hres = to_string(dispex->ctx, get_arg(dp, 0), ei, &str); + if(FAILED(hres)) + return hres; + + for(ptr = str; isspaceW(*ptr); ptr++); + + switch(*ptr) { + case '+': + ptr++; + break; + case '-': + neg = TRUE; + ptr++; + break; + case '0': + ptr++; + if(*ptr == 'x' || *ptr == 'X') { + radix = 16; + ptr++; + } + } + + while(*ptr) { + i = char_to_int(*ptr++); + if(i > radix) + break; + + ret = ret*radix + i; + } + + SysFreeString(str); + + if(neg) + ret = -ret; + + if(retv) + num_set_val(retv, ret); + return S_OK; } static HRESULT JSGlobal_parseFloat(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f8b6607..8237ddb 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -16,7 +16,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -var tmp; +var tmp, i; + +i = parseInt("0"); +ok(i === 0, "parseInt('0') = " + i); +i = parseInt("123"); +ok(i === 123, "parseInt('123') = " + i); +i = parseInt("-123"); +ok(i === -123, "parseInt('-123') = " + i); +i = parseInt("0xff"); +ok(i === 0xff, "parseInt('0xff') = " + i); +i = parseInt("11", 8); +ok(i === 9, "parseInt('11', 8) = " + i); +i = parseInt("1j", 22); +ok(i === 41, "parseInt('1j', 32) = " + i); +i = parseInt("123", 0); +ok(i === 123, "parseInt('123', 0) = " + i); +i = parseInt("123", 10, "test"); +ok(i === 123, "parseInt('123', 10, 'test') = " + i); +i = parseInt("11", "8"); +ok(i === 9, "parseInt('11', '8') = " + i); tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp);

1 0

Jacek Caban : jscript: Added String.charCodeAt implementation.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 8612ae880f5db8d16192711f80565e7862f7e39e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8612ae880f5db8d16192711f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:42:23 2008 +0200 jscript: Added String.charCodeAt implementation. --- dlls/jscript/string.c | 39 +++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 13 +++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index e690477..d6a7a71 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -199,11 +199,46 @@ static HRESULT String_charAt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return S_OK; } +/* ECMA-262 3rd Edition 15.5.4.5 */ static HRESULT String_charCodeAt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + const WCHAR *str; + DWORD length, idx = 0; + HRESULT hres; + + TRACE("\n"); + + if(dispex->builtin_info->class == JSCLASS_STRING) { + StringInstance *string = (StringInstance*)dispex; + + str = string->str; + length = string->length; + }else { + FIXME("not string this not supported\n"); + return E_NOTIMPL; + } + + if(arg_cnt(dp) > 0) { + VARIANT v; + + hres = to_integer(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(V_VT(&v) != VT_I4 || V_I4(&v) < 0 || V_I4(&v) >= length) { + FIXME("NAN\n"); + return E_FAIL; + } + + idx = V_I4(&v); + } + + if(retv) { + V_VT(retv) = VT_I4; + V_I4(retv) = str[idx]; + } + return S_OK; } static HRESULT String_concat(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index b220bdb..f8b6607 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -57,6 +57,19 @@ ok(tmp === "", "'abc',charAt(-1) = " + tmp); tmp = "abc".charAt(0,2); ok(tmp === "a", "'abc',charAt(0.2) = " + tmp); +tmp = "abc".charCodeAt(0); +ok(tmp === 0x61, "'abc'.charCodeAt(0) = " + tmp); +tmp = "abc".charCodeAt(1); +ok(tmp === 0x62, "'abc'.charCodeAt(1) = " + tmp); +tmp = "abc".charCodeAt(2); +ok(tmp === 0x63, "'abc'.charCodeAt(2) = " + tmp); +tmp = "abc".charCodeAt(); +ok(tmp === 0x61, "'abc'.charCodeAt() = " + tmp); +tmp = "abc".charCodeAt(true); +ok(tmp === 0x62, "'abc'.charCodeAt(true) = " + tmp); +tmp = "abc".charCodeAt(0,2); +ok(tmp === 0x61, "'abc'.charCodeAt(0,2) = " + tmp); + tmp = "abcd".substring(1,3); ok(tmp === "bc", "'abcd'.substring(1,3) = " + tmp); tmp = "abcd".substring(-1,3);

1 0

Jacek Caban : jscript: Added String.slice implementation.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 2c6847d000655cc94ecb7bc729d6752748921af5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6847d000655cc94ecb7bc72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:42:05 2008 +0200 jscript: Added String.slice implementation. --- dlls/jscript/string.c | 75 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 17 ++++++++++ 2 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 60829ab..e690477 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -353,11 +353,82 @@ static HRESULT String_search(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.5.4.13 */ static HRESULT String_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + const WCHAR *str; + DWORD length; + INT start=0, end; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(is_class(dispex, JSCLASS_STRING)) { + StringInstance *string = (StringInstance*)dispex; + + str = string->str; + length = string->length; + }else { + FIXME("this is not a string class"); + return E_NOTIMPL; + } + + if(arg_cnt(dp)) { + hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-1, ei, &v); + if(FAILED(hres)) + return hres; + + if(V_VT(&v) == VT_I4) { + start = V_I4(&v); + if(start < 0) { + start = length + start; + if(start < 0) + start = 0; + }else if(start > length) { + start = length; + } + }else { + start = V_R8(&v) < 0.0 ? 0 : length; + } + }else { + start = 0; + } + + if(arg_cnt(dp) >= 2) { + hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-2, ei, &v); + if(FAILED(hres)) + return hres; + + if(V_VT(&v) == VT_I4) { + end = V_I4(&v); + if(end < 0) { + end = length + end; + if(end < 0) + end = 0; + }else if(end > length) { + end = length; + } + }else { + end = V_R8(&v) < 0.0 ? 0 : length; + } + }else { + end = length; + } + + if(end < start) + end = start; + + if(retv) { + BSTR retstr = SysAllocStringLen(str+start, end-start); + if(!str) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = retstr; + } + return S_OK; } static HRESULT String_small(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 9efe856..b220bdb 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -74,6 +74,23 @@ ok(tmp === "bc", "'abcd'.substring(1,3,2) = " + tmp); tmp = "abcd".substring(); ok(tmp === "abcd", "'abcd'.substring() = " + tmp); +tmp = "abcd".slice(1,3); +ok(tmp === "bc", "'abcd'.slice(1,3) = " + tmp); +tmp = "abcd".slice(1,-1); +ok(tmp === "bc", "'abcd'.slice(1,-1) = " + tmp); +tmp = "abcd".slice(-3,3); +ok(tmp === "bc", "'abcd'.slice(-3,3) = " + tmp); +tmp = "abcd".slice(-6,3); +ok(tmp === "abc", "'abcd'.slice(-6,3) = " + tmp); +tmp = "abcd".slice(3,1); +ok(tmp === "", "'abcd'.slice(3,1) = " + tmp); +tmp = "abcd".slice(true,3); +ok(tmp === "bc", "'abcd'.slice(true,3) = " + tmp); +tmp = "abcd".slice(); +ok(tmp === "abcd", "'abcd'.slice() = " + tmp); +tmp = "abcd".slice(1); +ok(tmp === "bcd", "'abcd'.slice(1) = " + 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 String.valueOf implementation.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 1388a6f421162736814d627c5d829405d72c8f46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1388a6f421162736814d627c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:41:42 2008 +0200 jscript: Added String.valueOf implementation. --- dlls/jscript/string.c | 6 ++++-- dlls/jscript/tests/api.js | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 657aa67..60829ab 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -114,11 +114,13 @@ static HRESULT String_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA return S_OK; } +/* ECMA-262 3rd Edition 15.5.4.2 */ static HRESULT String_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + return String_toString(dispex, lcid, flags, dp, retv, ei, sp); } static HRESULT String_anchor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 0db84b1..9efe856 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -33,6 +33,13 @@ ok(tmp === "test", "''.toString() = " + tmp); tmp = "test".toString(3); ok(tmp === "test", "''.toString(3) = " + tmp); +tmp = "".valueOf(); +ok(tmp === "", "''.valueOf() = " + tmp); +tmp = "test".valueOf(); +ok(tmp === "test", "''.valueOf() = " + tmp); +tmp = "test".valueOf(3); +ok(tmp === "test", "''.valueOf(3) = " + tmp); + tmp = "abc".charAt(0); ok(tmp === "a", "'abc',charAt(0) = " + tmp); tmp = "abc".charAt(1);

1 0

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

Sept. 22, 2008

Module: wine Branch: master Commit: 304e9fe0d41715b59468b58dad5f3e457565e764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=304e9fe0d41715b59468b58da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:41:25 2008 +0200 jscript: Added String.toString implementation. --- dlls/jscript/string.c | 23 +++++++++++++++++++++-- dlls/jscript/tests/api.js | 7 +++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index d8673b3..657aa67 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -88,11 +88,30 @@ static HRESULT String_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return S_OK; } +/* ECMA-262 3rd Edition 15.5.4.2 */ static HRESULT String_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + StringInstance *string; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_STRING)) { + WARN("this is not a string object\n"); + return E_FAIL; + } + + string = (StringInstance*)dispex; + + if(retv) { + BSTR str = SysAllocString(string->str); + if(!str) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = str; + } + return S_OK; } static HRESULT String_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 14d4dea..0db84b1 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -26,6 +26,13 @@ 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 = "".toString(); +ok(tmp === "", "''.toString() = " + tmp); +tmp = "test".toString(); +ok(tmp === "test", "''.toString() = " + tmp); +tmp = "test".toString(3); +ok(tmp === "test", "''.toString(3) = " + tmp); + tmp = "abc".charAt(0); ok(tmp === "a", "'abc',charAt(0) = " + tmp); tmp = "abc".charAt(1);

1 0

Jacek Caban : jscript: Added String.substring implementation.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 5fdf258b1a3e16a098d0d8e69d22185460d3c97f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fdf258b1a3e16a098d0d8e69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:41:02 2008 +0200 jscript: Added String.substring implementation. --- dlls/jscript/string.c | 68 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 17 +++++++++++ 2 files changed, 83 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 12140d5..d8673b3 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -367,11 +367,75 @@ static HRESULT String_sub(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.5.4.15 */ static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + const WCHAR *str; + INT start=0, end; + DWORD length; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(is_class(dispex, JSCLASS_STRING)) { + StringInstance *string = (StringInstance*)dispex; + + length = string->length; + str = string->str; + }else { + FIXME("not string this not supported\n"); + return E_NOTIMPL; + } + + if(arg_cnt(dp) >= 1) { + hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-1, ei, &v); + if(FAILED(hres)) + return hres; + + if(V_VT(&v) == VT_I4) { + start = V_I4(&v); + if(start < 0) + start = 0; + else if(start >= length) + start = length; + }else { + start = V_R8(&v) < 0.0 ? 0 : length; + } + } + + if(arg_cnt(dp) >= 2) { + hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-2, ei, &v); + if(FAILED(hres)) + return hres; + + if(V_VT(&v) == VT_I4) { + end = V_I4(&v); + if(end < 0) + end = 0; + else if(end > length) + end = length; + }else { + end = V_R8(&v) < 0.0 ? 0 : length; + } + }else { + end = length; + } + + if(start > end) { + INT tmp = start; + start = end; + end = tmp; + } + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocStringLen(str+start, end-start); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + return S_OK; } static HRESULT String_substr(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 4872263..14d4dea 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -43,6 +43,23 @@ ok(tmp === "", "'abc',charAt(-1) = " + tmp); tmp = "abc".charAt(0,2); ok(tmp === "a", "'abc',charAt(0.2) = " + tmp); +tmp = "abcd".substring(1,3); +ok(tmp === "bc", "'abcd'.substring(1,3) = " + tmp); +tmp = "abcd".substring(-1,3); +ok(tmp === "abc", "'abcd'.substring(-1,3) = " + tmp); +tmp = "abcd".substring(1,6); +ok(tmp === "bcd", "'abcd'.substring(1,6) = " + tmp); +tmp = "abcd".substring(3,1); +ok(tmp === "bc", "'abcd'.substring(3,1) = " + tmp); +tmp = "abcd".substring(2,2); +ok(tmp === "", "'abcd'.substring(2,2) = " + tmp); +tmp = "abcd".substring(true,"3"); +ok(tmp === "bc", "'abcd'.substring(true,'3') = " + tmp); +tmp = "abcd".substring(1,3,2); +ok(tmp === "bc", "'abcd'.substring(1,3,2) = " + tmp); +tmp = "abcd".substring(); +ok(tmp === "abcd", "'abcd'.substring() = " + 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: Fixed typo in to_integer.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: dff4f0b598ba66d0f201488a67fd9291ead8344c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff4f0b598ba66d0f201488a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:40:38 2008 +0200 jscript: Fixed typo in to_integer. --- dlls/jscript/jsutils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 6c0707d..cd7fa57 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -358,7 +358,7 @@ HRESULT to_integer(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) return hres; if(V_VT(&num) == VT_I4) - *ret = *v; + *ret = num; else num_set_val(ret, V_R8(&num) >= 0.0 ? floor(V_R8(&num)) : -floor(-V_R8(&num)));

1 0

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

Sept. 22, 2008

Module: wine Branch: master Commit: 898cb6fcd43fc8038c74c45552b69ef29a19e0da URL: http://source.winehq.org/git/wine.git/?a=commit;h=898cb6fcd43fc8038c74c4555… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:40:22 2008 +0200 jscript: Added Array default value implementation. --- dlls/jscript/array.c | 13 +++++++++++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 4dd59be..11c8b95 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -621,8 +621,17 @@ static HRESULT Array_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DI static HRESULT Array_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 INVOKE_PROPERTYGET: + return array_join(dispex, lcid, ((ArrayInstance*)dispex)->length, default_separatorW, retv, ei, sp); + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static void Array_destructor(DispatchEx *dispex) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f04eb55..4872263 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -58,6 +58,11 @@ ok(arr["2"] === "test", "arr[2] is not \"test\""); arr["7"] = true; ok((arr.length === 8), "arr.length is not 8"); +tmp = "" + []; +ok(tmp === "", "'' + [] = " + tmp); +tmp = "" + [1,true]; +ok(tmp === "1,true", "'' + [1,true] = " + tmp); + var arr = new Array(6); ok(typeof(arr) === "object", "arr (6) is not object"); ok((arr.length === 6), "arr.length is not 6");

1 0

Jacek Caban : jscript: for.. in is not error if in expression is not an object.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 2efae9e79b1cf6f7a2980d40b8d54b323f801761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2efae9e79b1cf6f7a2980d40b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:40:04 2008 +0200 jscript: for..in is not error if in expression is not an object. --- dlls/jscript/engine.c | 5 +++-- dlls/jscript/tests/lang.js | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 86ddbdd..5337b24 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -783,9 +783,10 @@ HRESULT forin_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t return hres; if(V_VT(&val) != VT_DISPATCH) { - FIXME("in vt %d\n", V_VT(&val)); + TRACE("in vt %d\n", V_VT(&val)); VariantClear(&val); - return E_NOTIMPL; + V_VT(ret) = VT_EMPTY; + return S_OK; } hres = IDispatch_QueryInterface(V_DISPATCH(&val), &IID_IDispatchEx, (void**)&in_obj); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 5f13b05..2a6e04a 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -142,6 +142,15 @@ ok(obj2.pvar === 3, "obj2.pvar is not 3"); var obj3 = new Object; ok(typeof(obj3) === "object", "typeof(obj3) is not object"); +for(var iter in "test") + ok(false, "unexpected forin call, test = " + iter); + +for(var iter in null) + ok(false, "unexpected forin call, test = " + iter); + +for(var iter in false) + ok(false, "unexpected forin call, test = " + iter); + tmp = 0; if(true) tmp = 1;

1 0