wine-commits September 2008

wine-commits@winehq.org

3 participants
1215 discussions

Jacek Caban : jscript: Added Math.ceil implementation.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: 90dd23cc4c7416288ff8d5cb45523f073011f21e URL: http://source.winehq.org/git/wine.git/?a=commit;h=90dd23cc4c7416288ff8d5cb4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:46:45 2008 +0200 jscript: Added Math.ceil implementation. --- dlls/jscript/math.c | 21 ++++++++++++++++++--- dlls/jscript/tests/api.js | 15 +++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/… [View More]

1 0

Jacek Caban : jscript: Added Math.pow implementation.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: c4fe1b2efdb10c04a2a0fa984b42d7aa3e979880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4fe1b2efdb10c04a2a0fa984… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:46:22 2008 +0200 jscript: Added Math.pow implementation. --- dlls/jscript/math.c | 24 ++++++++++++++++++++++-- dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/… [View More]

1 0

Jacek Caban : jscript: Added Math.max implementation.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: 37b69e9a9eac535bc14ed8ee8afbc80954b00d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b69e9a9eac535bc14ed8ee8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:46:04 2008 +0200 jscript: Added Math.max implementation. --- dlls/jscript/math.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.… [View More]

1 0

Jacek Caban : jscript: Added Math.abs implementation.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: 2149494c9dfbfe7cf0d90090a6c2929cf8d79ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2149494c9dfbfe7cf0d90090a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:45:49 2008 +0200 jscript: Added Math.abs implementation. --- dlls/jscript/math.c | 22 ++++++++++++++++++++-- dlls/jscript/tests/api.js | 12 ++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/… [View More]

1 0

Jacek Caban : jscript: Added Math.round implementation.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: c395981b2fef13008a4aa807869b7d657f38abd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c395981b2fef13008a4aa8078… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:45:25 2008 +0200 jscript: Added Math.round implementation. --- dlls/jscript/math.c | 20 ++++++++++++++++++-- dlls/jscript/tests/api.js | 15 +++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/… [View More]

1 0

Jacek Caban : jscript: Added Math.min implementation.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: 50a24a4a1378e9bca1b6ff65055ab6d186048ee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a24a4a1378e9bca1b6ff650… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:45:00 2008 +0200 jscript: Added Math.min implementation. --- dlls/jscript/math.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.… [View More]c b/dlls/jscript/math.c index 8454cfa..a2aa6a9 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> + #include "jscript.h" #include "wine/debug.h" @@ -182,11 +184,42 @@ static HRESULT Math_max(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.8.2.12 */ static HRESULT Math_min(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + DOUBLE min, d; + VARIANT v; + DWORD i; + HRESULT hres; + + TRACE("\n"); + + /* FIXME: Handle NaN */ + + if(!arg_cnt(dp)) { + FIXME("arg_cnt = 0\n"); + return E_NOTIMPL; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + min = num_val(&v); + for(i=1; i < arg_cnt(dp); i++) { + hres = to_number(dispex->ctx, get_arg(dp, i), ei, &v); + if(FAILED(hres)) + return hres; + + d = num_val(&v); + if(d < min) + min = d; + } + + if(retv) + num_set_val(retv, min); + return S_OK; } static HRESULT Math_pow(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 04515e3..93f131d 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -246,4 +246,13 @@ ok(Number() === 0, "Number() = " + Number()); ok(Number(false) === 0, "Number(false) = " + Number(false)); ok(Number("43") === 43, "Number('43') = " + Number("43")); +tmp = Math.min(1); +ok(tmp === 1, "Math.min(1) = " + tmp); + +tmp = Math.min(1, false); +ok(tmp === 0, "Math.min(1, false) = " + tmp); + +tmp = Math.min(1, false, true, null, -3); +ok(tmp === -3, "Math.min(1, false, true, null, -3) = " + tmp); + reportSuccess(); [View Less]

1 0

Jacek Caban : jscript: Added String function implementation.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: 17ceb90b30f14fba20c8205870f2a2f89f7a1e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ceb90b30f14fba20c820587… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:44:29 2008 +0200 jscript: Added String function implementation. --- dlls/jscript/string.c | 19 +++++++++++++++++++ dlls/jscript/tests/api.js | 11 +++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/string.c b/… [View More]

1 0

Jacek Caban : jscript: Added String.concat implementation.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: 6751644835cc374baf5e04b80d878cee9f69c956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6751644835cc374baf5e04b80… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:44:13 2008 +0200 jscript: Added String.concat implementation. --- dlls/jscript/string.c | 55 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 7 +++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/… [View More]jscript/string.c b/dlls/jscript/string.c index b56fd9e..9da1bfb 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -241,11 +241,62 @@ static HRESULT String_charCodeAt(DispatchEx *dispex, LCID lcid, WORD flags, DISP return S_OK; } +/* ECMA-262 3rd Edition 15.5.4.6 */ static HRESULT String_concat(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + BSTR *strs = NULL, ret = NULL; + DWORD len = 0, i, l, str_cnt; + VARIANT var; + WCHAR *ptr; + HRESULT hres; + + TRACE("\n"); + + str_cnt = arg_cnt(dp)+1; + strs = heap_alloc_zero(str_cnt * sizeof(BSTR)); + if(!strs) + return E_OUTOFMEMORY; + + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = (IDispatch*)_IDispatchEx_(dispex); + + hres = to_string(dispex->ctx, &var, ei, strs); + if(SUCCEEDED(hres)) { + for(i=0; i < arg_cnt(dp); i++) { + hres = to_string(dispex->ctx, get_arg(dp, i), ei, strs+i+1); + if(FAILED(hres)) + break; + } + } + + if(SUCCEEDED(hres)) { + for(i=0; i < str_cnt; i++) + len += SysStringLen(strs[i]); + + ptr = ret = SysAllocStringLen(NULL, len); + + for(i=0; i < str_cnt; i++) { + l = SysStringLen(strs[i]); + memcpy(ptr, strs[i], l*sizeof(WCHAR)); + ptr += l; + } + } + + for(i=0; i < str_cnt; i++) + SysFreeString(strs[i]); + heap_free(strs); + + if(FAILED(hres)) + return hres; + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + }else { + SysFreeString(ret); + } + return S_OK; } static HRESULT String_fixed(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 707eacf..cea936d 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -133,6 +133,13 @@ ok(tmp === "abcd", "'abcd'.slice() = " + tmp); tmp = "abcd".slice(1); ok(tmp === "bcd", "'abcd'.slice(1) = " + tmp); +tmp = "abc".concat(["d",1],2,false); +ok(tmp === "abcd,12false", "concat returned " + tmp); +var arr = new Array(2,"a"); +arr.concat = String.prototype.concat; +tmp = arr.concat("d"); +ok(tmp === "2,ad", "arr.concat = " + tmp); + var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); ok((arr.length === 0), "arr.length is not 0"); [View Less]

1 0

Jacek Caban : jscript: Added String default value implementation.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: 1f134b41b32dc92738fcbb1730e68c72845d7f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f134b41b32dc92738fcbb173… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:43:50 2008 +0200 jscript: Added String default value implementation. --- dlls/jscript/string.c | 22 ++++++++++++++++++++-- dlls/jscript/tests/api.js | 3 +++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/… [View More]

1 0

Jacek Caban : jscript: Added String constructor implementation.
by Alexandre Julliard 22 Sep '08

22 Sep '08

Module: wine Branch: master Commit: 3925f13023161e9beda334a61b026ba78c58df4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3925f13023161e9beda334a61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:43:32 2008 +0200 jscript: Added String constructor implementation. --- dlls/jscript/string.c | 35 +++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 7 +++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/… [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2008