August 2009 - Wine-commits - list.winehq.org

Dylan Smith : winedbg: Remove unused tokens in grammer file.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: 3add397abc4a94fb70268bb7bf2131b990ce8036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3add397abc4a94fb70268bb7b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 17 01:15:10 2009 -0400 winedbg: Remove unused tokens in grammer file. --- programs/winedbg/dbg.y | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 62995bb..30ecdde 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -54,11 +54,11 @@ static void parser(const char*); %token tCONT tPASS tSTEP tLIST tNEXT tQUIT tHELP tBACKTRACE tALL tINFO tUP tDOWN %token tENABLE tDISABLE tBREAK tHBREAK tWATCH tDELETE tSET tPRINT tEXAM %token tABORT tECHO -%token tCLASS tMAPS tSTACK tSEGMENTS tSYMBOL tREGS tALLREGS tWND tQUEUE tLOCAL tEXCEPTION +%token tCLASS tMAPS tSTACK tSEGMENTS tSYMBOL tREGS tALLREGS tWND tLOCAL tEXCEPTION %token tPROCESS tTHREAD tEOL tEOF %token tFRAME tSHARE tMODULE tCOND tDISPLAY tUNDISPLAY tDISASSEMBLE %token tSTEPI tNEXTI tFINISH tSHOW tDIR tWHATIS tSOURCE -%token <string> tPATH tIDENTIFIER tSTRING tDEBUGSTR tINTVAR +%token <string> tPATH tIDENTIFIER tSTRING tINTVAR %token <integer> tNUM tFORMAT %token tSYMBOLFILE tRUN tATTACH tDETACH tKILL tMAINTENANCE tTYPE tMINIDUMP %token tNOPROCESS

1 0

Dylan Smith : winedbg: Prevent syntax error for setting all debug channels.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: 4782d1dde6df5baaf69b7caf21fd36498b3597ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=4782d1dde6df5baaf69b7caf2… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 17 01:14:48 2009 -0400 winedbg: Prevent syntax error for setting all debug channels. The lexer was matching tALL before checking for tIDENTIFIER, and the set command didn't have any rules for tALL, which prevented setting the flags for all the debug channels. --- programs/winedbg/dbg.y | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 7d1e44e..62995bb 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -208,9 +208,13 @@ disassemble_command: set_command: tSET lvalue_addr '=' expr_rvalue { memory_write_value(&$2, sizeof(int), &$4); } | tSET '+' tIDENTIFIER { info_wine_dbg_channel(TRUE, NULL, $3); } + | tSET '+' tALL { info_wine_dbg_channel(TRUE, NULL, "all"); } | tSET '-' tIDENTIFIER { info_wine_dbg_channel(FALSE, NULL, $3); } + | tSET '-' tALL { info_wine_dbg_channel(FALSE, NULL, "all"); } | tSET tIDENTIFIER '+' tIDENTIFIER { info_wine_dbg_channel(TRUE, $2, $4); } + | tSET tIDENTIFIER '+' tALL { info_wine_dbg_channel(TRUE, $2, "all"); } | tSET tIDENTIFIER '-' tIDENTIFIER { info_wine_dbg_channel(FALSE, $2, $4); } + | tSET tIDENTIFIER '-' tALL { info_wine_dbg_channel(FALSE, $2, "all"); } | tSET '!' tIDENTIFIER tIDENTIFIER { dbg_set_option($3, $4); } | tSET '!' tIDENTIFIER { dbg_set_option($3, NULL); } ;

1 0

Piotr Caban : jscript: Fixed Object's function lengths.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: c745826e5db08712cc85abf3fae4e339497f93d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c745826e5db08712cc85abf3f… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Aug 17 12:13:20 2009 +0200 jscript: Fixed Object's function lengths. --- dlls/jscript/object.c | 6 +++--- dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index f5ce564..e8624bd 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -145,9 +145,9 @@ static void Object_destructor(DispatchEx *dispex) } static const builtin_prop_t Object_props[] = { - {hasOwnPropertyW, Object_hasOwnProperty, PROPF_METHOD}, - {isPrototypeOfW, Object_isPrototypeOf, PROPF_METHOD}, - {propertyIsEnumerableW, Object_propertyIsEnumerable, PROPF_METHOD}, + {hasOwnPropertyW, Object_hasOwnProperty, PROPF_METHOD|1}, + {isPrototypeOfW, Object_isPrototypeOf, PROPF_METHOD|1}, + {propertyIsEnumerableW, Object_propertyIsEnumerable, PROPF_METHOD|1}, {toLocaleStringW, Object_toLocaleString, PROPF_METHOD}, {toStringW, Object_toString, PROPF_METHOD}, {valueOfW, Object_valueOf, PROPF_METHOD} diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d4c4cab..8b4316f 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1543,4 +1543,13 @@ testFunctions(Math, [ ["tan", 1] ]); +testFunctions(Object.prototype, [ + ["hasOwnProperty", 1], + ["isPrototypeOf", 1], + ["propertyIsEnumerable", 1], + ["toLocaleString", 0], + ["toString", 0], + ["valueOf", 0] + ]); + reportSuccess();

1 0

Piotr Caban : jscript: Fixed Math's function lengths.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: ca72983664e37345eeade575abf41f10d70824a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca72983664e37345eeade575a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Aug 17 12:13:10 2009 +0200 jscript: Fixed Math's function lengths. --- dlls/jscript/math.c | 34 +++++++++++++++++----------------- dlls/jscript/tests/api.js | 25 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 8fea484..628707e 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -571,24 +571,24 @@ static const builtin_prop_t Math_props[] = { {PIW, Math_PI, 0}, {SQRT1_2W, Math_SQRT1_2, 0}, {SQRT2W, Math_SQRT2, 0}, - {absW, Math_abs, PROPF_METHOD}, - {acosW, Math_acos, PROPF_METHOD}, - {asinW, Math_asin, PROPF_METHOD}, - {atanW, Math_atan, PROPF_METHOD}, - {atan2W, Math_atan2, PROPF_METHOD}, - {ceilW, Math_ceil, PROPF_METHOD}, - {cosW, Math_cos, PROPF_METHOD}, - {expW, Math_exp, PROPF_METHOD}, - {floorW, Math_floor, PROPF_METHOD}, - {logW, Math_log, PROPF_METHOD}, - {maxW, Math_max, PROPF_METHOD}, - {minW, Math_min, PROPF_METHOD}, - {powW, Math_pow, PROPF_METHOD}, + {absW, Math_abs, PROPF_METHOD|1}, + {acosW, Math_acos, PROPF_METHOD|1}, + {asinW, Math_asin, PROPF_METHOD|1}, + {atanW, Math_atan, PROPF_METHOD|1}, + {atan2W, Math_atan2, PROPF_METHOD|2}, + {ceilW, Math_ceil, PROPF_METHOD|1}, + {cosW, Math_cos, PROPF_METHOD|1}, + {expW, Math_exp, PROPF_METHOD|1}, + {floorW, Math_floor, PROPF_METHOD|1}, + {logW, Math_log, PROPF_METHOD|1}, + {maxW, Math_max, PROPF_METHOD|2}, + {minW, Math_min, PROPF_METHOD|2}, + {powW, Math_pow, PROPF_METHOD|2}, {randomW, Math_random, PROPF_METHOD}, - {roundW, Math_round, PROPF_METHOD}, - {sinW, Math_sin, PROPF_METHOD}, - {sqrtW, Math_sqrt, PROPF_METHOD}, - {tanW, Math_tan, PROPF_METHOD} + {roundW, Math_round, PROPF_METHOD|1}, + {sinW, Math_sin, PROPF_METHOD|1}, + {sqrtW, Math_sqrt, PROPF_METHOD|1}, + {tanW, Math_tan, PROPF_METHOD|1} }; static const builtin_info_t Math_info = { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 72539ed..d4c4cab 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1518,4 +1518,29 @@ testFunctions(Array.prototype, [ ["unshift", 1] ]); +testFunctions(Error.prototype, [ + ["toString", 0] + ]); + +testFunctions(Math, [ + ["abs", 1], + ["acos", 1], + ["asin", 1], + ["atan", 1], + ["atan2", 2], + ["ceil", 1], + ["cos", 1], + ["exp", 1], + ["floor", 1], + ["log", 1], + ["max", 2], + ["min", 2], + ["pow", 2], + ["random", 0], + ["round", 1], + ["sin", 1], + ["sqrt", 1], + ["tan", 1] + ]); + reportSuccess();

1 0

Piotr Caban : jscript: Fixed Array's function lengths.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: c0fc15b91c20cfa56cb45517f3a9880899ac1a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0fc15b91c20cfa56cb45517f… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Aug 17 12:13:00 2009 +0200 jscript: Fixed Array's function lengths. --- dlls/jscript/array.c | 14 +++++++------- dlls/jscript/tests/api.js | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index a491367..704624e 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -784,19 +784,19 @@ static void Array_on_put(DispatchEx *dispex, const WCHAR *name) } static const builtin_prop_t Array_props[] = { - {concatW, Array_concat, PROPF_METHOD}, - {joinW, Array_join, PROPF_METHOD}, + {concatW, Array_concat, PROPF_METHOD|1}, + {joinW, Array_join, PROPF_METHOD|1}, {lengthW, Array_length, 0}, {popW, Array_pop, PROPF_METHOD}, - {pushW, Array_push, PROPF_METHOD}, + {pushW, Array_push, PROPF_METHOD|1}, {reverseW, Array_reverse, PROPF_METHOD}, {shiftW, Array_shift, PROPF_METHOD}, - {sliceW, Array_slice, PROPF_METHOD}, - {sortW, Array_sort, PROPF_METHOD}, - {spliceW, Array_splice, PROPF_METHOD}, + {sliceW, Array_slice, PROPF_METHOD|2}, + {sortW, Array_sort, PROPF_METHOD|1}, + {spliceW, Array_splice, PROPF_METHOD|2}, {toLocaleStringW, Array_toLocaleString, PROPF_METHOD}, {toStringW, Array_toString, PROPF_METHOD}, - {unshiftW, Array_unshift, PROPF_METHOD}, + {unshiftW, Array_unshift, PROPF_METHOD|1}, }; static const builtin_info_t Array_info = { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 36e519c..72539ed 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1503,4 +1503,19 @@ testFunctions(Date.prototype, [ ["valueOf", 0] ]); +testFunctions(Array.prototype, [ + ["concat", 1], + ["join", 1], + ["push", 1], + ["pop", 0], + ["reverse", 0], + ["shift", 0], + ["slice", 2], + ["sort", 1], + ["splice", 2], + ["toLocaleString", 0], + ["toString", 0], + ["unshift", 1] + ]); + reportSuccess();

1 0

Piotr Caban : jscript: Fixed Date's function lengths.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: 67520788c1ec2f97592e0e91673a33ff6eb01d27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67520788c1ec2f97592e0e916… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Aug 17 12:12:49 2009 +0200 jscript: Fixed Date's function lengths. --- dlls/jscript/date.c | 30 +++++++++++++++--------------- dlls/jscript/tests/api.js | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index a607c80..7c240cd 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2054,21 +2054,21 @@ static const builtin_prop_t Date_props[] = { {getUTCMonthW, Date_getUTCMonth, PROPF_METHOD}, {getUTCSecondsW, Date_getUTCSeconds, PROPF_METHOD}, {getYearW, Date_getYear, PROPF_METHOD}, - {setDateW, Date_setDate, PROPF_METHOD}, - {setFullYearW, Date_setFullYear, PROPF_METHOD}, - {setHoursW, Date_setHours, PROPF_METHOD}, - {setMillisecondsW, Date_setMilliseconds, PROPF_METHOD}, - {setMinutesW, Date_setMinutes, PROPF_METHOD}, - {setMonthW, Date_setMonth, PROPF_METHOD}, - {setSecondsW, Date_setSeconds, PROPF_METHOD}, - {setTimeW, Date_setTime, PROPF_METHOD}, - {setUTCDateW, Date_setUTCDate, PROPF_METHOD}, - {setUTCFullYearW, Date_setUTCFullYear, PROPF_METHOD}, - {setUTCHoursW, Date_setUTCHours, PROPF_METHOD}, - {setUTCMillisecondsW, Date_setUTCMilliseconds, PROPF_METHOD}, - {setUTCMinutesW, Date_setUTCMinutes, PROPF_METHOD}, - {setUTCMonthW, Date_setUTCMonth, PROPF_METHOD}, - {setUTCSecondsW, Date_setUTCSeconds, PROPF_METHOD}, + {setDateW, Date_setDate, PROPF_METHOD|1}, + {setFullYearW, Date_setFullYear, PROPF_METHOD|3}, + {setHoursW, Date_setHours, PROPF_METHOD|4}, + {setMillisecondsW, Date_setMilliseconds, PROPF_METHOD|1}, + {setMinutesW, Date_setMinutes, PROPF_METHOD|3}, + {setMonthW, Date_setMonth, PROPF_METHOD|2}, + {setSecondsW, Date_setSeconds, PROPF_METHOD|2}, + {setTimeW, Date_setTime, PROPF_METHOD|1}, + {setUTCDateW, Date_setUTCDate, PROPF_METHOD|1}, + {setUTCFullYearW, Date_setUTCFullYear, PROPF_METHOD|3}, + {setUTCHoursW, Date_setUTCHours, PROPF_METHOD|4}, + {setUTCMillisecondsW, Date_setUTCMilliseconds, PROPF_METHOD|1}, + {setUTCMinutesW, Date_setUTCMinutes, PROPF_METHOD|3}, + {setUTCMonthW, Date_setUTCMonth, PROPF_METHOD|2}, + {setUTCSecondsW, Date_setUTCSeconds, PROPF_METHOD|2}, {toDateStringW, Date_toDateString, PROPF_METHOD}, {toLocaleDateStringW, Date_toLocaleDateString, PROPF_METHOD}, {toLocaleStringW, Date_toLocaleString, PROPF_METHOD}, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1930a3c..36e519c 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1459,4 +1459,48 @@ testFunctions(RegExp.prototype, [ ["test", 1] ]); +testFunctions(Date.prototype, [ + ["getDate", 0], + ["getDay", 0], + ["getFullYear", 0], + ["getHours", 0], + ["getMilliseconds", 0], + ["getMinutes", 0], + ["getMonth", 0], + ["getSeconds", 0], + ["getTime", 0], + ["getTimezoneOffset", 0], + ["getUTCDate", 0], + ["getUTCDay", 0], + ["getUTCFullYear", 0], + ["getUTCHours", 0], + ["getUTCMilliseconds", 0], + ["getUTCMinutes", 0], + ["getUTCMonth", 0], + ["getUTCSeconds", 0], + ["setDate", 1], + ["setFullYear", 3], + ["setHours", 4], + ["setMilliseconds", 1], + ["setMinutes", 3], + ["setMonth", 2], + ["setSeconds", 2], + ["setTime", 1], + ["setUTCDate", 1], + ["setUTCFullYear", 3], + ["setUTCHours", 4], + ["setUTCMilliseconds", 1], + ["setUTCMinutes", 3], + ["setUTCMonth", 2], + ["setUTCSeconds", 2], + ["toDateString", 0], + ["toLocaleDateString", 0], + ["toLocaleString", 0], + ["toLocaleTimeString", 0], + ["toString", 0], + ["toTimeString", 0], + ["toUTCString", 0], + ["valueOf", 0] + ]); + reportSuccess();

1 0

Piotr Caban : jscript: Fixed String's function lengths.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: 3da1773cc362dafee54c19bde69b9ff6c544524c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3da1773cc362dafee54c19bde… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Aug 17 12:12:25 2009 +0200 jscript: Fixed String's function lengths. --- dlls/jscript/string.c | 30 +++++++++++++++--------------- dlls/jscript/tests/api.js | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 04d5017..ea499aa 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1543,32 +1543,32 @@ static void String_destructor(DispatchEx *dispex) } static const builtin_prop_t String_props[] = { - {anchorW, String_anchor, PROPF_METHOD}, + {anchorW, String_anchor, PROPF_METHOD|1}, {bigW, String_big, PROPF_METHOD}, {blinkW, String_blink, PROPF_METHOD}, {boldW, String_bold, PROPF_METHOD}, - {charAtW, String_charAt, PROPF_METHOD}, - {charCodeAtW, String_charCodeAt, PROPF_METHOD}, - {concatW, String_concat, PROPF_METHOD}, + {charAtW, String_charAt, PROPF_METHOD|1}, + {charCodeAtW, String_charCodeAt, PROPF_METHOD|1}, + {concatW, String_concat, PROPF_METHOD|1}, {fixedW, String_fixed, PROPF_METHOD}, - {fontcolorW, String_fontcolor, PROPF_METHOD}, - {fontsizeW, String_fontsize, PROPF_METHOD}, - {indexOfW, String_indexOf, PROPF_METHOD}, + {fontcolorW, String_fontcolor, PROPF_METHOD|1}, + {fontsizeW, String_fontsize, PROPF_METHOD|1}, + {indexOfW, String_indexOf, PROPF_METHOD|2}, {italicsW, String_italics, PROPF_METHOD}, - {lastIndexOfW, String_lastIndexOf, PROPF_METHOD}, + {lastIndexOfW, String_lastIndexOf, PROPF_METHOD|2}, {lengthW, String_length, 0}, - {linkW, String_link, PROPF_METHOD}, - {localeCompareW, String_localeCompare, PROPF_METHOD}, - {matchW, String_match, PROPF_METHOD}, - {replaceW, String_replace, PROPF_METHOD}, + {linkW, String_link, PROPF_METHOD|1}, + {localeCompareW, String_localeCompare, PROPF_METHOD|1}, + {matchW, String_match, PROPF_METHOD|1}, + {replaceW, String_replace, PROPF_METHOD|1}, {searchW, String_search, PROPF_METHOD}, {sliceW, String_slice, PROPF_METHOD}, {smallW, String_small, PROPF_METHOD}, - {splitW, String_split, PROPF_METHOD}, + {splitW, String_split, PROPF_METHOD|2}, {strikeW, String_strike, PROPF_METHOD}, {subW, String_sub, PROPF_METHOD}, - {substrW, String_substr, PROPF_METHOD}, - {substringW, String_substring, PROPF_METHOD}, + {substrW, String_substr, PROPF_METHOD|2}, + {substringW, String_substring, PROPF_METHOD|2}, {supW, String_sup, PROPF_METHOD}, {toLocaleLowerCaseW, String_toLocaleLowerCase, PROPF_METHOD}, {toLocaleUpperCaseW, String_toLocaleUpperCase, PROPF_METHOD}, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index ce995a0..e2097a3 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1410,7 +1410,6 @@ testFunctions(Boolean.prototype, [ ["toString", 0] ]); - testFunctions(Number.prototype, [ ["valueOf", 0], ["toString", 1], @@ -1419,4 +1418,39 @@ testFunctions(Number.prototype, [ ["toPrecision", 1] ]); +testFunctions(String.prototype, [ + ["valueOf", 0], + ["toString", 0], + ["anchor", 1], + ["big", 0], + ["blink", 0], + ["bold", 0], + ["charAt", 1], + ["charCodeAt", 1], + ["concat", 1], + ["fixed", 0], + ["fontcolor", 1], + ["fontsize", 1], + ["indexOf", 2], + ["italics", 0], + ["lastIndexOf", 2], + ["link", 1], + ["localeCompare", 1], + ["match", 1], + ["replace", 1], + ["search", 0], + ["slice", 0], + ["small", 0], + ["split", 2], + ["strike", 0], + ["sub", 0], + ["substr", 2], + ["substring", 2], + ["sup", 0], + ["toLocaleLowerCase", 0], + ["toLocaleUpperCase", 0], + ["toLowerCase", 0], + ["toUpperCase", 0] + ]); + reportSuccess();

1 0

Piotr Caban : jscript: Fixed RegExp's function lengths.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: 5ead33653508e2c9d1fb7585ceea3acce2708385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ead33653508e2c9d1fb7585c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Aug 17 12:12:36 2009 +0200 jscript: Fixed RegExp's function lengths. --- dlls/jscript/regexp.c | 4 ++-- dlls/jscript/tests/api.js | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index cc38c49..1f874e2 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3523,13 +3523,13 @@ static void RegExp_destructor(DispatchEx *dispex) } static const builtin_prop_t RegExp_props[] = { - {execW, RegExp_exec, PROPF_METHOD}, + {execW, RegExp_exec, PROPF_METHOD|1}, {globalW, RegExp_global, 0}, {ignoreCaseW, RegExp_ignoreCase, 0}, {lastIndexW, RegExp_lastIndex, 0}, {multilineW, RegExp_multiline, 0}, {sourceW, RegExp_source, 0}, - {testW, RegExp_test, PROPF_METHOD}, + {testW, RegExp_test, PROPF_METHOD|1}, {toStringW, RegExp_toString, PROPF_METHOD} }; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e2097a3..1930a3c 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1453,4 +1453,10 @@ testFunctions(String.prototype, [ ["toUpperCase", 0] ]); +testFunctions(RegExp.prototype, [ + ["toString", 0], + ["exec", 1], + ["test", 1] + ]); + reportSuccess();

1 0

Piotr Caban : jscript: Added Boolean's function lengths test.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: 67f14b76338e9650d2dee95b61716ad36200bdd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67f14b76338e9650d2dee95b6… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Aug 17 12:11:24 2009 +0200 jscript: Added Boolean's function lengths test. --- dlls/jscript/tests/api.js | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 5d97224..a27a7bb 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1396,4 +1396,18 @@ testObjectInherit(new Error(), false, true, true); testObjectInherit(testObjectInherit, false, true, true); testObjectInherit(Math, true, true, true); +function testFunctions(obj, arr) { + var l; + + for(var i=0; i<arr.length; i++) { + l = obj[arr[i][0]].length; + ok(l === arr[i][1], arr[i][0] + ".length = " + l); + } +} + +testFunctions(Boolean.prototype, [ + ["valueOf", 0], + ["toString", 0] + ]); + reportSuccess();

1 0

Piotr Caban : jscript: Fixed Number's function lengths.
by Alexandre Julliard 17 Aug '09

17 Aug '09

Module: wine Branch: master Commit: c2d2b9f5597c87a0cf3a8f5caa160db8846f1b8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d2b9f5597c87a0cf3a8f5ca… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Aug 17 12:11:51 2009 +0200 jscript: Fixed Number's function lengths. --- dlls/jscript/number.c | 6 +++--- dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index f144455..30b7a56 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -234,11 +234,11 @@ static HRESULT Number_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } static const builtin_prop_t Number_props[] = { - {toExponentialW, Number_toExponential, PROPF_METHOD}, + {toExponentialW, Number_toExponential, PROPF_METHOD|1}, {toFixedW, Number_toFixed, PROPF_METHOD}, {toLocaleStringW, Number_toLocaleString, PROPF_METHOD}, - {toPrecisionW, Number_toPrecision, PROPF_METHOD}, - {toStringW, Number_toString, PROPF_METHOD}, + {toPrecisionW, Number_toPrecision, PROPF_METHOD|1}, + {toStringW, Number_toString, PROPF_METHOD|1}, {valueOfW, Number_valueOf, PROPF_METHOD} }; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a27a7bb..ce995a0 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1410,4 +1410,13 @@ testFunctions(Boolean.prototype, [ ["toString", 0] ]); + +testFunctions(Number.prototype, [ + ["valueOf", 0], + ["toString", 1], + ["toExponential", 1], + ["toLocaleString", 0], + ["toPrecision", 1] + ]); + reportSuccess();

1 0