May 2012 - Wine-commits - list.winehq.org

Frédéric Delanoy : Assorted spelling fixes
by Jeremy Newman 03 May '12

03 May '12

Module: website Branch: master Commit: 10de369cdde4f94ece3494ee3149d776382d9add URL: http://source.winehq.org/git/website.git/?a=commit;h=10de369cdde4f94ece3494… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 3 02:11:30 2012 +0200 Assorted spelling fixes --- templates/en/acknowledgement.template | 4 ++-- templates/en/developer-cheatsheet.template | 16 ++++++++-------- templates/en/download.template | 2 +- templates/en/download/ubuntu.template | 2 +- templates/en/forums.template | 2 +- templates/en/irc.template | 2 +- templates/en/why.template | 4 ++-- templates/en/winelib.template | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=10de369cdde4f94ece…

1 0

Jacek Caban : jscript: Better handling of to_integer result in Array.splice .
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 3ee7438a5ffed4187dda3054449e898e2c269ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ee7438a5ffed4187dda30544… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 10:40:04 2012 +0200 jscript: Better handling of to_integer result in Array.splice. --- dlls/jscript/array.c | 22 +++++++++++++--------- dlls/jscript/tests/api.js | 22 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index fe8d751..e288525 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -853,6 +853,8 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP { DWORD length, start=0, delete_cnt=0, argc, i, add_args = 0; jsdisp_t *ret_array = NULL, *jsthis; + double d; + int n; VARIANT v; HRESULT hres = S_OK; @@ -867,14 +869,15 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP hres = to_integer(ctx, get_arg(dp,0), ei, &v); if(FAILED(hres)) return hres; + d = num_val(&v); - if(V_VT(&v) == VT_I4) { - if(V_I4(&v) >= 0) - start = min(V_I4(&v), length); + if(is_int32(d)) { + if((n = d) >= 0) + start = min(n, length); else - start = -V_I4(&v) > length ? 0 : length + V_I4(&v); + start = -n > length ? 0 : length + n; }else { - start = V_R8(&v) < 0.0 ? 0 : length; + start = d < 0.0 ? 0 : length; } } @@ -882,11 +885,12 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP hres = to_integer(ctx, get_arg(dp,1), ei, &v); if(FAILED(hres)) return hres; + d = num_val(&v); - if(V_VT(&v) == VT_I4) { - if(V_I4(&v) > 0) - delete_cnt = min(V_I4(&v), length-start); - }else if(V_R8(&v) > 0.0) { + if(is_int32(d)) { + if((n = d) > 0) + delete_cnt = min(n, length-start); + }else if(d > 0.0) { delete_cnt = length-start; } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e81bb3f..c1ae808 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -18,6 +18,8 @@ var tmp, i; +var bigInt = Math.pow(2,40); + ok(ScriptEngine() === "JScript", "ScriptEngine() = " + ScriptEngine()); ok(ScriptEngine(3) === "JScript", "ScriptEngine(3) = " + ScriptEngine(3)); ok(ScriptEngineMajorVersion() === ScriptEngineMajorVersion(2), "ScriptEngineMajorVersion() !== ScriptEngineMajorVersion(2)"); @@ -996,6 +998,26 @@ tmp = arr.splice(); ok(tmp.toString() == "", "arr.splice(2,-1) returned " + tmp.toString()); ok(arr.toString() == "1,2,3,4,5", "arr.splice(2,-1) is " + arr.toString()); +arr = [1,2,3,4,5]; +tmp = arr.splice(bigInt); +ok(tmp.toString() == "", "arr.splice(bigInt) returned " + tmp.toString()); +ok(arr.toString() == "1,2,3,4,5", "arr.splice(bigInt) is " + arr.toString()); + +arr = [1,2,3,4,5]; +tmp = arr.splice(-bigInt); +ok(tmp.toString() == "", "arr.splice(-bigInt) returned " + tmp.toString()); +ok(arr.toString() == "1,2,3,4,5", "arr.splice(-bigInt) is " + arr.toString()); + +arr = [1,2,3,4,5]; +tmp = arr.splice(2, bigInt); +ok(tmp.toString() == "3,4,5", "arr.splice(2, bigInt) returned " + tmp.toString()); +ok(arr.toString() == "1,2", "arr.splice(2, bigInt) is " + arr.toString()); + +arr = [1,2,3,4,5]; +tmp = arr.splice(2, -bigInt); +ok(tmp.toString() == "", "arr.splice(2, bigInt) returned " + tmp.toString()); +ok(arr.toString() == "1,2,3,4,5", "arr.splice(2, bigInt) is " + arr.toString()); + obj = new Object(); obj.length = 3; obj[0] = 1;

1 0

Jacek Caban : jscript: Better handling of to_integer result in String. charAt.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 0143201eac5257b806bb72f621ad73668f88fd68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0143201eac5257b806bb72f62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 10:40:13 2012 +0200 jscript: Better handling of to_integer result in String.charAt. --- dlls/jscript/string.c | 10 +++------- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index b629d57..bf9312d 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -303,19 +303,15 @@ static HRESULT String_charAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS if(arg_cnt(dp)) { VARIANT num; + double d; hres = to_integer(ctx, get_arg(dp, 0), ei, &num); if(FAILED(hres)) { SysFreeString(val_str); return hres; } - - if(V_VT(&num) == VT_I4) { - pos = V_I4(&num); - }else { - WARN("pos = %lf\n", V_R8(&num)); - pos = -1; - } + d = num_val(&num); + pos = is_int32(d) ? d : -1; } if(!retv) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c1ae808..f92cd48 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -308,6 +308,8 @@ tmp = "abc".charAt(0,2); ok(tmp === "a", "'abc',charAt(0.2) = " + tmp); tmp = "abc".charAt(NaN); ok(tmp === "a", "'abc',charAt(NaN) = " + tmp); +tmp = "abc".charAt(bigInt); +ok(tmp === "", "'abc',charAt(bigInt) = " + tmp); tmp = "abc".charCodeAt(0); ok(tmp === 0x61, "'abc'.charCodeAt(0) = " + tmp);

1 0

Jacek Caban : jscript: Better handling of to_integer result in String. charCodeAt.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 621180e81c260af68a28fcd793a1d4352eccac1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=621180e81c260af68a28fcd79… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 10:40:27 2012 +0200 jscript: Better handling of to_integer result in String.charCodeAt. --- dlls/jscript/string.c | 10 +++++++--- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index bf9312d..9f6dc4f 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -350,6 +350,7 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, if(arg_cnt(dp) > 0) { VARIANT v; + double d; hres = to_integer(ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) { @@ -357,13 +358,16 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return hres; } - if(V_VT(&v) != VT_I4 || V_I4(&v) < 0 || V_I4(&v) >= length) { - if(retv) num_set_nan(&v); + d = num_val(&v); + + if(!is_int32(d) || d < 0 || d >= length) { SysFreeString(val_str); + if(retv) + num_set_nan(retv); return S_OK; } - idx = V_I4(&v); + idx = d; } if(retv) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f92cd48..861019f 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -329,6 +329,8 @@ tmp = "\052".charCodeAt(0); ok(tmp === 0x2A, "'\052'.charCodeAt(0) = " + tmp); tmp = "\xa2".charCodeAt(0); ok(tmp === 0xA2, "'\xa2'.charCodeAt(0) = " + tmp); +tmp = "abc".charCodeAt(bigInt); +ok(isNaN(tmp), "'abc'.charCodeAt(bigInt) = " + tmp); tmp = "abcd".substring(1,3); ok(tmp === "bc", "'abcd'.substring(1,3) = " + tmp);

1 0

Jacek Caban : jscript: Bettter handling of to_number result in String. indexOf.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: baa07477d2c70debf13fce84980ac9539109ea91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baa07477d2c70debf13fce849… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 10:40:45 2012 +0200 jscript: Bettter handling of to_number result in String.indexOf. --- dlls/jscript/string.c | 10 ++++------ dlls/jscript/tests/api.js | 2 ++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 9f6dc4f..d74f8cf 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -494,15 +494,13 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI if(arg_cnt(dp) >= 2) { VARIANT ival; + double d; hres = to_integer(ctx, get_arg(dp,1), ei, &ival); if(SUCCEEDED(hres)) { - if(V_VT(&ival) == VT_I4) - pos = V_VT(&ival) > 0 ? V_I4(&ival) : 0; - else - pos = V_R8(&ival) > 0.0 ? length : 0; - if(pos > length) - pos = length; + d = num_val(&ival); + if(d > 0.0) + pos = is_int32(d) ? min((int)d, length) : length; } } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 861019f..8d8e819 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -475,6 +475,8 @@ tmp = "abcd".indexOf("bc",0,"test"); ok(tmp === 1, "indexOf = " + tmp); tmp = "abcd".indexOf(); ok(tmp == -1, "indexOf = " + tmp); +tmp = "abcd".indexOf("b", bigInt); +ok(tmp == -1, "indexOf = " + tmp); tmp = "abcd".lastIndexOf("bc",1); ok(tmp === 1, "lastIndexOf = " + tmp);

1 0

Jacek Caban : jscript: Better handling of to_integer result in String. lastIndexOf.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: d49635f08acaa5ed6bfc167a1759d8a9687d68c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49635f08acaa5ed6bfc167a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 10:40:57 2012 +0200 jscript: Better handling of to_integer result in String.lastIndexOf. --- dlls/jscript/string.c | 12 +++++------- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index d74f8cf..62cc6f0 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -538,7 +538,7 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags VARIANT *retv, jsexcept_t *ei) { BSTR search_str, val_str; - DWORD length, pos, search_len; + DWORD length, pos = 0, search_len; const WCHAR *str; INT ret = -1; HRESULT hres; @@ -568,15 +568,13 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(arg_cnt(dp) >= 2) { VARIANT ival; + double d; hres = to_integer(ctx, get_arg(dp,1), ei, &ival); if(SUCCEEDED(hres)) { - if(V_VT(&ival) == VT_I4) - pos = V_VT(&ival) > 0 ? V_I4(&ival) : 0; - else - pos = V_R8(&ival) > 0.0 ? length : 0; - if(pos > length) - pos = length; + d = num_val(&ival); + if(d > 0) + pos = is_int32(d) ? min((int)d, length) : length; } }else { pos = length; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 8d8e819..b25f0ae 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -496,6 +496,8 @@ tmp = "aaaa".lastIndexOf("a",2); ok(tmp == 2, "lastIndexOf = " + tmp); tmp = strObj.lastIndexOf("b"); ok(tmp === 1, "lastIndexOf = " + tmp); +tmp = "bbb".lastIndexOf("b", bigInt); +ok(tmp === 2, "lastIndexOf = " + tmp); tmp = "".toLowerCase(); ok(tmp === "", "''.toLowerCase() = " + tmp);

1 0

Jacek Caban : jscript: Better handling of to_integer result in String.slice .
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: c01562040da27ed0d0d1cd559281cd0064826eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c01562040da27ed0d0d1cd559… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 10:41:10 2012 +0200 jscript: Better handling of to_integer result in String.slice. --- dlls/jscript/string.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 62cc6f0..773e3a3 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1071,6 +1071,7 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP BSTR val_str; DWORD length; INT start=0, end; + double d; VARIANT v; HRESULT hres; @@ -1087,8 +1088,10 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP return hres; } - if(V_VT(&v) == VT_I4) { - start = V_I4(&v); + d = num_val(&v); + + if(is_int32(d)) { + start = d; if(start < 0) { start = length + start; if(start < 0) @@ -1096,11 +1099,9 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP }else if(start > length) { start = length; } - }else { - start = V_R8(&v) < 0.0 ? 0 : length; + }else if(d > 0) { + start = length; } - }else { - start = 0; } if(arg_cnt(dp) >= 2) { @@ -1110,8 +1111,10 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP return hres; } - if(V_VT(&v) == VT_I4) { - end = V_I4(&v); + d = num_val(&v); + + if(is_int32(d)) { + end = d; if(end < 0) { end = length + end; if(end < 0) @@ -1120,7 +1123,7 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP end = length; } }else { - end = V_R8(&v) < 0.0 ? 0 : length; + end = d < 0.0 ? 0 : length; } }else { end = length;

1 0

Jacek Caban : jscript: Better handling of to_integer result in String. substring.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 9b02d2d5a3c83a8819e4e1b4a83a2c789dab9b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b02d2d5a3c83a8819e4e1b4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 10:41:23 2012 +0200 jscript: Better handling of to_integer result in String.substring. --- dlls/jscript/string.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 773e3a3..3b7e700 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1302,6 +1302,7 @@ static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, INT start=0, end; DWORD length; VARIANT v; + double d; HRESULT hres; TRACE("\n"); @@ -1317,15 +1318,9 @@ static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, 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; - } + d = num_val(&v); + if(d >= 0) + start = is_int32(d) ? min((int)d, length) : length; } if(arg_cnt(dp) >= 2) { @@ -1335,15 +1330,11 @@ static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, 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; - } + d = num_val(&v); + if(d >= 0) + end = is_int32(d) ? min((int)d, length) : length; + else + end = 0; }else { end = length; }

1 0

Jacek Caban : jscript: Better handling of to_integer in String.substr.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: e26a3018e775715f360ee951164bc9418f71d299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e26a3018e775715f360ee9511… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 10:41:36 2012 +0200 jscript: Better handling of to_integer in String.substr. --- dlls/jscript/string.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 3b7e700..9e2fcb2 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1366,6 +1366,7 @@ static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS INT start=0, len; DWORD length; VARIANT v; + double d; HRESULT hres; TRACE("\n"); @@ -1381,15 +1382,9 @@ static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS 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; - } + d = num_val(&v); + if(d >= 0) + start = is_int32(d) ? min(length, d) : length; } if(arg_cnt(dp) >= 2) { @@ -1399,15 +1394,11 @@ static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS return hres; } - if(V_VT(&v) == VT_I4) { - len = V_I4(&v); - if(len < 0) - len = 0; - else if(len > length-start) - len = length-start; - }else { - len = V_R8(&v) < 0.0 ? 0 : length-start; - } + d = num_val(&v); + if(d >= 0.0) + len = is_int32(d) ? min(length-start, d) : length-start; + else + len = 0; }else { len = length-start; }

1 0

Jacek Caban : jscript: Return double from to_integer.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 56bf46fda0770d5de871b955f397bd8f1343cb7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=56bf46fda0770d5de871b955f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 10:42:42 2012 +0200 jscript: Return double from to_integer. --- dlls/jscript/array.c | 8 ++---- dlls/jscript/jscript.h | 2 +- dlls/jscript/jsutils.c | 15 +++++------- dlls/jscript/string.c | 56 +++++++++++++---------------------------------- 4 files changed, 26 insertions(+), 55 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index e288525..5ff6344 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -853,9 +853,9 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP { DWORD length, start=0, delete_cnt=0, argc, i, add_args = 0; jsdisp_t *ret_array = NULL, *jsthis; + VARIANT v; double d; int n; - VARIANT v; HRESULT hres = S_OK; TRACE("\n"); @@ -866,10 +866,9 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP argc = arg_cnt(dp); if(argc >= 1) { - hres = to_integer(ctx, get_arg(dp,0), ei, &v); + hres = to_integer(ctx, get_arg(dp,0), ei, &d); if(FAILED(hres)) return hres; - d = num_val(&v); if(is_int32(d)) { if((n = d) >= 0) @@ -882,10 +881,9 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP } if(argc >= 2) { - hres = to_integer(ctx, get_arg(dp,1), ei, &v); + hres = to_integer(ctx, get_arg(dp,1), ei, &d); if(FAILED(hres)) return hres; - d = num_val(&v); if(is_int32(d)) { if((n = d) > 0) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index c9bd6c0..dcdd143 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -254,7 +254,7 @@ typedef enum { HRESULT to_primitive(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*, hint_t) DECLSPEC_HIDDEN; HRESULT to_boolean(VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT to_number(script_ctx_t*,VARIANT*,jsexcept_t*,double*) DECLSPEC_HIDDEN; -HRESULT to_integer(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*) DECLSPEC_HIDDEN; +HRESULT to_integer(script_ctx_t*,VARIANT*,jsexcept_t*,double*) DECLSPEC_HIDDEN; HRESULT to_int32(script_ctx_t*,VARIANT*,jsexcept_t*,INT*) DECLSPEC_HIDDEN; HRESULT to_uint32(script_ctx_t*,VARIANT*,jsexcept_t*,DWORD*) DECLSPEC_HIDDEN; HRESULT to_string(script_ctx_t*,VARIANT*,jsexcept_t*,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 5e7e347..c3924b7 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -457,13 +457,13 @@ HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, double *ret) } /* ECMA-262 3rd Edition 9.4 */ -HRESULT to_integer(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) +HRESULT to_integer(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, double *ret) { double n; HRESULT hres; if(V_VT(v) == VT_I4) { - *ret = *v; + *ret = V_I4(v); return S_OK; } @@ -471,13 +471,10 @@ HRESULT to_integer(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) if(FAILED(hres)) return hres; - if(isnan(n)) { - V_VT(ret) = VT_I4; - V_I4(ret) = 0; - }else { - num_set_val(ret, n >= 0.0 ? floor(n) : -floor(-n)); - } - + if(isnan(n)) + *ret = 0; + else + *ret = n >= 0.0 ? floor(n) : -floor(-n); return S_OK; } diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 9e2fcb2..ea826c6 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -302,15 +302,13 @@ static HRESULT String_charAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS return hres; if(arg_cnt(dp)) { - VARIANT num; double d; - hres = to_integer(ctx, get_arg(dp, 0), ei, &num); + hres = to_integer(ctx, get_arg(dp, 0), ei, &d); if(FAILED(hres)) { SysFreeString(val_str); return hres; } - d = num_val(&num); pos = is_int32(d) ? d : -1; } @@ -349,17 +347,14 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return hres; if(arg_cnt(dp) > 0) { - VARIANT v; double d; - hres = to_integer(ctx, get_arg(dp, 0), ei, &v); + hres = to_integer(ctx, get_arg(dp, 0), ei, &d); if(FAILED(hres)) { SysFreeString(val_str); return hres; } - d = num_val(&v); - if(!is_int32(d) || d < 0 || d >= length) { SysFreeString(val_str); if(retv) @@ -493,15 +488,11 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI } if(arg_cnt(dp) >= 2) { - VARIANT ival; double d; - hres = to_integer(ctx, get_arg(dp,1), ei, &ival); - if(SUCCEEDED(hres)) { - d = num_val(&ival); - if(d > 0.0) - pos = is_int32(d) ? min((int)d, length) : length; - } + hres = to_integer(ctx, get_arg(dp,1), ei, &d); + if(SUCCEEDED(hres) && d > 0.0) + pos = is_int32(d) ? min(length, d) : length; } if(SUCCEEDED(hres)) { @@ -567,15 +558,11 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags search_len = SysStringLen(search_str); if(arg_cnt(dp) >= 2) { - VARIANT ival; double d; - hres = to_integer(ctx, get_arg(dp,1), ei, &ival); - if(SUCCEEDED(hres)) { - d = num_val(&ival); - if(d > 0) - pos = is_int32(d) ? min((int)d, length) : length; - } + hres = to_integer(ctx, get_arg(dp,1), ei, &d); + if(SUCCEEDED(hres) && d > 0) + pos = is_int32(d) ? min(length, d) : length; }else { pos = length; } @@ -1072,7 +1059,6 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP DWORD length; INT start=0, end; double d; - VARIANT v; HRESULT hres; TRACE("\n"); @@ -1082,14 +1068,12 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP return hres; if(arg_cnt(dp)) { - hres = to_integer(ctx, get_arg(dp,0), ei, &v); + hres = to_integer(ctx, get_arg(dp,0), ei, &d); if(FAILED(hres)) { SysFreeString(val_str); return hres; } - d = num_val(&v); - if(is_int32(d)) { start = d; if(start < 0) { @@ -1105,14 +1089,12 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP } if(arg_cnt(dp) >= 2) { - hres = to_integer(ctx, get_arg(dp,1), ei, &v); + hres = to_integer(ctx, get_arg(dp,1), ei, &d); if(FAILED(hres)) { SysFreeString(val_str); return hres; } - d = num_val(&v); - if(is_int32(d)) { end = d; if(end < 0) { @@ -1301,7 +1283,6 @@ static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, BSTR val_str; INT start=0, end; DWORD length; - VARIANT v; double d; HRESULT hres; @@ -1312,27 +1293,25 @@ static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return hres; if(arg_cnt(dp) >= 1) { - hres = to_integer(ctx, get_arg(dp,0), ei, &v); + hres = to_integer(ctx, get_arg(dp,0), ei, &d); if(FAILED(hres)) { SysFreeString(val_str); return hres; } - d = num_val(&v); if(d >= 0) - start = is_int32(d) ? min((int)d, length) : length; + start = is_int32(d) ? min(length, d) : length; } if(arg_cnt(dp) >= 2) { - hres = to_integer(ctx, get_arg(dp,1), ei, &v); + hres = to_integer(ctx, get_arg(dp,1), ei, &d); if(FAILED(hres)) { SysFreeString(val_str); return hres; } - d = num_val(&v); if(d >= 0) - end = is_int32(d) ? min((int)d, length) : length; + end = is_int32(d) ? min(length, d) : length; else end = 0; }else { @@ -1365,7 +1344,6 @@ static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS const WCHAR *str; INT start=0, len; DWORD length; - VARIANT v; double d; HRESULT hres; @@ -1376,25 +1354,23 @@ static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS return hres; if(arg_cnt(dp) >= 1) { - hres = to_integer(ctx, get_arg(dp,0), ei, &v); + hres = to_integer(ctx, get_arg(dp,0), ei, &d); if(FAILED(hres)) { SysFreeString(val_str); return hres; } - d = num_val(&v); if(d >= 0) start = is_int32(d) ? min(length, d) : length; } if(arg_cnt(dp) >= 2) { - hres = to_integer(ctx, get_arg(dp,1), ei, &v); + hres = to_integer(ctx, get_arg(dp,1), ei, &d); if(FAILED(hres)) { SysFreeString(val_str); return hres; } - d = num_val(&v); if(d >= 0.0) len = is_int32(d) ? min(length-start, d) : length-start; else

1 0