September 2008 - Wine-Commits

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

Sept. 22, 2008

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/jscript/math.c index dc6f365..8803f7c 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -272,11 +272,31 @@ static HRESULT Math_min(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d return S_OK; } +/* ECMA-262 3rd Edition 15.8.2.13 */ static HRESULT Math_pow(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT x, y; + HRESULT hres; + + TRACE("\n"); + + if(arg_cnt(dp) < 2) { + FIXME("unimplemented arg_cnt %d\n", arg_cnt(dp)); + return E_NOTIMPL; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &x); + if(FAILED(hres)) + return hres; + + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &y); + if(FAILED(hres)) + return hres; + + if(retv) + num_set_val(retv, pow(num_val(&x), num_val(&y))); + return S_OK; } static HRESULT Math_random(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 85bca45..7796623 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -291,4 +291,13 @@ ok(tmp === 1, "Math.abs(true) = " + tmp); tmp = Math.abs(-3, 2); ok(tmp === 3, "Math.abs(-3, 2) = " + tmp); +tmp = Math.pow(2, 2); +ok(tmp === 4, "Math.pow(2, 2) = " + tmp); + +tmp = Math.pow(4, 0.5); +ok(tmp === 2, "Math.pow(2, 2) = " + tmp); + +tmp = Math.pow(2, 2, 3); +ok(tmp === 4, "Math.pow(2, 2, 3) = " + tmp); + reportSuccess();

1 0

Jacek Caban : jscript: Don't call IDispatch as constructor.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 68bd72c7cd28bf1f1f80eb2f3d4f0091a2b74dda URL: http://source.winehq.org/git/wine.git/?a=commit;h=68bd72c7cd28bf1f1f80eb2f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 21 15:47:05 2008 +0200 jscript: Don't call IDispatch as constructor. --- dlls/jscript/dispex.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 63f41fa..896af91 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -844,6 +844,11 @@ HRESULT disp_call(IDispatch *disp, DISPID id, LCID lcid, WORD flags, DISPPARAMS if(FAILED(hres)) { UINT err = 0; + if(flags == DISPATCH_CONSTRUCT) { + WARN("IDispatch cannot be constructor\n"); + return DISP_E_MEMBERNOTFOUND; + } + TRACE("using IDispatch\n"); return IDispatch_Invoke(disp, id, &IID_NULL, lcid, flags, dp, retv, &ei->ei, &err); }

1 0

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

Sept. 22, 2008

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.c b/dlls/jscript/math.c index 74c01d1..dc6f365 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -195,13 +195,45 @@ static HRESULT Math_log(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.8.2.11 */ static HRESULT Math_max(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + DOUBLE max, 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; + + max = 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 > max) + max = d; + } + + if(retv) + num_set_val(retv, max); + return S_OK; } + /* 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) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 65c4992..85bca45 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -255,6 +255,15 @@ 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); +tmp = Math.max(1); +ok(tmp === 1, "Math.max(1) = " + tmp); + +tmp = Math.max(true, 0); +ok(tmp === 1, "Math.max(true, 0) = " + tmp); + +tmp = Math.max(-2, false, true, null, 1); +ok(tmp === 1, "Math.max(-2, false, true, null, 1) = " + tmp); + tmp = Math.round(0.5); ok(tmp === 1, "Math.round(0.5) = " + tmp);

1 0

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

Sept. 22, 2008

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/jscript/math.c index 2bcf5ad..74c01d1 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -107,11 +107,29 @@ static HRESULT Math_SQRT1_2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.8.2.12 */ static HRESULT Math_abs(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + DOUBLE d; + HRESULT hres; + + TRACE("\n"); + + 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; + + d = num_val(&v); + if(retv) + num_set_val(retv, d < 0.0 ? -d : d); + return S_OK; } static HRESULT Math_acos(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 34a6456..65c4992 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -270,4 +270,16 @@ ok(tmp === 1, "Math.round(true) = " + tmp); tmp = Math.round(1.1, 3, 4); ok(tmp === 1, "Math.round(1.1, 3, 4) = " + tmp); +tmp = Math.abs(3); +ok(tmp === 3, "Math.abs(3) = " + tmp); + +tmp = Math.abs(-3); +ok(tmp === 3, "Math.abs(-3) = " + tmp); + +tmp = Math.abs(true); +ok(tmp === 1, "Math.abs(true) = " + tmp); + +tmp = Math.abs(-3, 2); +ok(tmp === 3, "Math.abs(-3, 2) = " + tmp); + reportSuccess();

1 0

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

Sept. 22, 2008

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/jscript/math.c index a2aa6a9..2bcf5ad 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -236,11 +236,27 @@ static HRESULT Math_random(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.8.2.15 */ static HRESULT Math_round(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + 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; + + if(retv) + num_set_val(retv, floor(num_val(&v)+0.5)); + return S_OK; } static HRESULT Math_sin(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 93f131d..34a6456 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -255,4 +255,19 @@ 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); +tmp = Math.round(0.5); +ok(tmp === 1, "Math.round(0.5) = " + tmp); + +tmp = Math.round(-0.5); +ok(tmp === 0, "Math.round(-0.5) = " + tmp); + +tmp = Math.round(1.1); +ok(tmp === 1, "Math.round(1.1) = " + tmp); + +tmp = Math.round(true); +ok(tmp === 1, "Math.round(true) = " + tmp); + +tmp = Math.round(1.1, 3, 4); +ok(tmp === 1, "Math.round(1.1, 3, 4) = " + tmp); + reportSuccess();

1 0

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

Sept. 22, 2008

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.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();

1 0

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

Sept. 22, 2008

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/dlls/jscript/string.c index 9da1bfb..d4f58cd 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -772,7 +772,26 @@ static HRESULT StringConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DIS { HRESULT hres; + TRACE("\n"); + switch(flags) { + case INVOKE_FUNC: { + BSTR str; + + if(arg_cnt(dp)) { + hres = to_string(dispex->ctx, get_arg(dp, 0), ei, &str); + if(FAILED(hres)) + return hres; + }else { + str = SysAllocStringLen(NULL, 0); + if(!str) + return E_OUTOFMEMORY; + } + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = str; + break; + } case DISPATCH_CONSTRUCT: { DispatchEx *ret; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index cea936d..04515e3 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -69,6 +69,17 @@ ok(str.toString() === "test", "str.toString() = " + str.toString()); tmp = "value " + str; ok(tmp === "value test", "'value ' + str = " + tmp); +tmp = String(); +ok(tmp === "", "String() = " + tmp); +tmp = String(false); +ok(tmp === "false", "String(false) = " + tmp); +tmp = String(null); +ok(tmp === "null", "String(null) = " + tmp); +tmp = String("test"); +ok(tmp === "test", "String('test') = " + tmp); +tmp = String("test", "abc"); +ok(tmp === "test", "String('test','abc') = " + tmp); + tmp = "abc".charAt(0); ok(tmp === "a", "'abc',charAt(0) = " + tmp); tmp = "abc".charAt(1);

1 0

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

Sept. 22, 2008

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/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");

1 0

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

Sept. 22, 2008

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/dlls/jscript/string.c index 656b9ec..b56fd9e 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -638,8 +638,26 @@ static HRESULT String_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, D static HRESULT String_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + StringInstance *This = (StringInstance*)dispex; + + TRACE("\n"); + + switch(flags) { + case DISPATCH_PROPERTYGET: { + BSTR str = SysAllocString(This->str); + if(!str) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = str; + break; + } + default: + FIXME("flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static void String_destructor(DispatchEx *dispex) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f86ea1a..707eacf 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -66,6 +66,9 @@ ok(str.toString() === "", "str.toString() = " + str.toString()); var str = new String("test", "abc"); ok(str.toString() === "test", "str.toString() = " + str.toString()); +tmp = "value " + str; +ok(tmp === "value test", "'value ' + str = " + tmp); + tmp = "abc".charAt(0); ok(tmp === "a", "'abc',charAt(0) = " + tmp); tmp = "abc".charAt(1);

1 0

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

Sept. 22, 2008

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/jscript/string.c b/dlls/jscript/string.c index d6a7a71..656b9ec 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -701,8 +701,39 @@ static const builtin_info_t String_info = { static HRESULT StringConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + + switch(flags) { + case DISPATCH_CONSTRUCT: { + DispatchEx *ret; + + if(arg_cnt(dp)) { + BSTR str; + + hres = to_string(dispex->ctx, get_arg(dp, 0), ei, &str); + if(FAILED(hres)) + return hres; + + hres = create_string(dispex->ctx, str, SysStringLen(str), &ret); + SysFreeString(str); + }else { + hres = create_string(dispex->ctx, NULL, 0, &ret); + } + + if(FAILED(hres)) + return hres; + + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(ret); + break; + } + + default: + FIXME("unimplemented flags: %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT string_alloc(script_ctx_t *ctx, BOOL use_constr, StringInstance **ret) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 8237ddb..f86ea1a 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -59,6 +59,13 @@ ok(tmp === "test", "''.valueOf() = " + tmp); tmp = "test".valueOf(3); ok(tmp === "test", "''.valueOf(3) = " + tmp); +var str = new String("test"); +ok(str.toString() === "test", "str.toString() = " + str.toString()); +var str = new String(); +ok(str.toString() === "", "str.toString() = " + str.toString()); +var str = new String("test", "abc"); +ok(str.toString() === "test", "str.toString() = " + str.toString()); + tmp = "abc".charAt(0); ok(tmp === "a", "'abc',charAt(0) = " + tmp); tmp = "abc".charAt(1);

1 0