July 2009 - Wine-Commits - list.winehq.org

Piotr Caban : jscript: Added Error_description and Error_number stubs.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 7c0a702001704cf0a0bb257d807d63536d39289e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c0a702001704cf0a0bb257d8… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:17 2009 +0200 jscript: Added Error_description and Error_number stubs. --- dlls/jscript/error.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 422412a..a9bcb55 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -25,16 +25,34 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { DispatchEx dispex; + VARIANT number; + VARIANT description; VARIANT message; } ErrorInstance; +static const WCHAR descriptionW[] = {'d','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0}; +static const WCHAR numberW[] = {'n','u','m','b','e','r',0}; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; 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 HRESULT Error_number(DispatchEx *dispex, LCID lcid, WORD flags, + DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Error_description(DispatchEx *dispex, LCID lcid, WORD flags, + DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + /* ECMA-262 3rd Edition 15.11.4.3 */ static HRESULT Error_message(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) @@ -110,9 +128,11 @@ static void Error_destructor(DispatchEx *dispex) } static const builtin_prop_t Error_props[] = { + {descriptionW, Error_description, 0}, {hasOwnPropertyW, Error_hasOwnProperty, PROPF_METHOD}, {isPrototypeOfW, Error_isPrototypeOf, PROPF_METHOD}, {messageW, Error_message, 0}, + {numberW, Error_number, 0}, {propertyIsEnumerableW, Error_propertyIsEnumerable, PROPF_METHOD}, {toStringW, Error_toString, PROPF_METHOD} }; @@ -127,9 +147,11 @@ static const builtin_info_t Error_info = { }; static const builtin_prop_t ErrorInst_props[] = { + {descriptionW, Error_description, 0}, {hasOwnPropertyW, Error_hasOwnProperty, PROPF_METHOD}, {isPrototypeOfW, Error_isPrototypeOf, PROPF_METHOD}, {messageW, Error_message, 0}, + {numberW, Error_number, 0}, {propertyIsEnumerableW, Error_propertyIsEnumerable, PROPF_METHOD} };

1 0

Piotr Caban : jscript: Throw errors in Number functions.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 3afc444e7f8365fc407e28435917fe82279d1d82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3afc444e7f8365fc407e28435… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:15 2009 +0200 jscript: Throw errors in Number functions. --- dlls/jscript/jscript_En.rc | 2 ++ dlls/jscript/number.c | 18 ++++++------------ dlls/jscript/resource.h | 2 ++ dlls/jscript/tests/api.js | 2 ++ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 40b64c9..8a0a9a9 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -22,9 +22,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { + IDS_INVALID_CALL_ARG "Invalid procedure call or argument" IDS_NO_PROPERTY "Object doesn't support this property or method" IDS_ARG_NOT_OPT "Argument not optional" IDS_NOT_DATE "'[object]' is not a date object" + IDS_NOT_NUM "Number expected" IDS_NOT_BOOL "Boolean object expected" IDS_INVALID_LENGTH "Array length must be a finite positive integer" } diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 5399c91..28049a9 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -54,10 +54,8 @@ static HRESULT Number_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA TRACE("\n"); - if(!is_class(dispex, JSCLASS_NUMBER)) { - FIXME("throw TypeError\n"); - return E_FAIL; - } + if(!is_class(dispex, JSCLASS_NUMBER)) + return throw_type_error(dispex->ctx, ei, IDS_NOT_NUM, NULL); number = (NumberInstance*)dispex; @@ -66,10 +64,8 @@ static HRESULT Number_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA if(FAILED(hres)) return hres; - if(radix<2 || radix>36) { - FIXME("throw TypeError\n"); - return E_FAIL; - } + if(radix<2 || radix>36) + return throw_type_error(dispex->ctx, ei, IDS_INVALID_CALL_ARG, NULL); } if(V_VT(&number->num) == VT_I4) @@ -208,10 +204,8 @@ static HRESULT Number_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR { TRACE("\n"); - if(!is_class(dispex, JSCLASS_NUMBER)) { - FIXME("throw TypeError\n"); - return E_FAIL; - } + if(!is_class(dispex, JSCLASS_NUMBER)) + return throw_type_error(dispex->ctx, ei, IDS_NOT_NUM, NULL); if(retv) { NumberInstance *number = (NumberInstance*)dispex; diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 44c04a8..8caff6a 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -18,8 +18,10 @@ #include <windef.h> +#define IDS_INVALID_CALL_ARG 0x0005 #define IDS_NO_PROPERTY 0x01B6 #define IDS_ARG_NOT_OPT 0x01c1 #define IDS_NOT_DATE 0x138E +#define IDS_NOT_NUM 0x1389 #define IDS_NOT_BOOL 0x1392 #define IDS_INVALID_LENGTH 0x13A5 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d0e5995..4cf5bb6 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1302,5 +1302,7 @@ exception_test(function() {Array(-3);}, "RangeError"); exception_test(function() {arr.toString = Boolean.prototype.toString; arr.toString();}, "TypeError"); exception_test(function() {date.setTime();}, "TypeError"); exception_test(function() {arr.test();}, "TypeError"); +exception_test(function() {arr.toString = Number.prototype.toString; arr.toString();}, "TypeError"); +exception_test(function() {(new Number(3)).toString(1);}, "TypeError"); reportSuccess();

1 0

Piotr Caban : jscript: Throw TypeError in call_expression_eval.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: f89fbb9b48817123419958d77f1fb621f2168f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89fbb9b48817123419958d77… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:12 2009 +0200 jscript: Throw TypeError in call_expression_eval. --- dlls/jscript/engine.c | 7 ++----- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 2 ++ 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f3ea33f..10004a7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1539,11 +1539,8 @@ HRESULT call_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, if(SUCCEEDED(hres)) { switch(exprval.type) { case EXPRVAL_VARIANT: - if(V_VT(&exprval.u.var) != VT_DISPATCH) { - FIXME("throw TypeError\n"); - hres = E_NOTIMPL; - break; - } + if(V_VT(&exprval.u.var) != VT_DISPATCH) + return throw_type_error(ctx->var_disp->ctx, ei, IDS_NO_PROPERTY, NULL); hres = disp_call(V_DISPATCH(&exprval.u.var), DISPID_VALUE, ctx->parser->script->lcid, DISPATCH_METHOD, &dp, flags & EXPR_NOVAL ? NULL : &var, ei, NULL/*FIXME*/); diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index f54cffb..40b64c9 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -22,6 +22,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { + IDS_NO_PROPERTY "Object doesn't support this property or method" IDS_ARG_NOT_OPT "Argument not optional" IDS_NOT_DATE "'[object]' is not a date object" IDS_NOT_BOOL "Boolean object expected" diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 05b693d..44c04a8 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -18,6 +18,7 @@ #include <windef.h> +#define IDS_NO_PROPERTY 0x01B6 #define IDS_ARG_NOT_OPT 0x01c1 #define IDS_NOT_DATE 0x138E #define IDS_NOT_BOOL 0x1392 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index cae853b..d0e5995 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1300,5 +1300,7 @@ function exception_test(func, type) { exception_test(function() {arr.toString = Date.prototype.toString; arr.toString();}, "TypeError"); exception_test(function() {Array(-3);}, "RangeError"); exception_test(function() {arr.toString = Boolean.prototype.toString; arr.toString();}, "TypeError"); +exception_test(function() {date.setTime();}, "TypeError"); +exception_test(function() {arr.test();}, "TypeError"); reportSuccess();

1 0

Piotr Caban : jscript: Throw more errors in Date functions.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 789afcdc1b596e68368c39538e69b0c8031d2c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=789afcdc1b596e68368c39538… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:09 2009 +0200 jscript: Throw more errors in Date functions. --- dlls/jscript/date.c | 105 ++++++++++++------------------------------- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + 3 files changed, 32 insertions(+), 75 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 5a520a4..b33be0b 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -1370,11 +1370,8 @@ static HRESULT Date_setTime(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) @@ -1403,11 +1400,8 @@ static HRESULT Date_setMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, D if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) @@ -1439,11 +1433,8 @@ static HRESULT Date_setUTCMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) @@ -1475,11 +1466,8 @@ static HRESULT Date_setSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = local_time(date->time, date); @@ -1521,11 +1509,8 @@ static HRESULT Date_setUTCSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DIS if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = date->time; @@ -1567,11 +1552,8 @@ static HRESULT Date_setMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = local_time(date->time, date); @@ -1621,11 +1603,8 @@ static HRESULT Date_setUTCMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DIS if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = date->time; @@ -1675,11 +1654,8 @@ static HRESULT Date_setHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = local_time(date->time, date); @@ -1736,11 +1712,8 @@ static HRESULT Date_setUTCHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPP if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = date->time; @@ -1797,11 +1770,8 @@ static HRESULT Date_setDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) @@ -1833,11 +1803,8 @@ static HRESULT Date_setUTCDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) @@ -1869,11 +1836,8 @@ static HRESULT Date_setMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = local_time(date->time, date); @@ -1915,11 +1879,8 @@ static HRESULT Date_setUTCMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPP if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = date->time; @@ -1961,11 +1922,8 @@ static HRESULT Date_setFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPP if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = local_time(date->time, date); @@ -2014,11 +1972,8 @@ static HRESULT Date_setUTCFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DI if(!is_class(dispex, JSCLASS_DATE)) return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - if(!arg_cnt(dp)) { - FIXME("throw ArgumentNotOptional\n"); - if(retv) num_set_nan(retv); - return S_OK; - } + if(!arg_cnt(dp)) + return throw_type_error(dispex->ctx, ei, IDS_ARG_NOT_OPT, NULL); date = (DateInstance*)dispex; t = date->time; diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 3a5f9d2..f54cffb 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -22,6 +22,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { + IDS_ARG_NOT_OPT "Argument not optional" IDS_NOT_DATE "'[object]' is not a date object" IDS_NOT_BOOL "Boolean object expected" IDS_INVALID_LENGTH "Array length must be a finite positive integer" diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 6c5f8b0..05b693d 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -18,6 +18,7 @@ #include <windef.h> +#define IDS_ARG_NOT_OPT 0x01c1 #define IDS_NOT_DATE 0x138E #define IDS_NOT_BOOL 0x1392 #define IDS_INVALID_LENGTH 0x13A5

1 0

Piotr Caban : jscript: Throw type errors in Date functions.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 5b21893abf973ff89e8ab538010a034dc267c455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b21893abf973ff89e8ab5380… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:07 2009 +0200 jscript: Throw type errors in Date functions. --- dlls/jscript/date.c | 246 +++++++++++++++++---------------------------------- 1 files changed, 82 insertions(+), 164 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b21893abf973ff89e8ab…

1 0

Piotr Caban : jscript: Throw type errors in Boolean functions.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 77e93ad8c7dca4e68b2f6b6cc9c6b9325f83de8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e93ad8c7dca4e68b2f6b6cc… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:05 2009 +0200 jscript: Throw type errors in Boolean functions. --- dlls/jscript/bool.c | 12 ++++-------- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 1 + 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index ab9ef43..2b5152a 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -46,10 +46,8 @@ static HRESULT Bool_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA TRACE("\n"); - if(!is_class(dispex, JSCLASS_BOOLEAN)) { - FIXME("throw TypeError\n"); - return E_FAIL; - } + if(!is_class(dispex, JSCLASS_BOOLEAN)) + return throw_type_error(dispex->ctx, ei, IDS_NOT_BOOL, NULL); if(retv) { BoolInstance *bool = (BoolInstance*)dispex; @@ -81,10 +79,8 @@ static HRESULT Bool_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM { TRACE("\n"); - if(!is_class(dispex, JSCLASS_BOOLEAN)) { - FIXME("throw TypeError\n"); - return E_FAIL; - } + if(!is_class(dispex, JSCLASS_BOOLEAN)) + return throw_type_error(dispex->ctx, ei, IDS_NOT_BOOL, NULL); if(retv) { BoolInstance *bool = (BoolInstance*)dispex; diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 161b761..3a5f9d2 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -23,5 +23,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { IDS_NOT_DATE "'[object]' is not a date object" + IDS_NOT_BOOL "Boolean object expected" IDS_INVALID_LENGTH "Array length must be a finite positive integer" } diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 5041e27..6c5f8b0 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -19,4 +19,5 @@ #include <windef.h> #define IDS_NOT_DATE 0x138E +#define IDS_NOT_BOOL 0x1392 #define IDS_INVALID_LENGTH 0x13A5 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f36ec80..cae853b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1299,5 +1299,6 @@ function exception_test(func, type) { } exception_test(function() {arr.toString = Date.prototype.toString; arr.toString();}, "TypeError"); exception_test(function() {Array(-3);}, "RangeError"); +exception_test(function() {arr.toString = Boolean.prototype.toString; arr.toString();}, "TypeError"); reportSuccess();

1 0

Piotr Caban : jscript: Throw range errors in Array functions.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: bd87f97e2d304420314c339cd226280bb96bd650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd87f97e2d304420314c339cd… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:02 2009 +0200 jscript: Throw range errors in Array functions. --- dlls/jscript/array.c | 12 ++++-------- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 1 + 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 9b43142..0af6df1 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -74,10 +74,8 @@ static HRESULT Array_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM else len = floor(V_R8(&num)); - if(len!=(DWORD)len) { - FIXME("Throw RangeError\n"); - return E_FAIL; - } + if(len!=(DWORD)len) + return throw_range_error(dispex->ctx, ei, IDS_INVALID_LENGTH, NULL); for(i=len; i<This->length; i++) { hres = jsdisp_delete_idx(dispex, i); @@ -850,10 +848,8 @@ static HRESULT ArrayConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISP case DISPATCH_METHOD: case DISPATCH_CONSTRUCT: { if(arg_cnt(dp) == 1 && V_VT((arg_var = get_arg(dp, 0))) == VT_I4) { - if(V_I4(arg_var) < 0) { - FIXME("throw RangeError\n"); - return E_FAIL; - } + if(V_I4(arg_var) < 0) + return throw_range_error(dispex->ctx, ei, IDS_INVALID_LENGTH, NULL); hres = create_array(dispex->ctx, V_I4(arg_var), &obj); if(FAILED(hres)) diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index cee2718..161b761 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -23,4 +23,5 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { IDS_NOT_DATE "'[object]' is not a date object" + IDS_INVALID_LENGTH "Array length must be a finite positive integer" } diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index e0f6661..5041e27 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -19,3 +19,4 @@ #include <windef.h> #define IDS_NOT_DATE 0x138E +#define IDS_INVALID_LENGTH 0x13A5 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 36fb191..f36ec80 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1298,5 +1298,6 @@ function exception_test(func, type) { ok(ret === type, "Exception test, ret = " + ret + ", expected " + type +". Executed function: " + func.toString()); } exception_test(function() {arr.toString = Date.prototype.toString; arr.toString();}, "TypeError"); +exception_test(function() {Array(-3);}, "RangeError"); reportSuccess();

1 0

Piotr Caban : jscript: Add error throwing functions.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 469b5972128e8b501ddcec4f03aacede77b5b93f URL: http://source.winehq.org/git/wine.git/?a=commit;h=469b5972128e8b501ddcec4f0… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:18:00 2009 +0200 jscript: Add error throwing functions. --- dlls/jscript/Makefile.in | 6 +++- dlls/jscript/date.c | 6 +--- dlls/jscript/error.c | 60 +++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/jscript.h | 11 ++++++++ dlls/jscript/jscript_En.rc | 26 ++++++++++++++++++ dlls/jscript/jscript_main.c | 2 +- dlls/jscript/resource.h | 21 +++++++++++++++ dlls/jscript/tests/api.js | 11 ++++++++ 8 files changed, 136 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index b740546..c76bed0 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -3,9 +3,11 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = jscript.dll -IMPORTS = oleaut32 advapi32 kernel32 +IMPORTS = oleaut32 user32 advapi32 kernel32 -RC_SRCS = rsrc.rc +RC_SRCS = \ + jscript_En.rc \ + rsrc.rc C_SRCS = \ array.c \ diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index b65f03e..1630828 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -590,10 +590,8 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA TRACE("\n"); - if(!is_class(dispex, JSCLASS_DATE)) { - FIXME("throw TypeError\n"); - return E_FAIL; - } + if(!is_class(dispex, JSCLASS_DATE)) + return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); date = (DateInstance*)dispex; time = local_time(date->time, date); diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index b122c39..422412a 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -330,3 +330,63 @@ HRESULT init_error_constr(script_ctx_t *ctx) return S_OK; } + +static HRESULT throw_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str, DispatchEx *constr) +{ + WCHAR buf[1024], *pos = NULL; + DispatchEx *err; + HRESULT hres; + + TRACE("\n"); + + LoadStringW(jscript_hinstance, id, buf, sizeof(buf)/sizeof(WCHAR)); + + if(str) pos = strchrW(buf, '|'); + if(pos) { + int len = strlenW(str); + memmove(pos+len, pos+1, strlenW(pos+1)*sizeof(WCHAR)); + memcpy(pos, str, len*sizeof(WCHAR)); + } + + hres = create_error(ctx, constr, buf, &err); + if(FAILED(hres)) + return hres; + + if(!ei) + return id; + + V_VT(&ei->var) = VT_DISPATCH; + V_DISPATCH(&ei->var) = (IDispatch*)_IDispatchEx_(err); + + return 0x800A0000+id; +} + +HRESULT throw_eval_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) +{ + return throw_error(ctx, ei, id, str, ctx->eval_error_constr); +} + +HRESULT throw_range_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) +{ + return throw_error(ctx, ei, id, str, ctx->range_error_constr); +} + +HRESULT throw_reference_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) +{ + return throw_error(ctx, ei, id, str, ctx->reference_error_constr); +} + +HRESULT throw_syntax_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) +{ + return throw_error(ctx, ei, id, str, ctx->syntax_error_constr); +} + +HRESULT throw_type_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) +{ + return throw_error(ctx, ei, id, str, ctx->type_error_constr); +} + +HRESULT throw_uri_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) +{ + return throw_error(ctx, ei, id, str, ctx->uri_error_constr); +} diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 14903e9..f99299f 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -28,6 +28,8 @@ #include "dispex.h" #include "activscp.h" +#include "resource.h" + #include "wine/unicode.h" #include "wine/list.h" @@ -58,6 +60,8 @@ jsheap_t *jsheap_mark(jsheap_t*); typedef struct DispatchEx DispatchEx; +extern HINSTANCE jscript_hinstance; + #define PROPF_ARGMASK 0x00ff #define PROPF_METHOD 0x0100 #define PROPF_ENUM 0x0200 @@ -139,6 +143,13 @@ HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const builtin_inf DispatchEx*,DispatchEx**); HRESULT Function_value(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); +HRESULT throw_eval_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); +HRESULT throw_range_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); +HRESULT throw_reference_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); +HRESULT throw_syntax_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); +HRESULT throw_type_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); +HRESULT throw_uri_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); + HRESULT create_object(script_ctx_t*,DispatchEx*,DispatchEx**); HRESULT create_math(script_ctx_t*,DispatchEx**); diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc new file mode 100644 index 0000000..cee2718 --- /dev/null +++ b/dlls/jscript/jscript_En.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2009 Piotr Caban + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NOT_DATE "'[object]' is not a date object" +} diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index 37266e5..4f59ecb 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -40,7 +40,7 @@ static const CLSID CLSID_JScriptEncode = DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -static HINSTANCE jscript_hinstance; +HINSTANCE jscript_hinstance; static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h new file mode 100644 index 0000000..e0f6661 --- /dev/null +++ b/dlls/jscript/resource.h @@ -0,0 +1,21 @@ +/* + * Copyright 2009 Piotr Caban + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> + +#define IDS_NOT_DATE 0x138E diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 18e6141..36fb191 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1288,4 +1288,15 @@ err = new Error("message"); ok(err.message === "message", "err.message !== 'message'"); ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); +function exception_test(func, type) { + ret = ""; + try { + func(); + } catch(e) { + ret = e.name; + } + ok(ret === type, "Exception test, ret = " + ret + ", expected " + type +". Executed function: " + func.toString()); +} +exception_test(function() {arr.toString = Date.prototype.toString; arr.toString();}, "TypeError"); + reportSuccess();

1 0

Piotr Caban : jscript: Add Error_toString implementation.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: 2d71dac4124092578c1dfb5b8bded0fd66bd1548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d71dac4124092578c1dfb5b8… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:17:57 2009 +0200 jscript: Add Error_toString implementation. --- dlls/jscript/error.c | 15 +++++++++++++-- dlls/jscript/tests/api.js | 10 ++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 4ae52cf..b122c39 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -54,11 +54,22 @@ static HRESULT Error_message(DispatchEx *dispex, LCID lcid, WORD flags, } } +/* ECMA-262 3rd Edition 15.11.4.4 */ static HRESULT Error_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR str[] = {'[','o','b','j','e','c','t',' ','E','r','r','o','r',']',0}; + + TRACE("\n"); + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = SysAllocString(str); + if(!V_BSTR(retv)) + return E_OUTOFMEMORY; + } + + return S_OK; } static HRESULT Error_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f2387b5..18e6141 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1253,6 +1253,8 @@ ok(err.valueOf === Object.prototype.valueOf, "err.valueOf !== Object.prototype.v ok(Error.prototype.name === "Error", "Error.prototype.name = " + Error.prototype.name); ok(err.name === "Error", "err.name = " + err.name); EvalError.prototype.message = "test"; +ok(err.toString !== Object.prototype.toString, "err.toString === Object.prototype.toString"); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); err = new EvalError(); ok(EvalError.prototype.name === "EvalError", "EvalError.prototype.name = " + EvalError.prototype.name); ok(err.name === "EvalError", "err.name = " + err.name); @@ -1260,22 +1262,30 @@ ok(err.toString === Error.prototype.toString, "err.toString !== Error.prototype. ok(err.message === "", "err.message != ''"); err.message = date; ok(err.message === date, "err.message != date"); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); +ok(err.toString !== Object.prototype.toString, "err.toString === Object.prototype.toString"); err = new RangeError(); ok(RangeError.prototype.name === "RangeError", "RangeError.prototype.name = " + RangeError.prototype.name); ok(err.name === "RangeError", "err.name = " + err.name); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); err = new ReferenceError(); ok(ReferenceError.prototype.name === "ReferenceError", "ReferenceError.prototype.name = " + ReferenceError.prototype.name); ok(err.name === "ReferenceError", "err.name = " + err.name); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); err = new SyntaxError(); ok(SyntaxError.prototype.name === "SyntaxError", "SyntaxError.prototype.name = " + SyntaxError.prototype.name); ok(err.name === "SyntaxError", "err.name = " + err.name); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); err = new TypeError(); ok(TypeError.prototype.name === "TypeError", "TypeError.prototype.name = " + TypeError.prototype.name); ok(err.name === "TypeError", "err.name = " + err.name); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); err = new URIError(); ok(URIError.prototype.name === "URIError", "URIError.prototype.name = " + URIError.prototype.name); ok(err.name === "URIError", "err.name = " + err.name); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); err = new Error("message"); ok(err.message === "message", "err.message !== 'message'"); +ok(err.toString() === "[object Error]", "err.toString() = " + err.toString()); reportSuccess();

1 0

Piotr Caban : jscript: Add Error_message implementation.
by Alexandre Julliard July 21, 2009

July 21, 2009

Module: wine Branch: master Commit: f17b1f6334d2412b8c1d90fd6697a1c921d20fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f17b1f6334d2412b8c1d90fd6… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 20 18:17:54 2009 +0200 jscript: Add Error_message implementation. --- dlls/jscript/error.c | 15 +++++++++++++-- dlls/jscript/tests/api.js | 7 +++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 40228d4..4ae52cf 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -39,8 +39,19 @@ static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p',' static HRESULT Error_message(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + ErrorInstance *This = (ErrorInstance*)dispex; + + TRACE("\n"); + + switch(flags) { + case DISPATCH_PROPERTYGET: + return VariantCopy(retv, &This->message); + case DISPATCH_PROPERTYPUT: + return VariantCopy(&This->message, get_arg(dp, 0)); + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } } static HRESULT Error_toString(DispatchEx *dispex, LCID lcid, WORD flags, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a82931e..f2387b5 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1252,9 +1252,14 @@ err = new Error(); ok(err.valueOf === Object.prototype.valueOf, "err.valueOf !== Object.prototype.valueOf"); ok(Error.prototype.name === "Error", "Error.prototype.name = " + Error.prototype.name); ok(err.name === "Error", "err.name = " + err.name); +EvalError.prototype.message = "test"; err = new EvalError(); ok(EvalError.prototype.name === "EvalError", "EvalError.prototype.name = " + EvalError.prototype.name); ok(err.name === "EvalError", "err.name = " + err.name); +ok(err.toString === Error.prototype.toString, "err.toString !== Error.prototype.toString"); +ok(err.message === "", "err.message != ''"); +err.message = date; +ok(err.message === date, "err.message != date"); err = new RangeError(); ok(RangeError.prototype.name === "RangeError", "RangeError.prototype.name = " + RangeError.prototype.name); ok(err.name === "RangeError", "err.name = " + err.name); @@ -1270,5 +1275,7 @@ ok(err.name === "TypeError", "err.name = " + err.name); err = new URIError(); ok(URIError.prototype.name === "URIError", "URIError.prototype.name = " + URIError.prototype.name); ok(err.name === "URIError", "err.name = " + err.name); +err = new Error("message"); +ok(err.message === "message", "err.message !== 'message'"); reportSuccess();

1 0