Module: wine Branch: master Commit: cfb7617688c1b255e3aeaa3caaad67dee4dd8365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb7617688c1b255e3aeaa3caa...
Author: Piotr Caban piotr.caban@gmail.com Date: Tue Jun 9 15:39:18 2009 +0200
jscript: Added Date_getHours and Date_getUTCHours implementation.
---
dlls/jscript/date.c | 42 ++++++++++++++++++++++++++++++++++++++---- dlls/jscript/tests/api.js | 6 +++++- 2 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 8056cc2..1dd9b96 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -85,6 +85,7 @@ static const WCHAR setUTCFullYearW[] = {'s','e','t','U','T','C','F','u','l','l',
/*ECMA-262 3th Edition 15.9.1.2 */ #define MS_PER_DAY 86400000 +#define MS_PER_HOUR 3600000 #define MS_PER_MINUTE 60000
/* ECMA-262 3th Edition 15.9.1.2 */ @@ -215,6 +216,15 @@ static inline DOUBLE week_day(DOUBLE time) return (int)(day(time)+4) % 7; }
+/* ECMA-262 3th Edition 15.9.1.10 */ +static inline DOUBLE hour_from_time(DOUBLE time) +{ + if(isnan(time)) + return ret_nan(); + + return (int)floor(time/MS_PER_HOUR) % 24; +} + /* ECMA-262 3rd Edition 15.9.1.14 */ static inline DOUBLE time_clip(DOUBLE time) { @@ -472,18 +482,42 @@ static HRESULT Date_getUTCDay(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return S_OK; }
+/* ECMA-262 3th Edition 15.9.1.10 */ static HRESULT Date_getHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + DateInstance *date = (DateInstance*)dispex; + DOUBLE time = date->time - date->bias*MS_PER_MINUTE; + + num_set_val(retv, hour_from_time(time)); + } + return S_OK; }
+/* ECMA-262 3th Edition 15.9.1.10 */ static HRESULT Date_getUTCHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + DateInstance *date = (DateInstance*)dispex; + num_set_val(retv, hour_from_time(date->time)); + } + return S_OK; }
static HRESULT Date_getMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2238a94..ceb314f 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -950,22 +950,26 @@ ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullY ok(date.getUTCMonth() === 0, "date.getUTCMonth() = " + date.getUTCMonth()); ok(date.getUTCDate() === 1, "date.getUTCDate() = " + date.getUTCDate()); ok(date.getUTCDay() === 4, "date.getUTCDay() = " + date.getUTCDay()); +ok(date.getUTCHours() === 0, "date.getUTCHours() = " + date.getUTCHours()); date.setTime(60*24*60*60*1000); ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullYear()); ok(date.getUTCMonth() === 2, "date.getUTCMonth() = " + date.getUTCMonth()); ok(date.getUTCDate() === 2, "date.getUTCDate() = " + date.getUTCDate()); ok(date.getUTCDay() === 1, "date.getUTCDay() = " + date.getUTCDay()); -date.setTime(59*24*60*60*1000 + 4*365*24*60*60*1000); +ok(date.getUTCHours() === 0, "date.getUTCHours() = " + date.getUTCHours()); +date.setTime(59*24*60*60*1000 + 4*365*24*60*60*1000 + 1000*60*60); ok(date.getUTCFullYear() === 1974, "date.getUTCFullYear() = " + date.getUTCFullYear()); ok(date.getUTCMonth() === 1, "date.getUTCMonth() = " + date.getUTCMonth()); ok(date.getUTCMonth(123) === 1, "date.getUTCMonth() = " + date.getUTCMonth()); ok(date.getUTCDate() === 28, "date.getUTCDate() = " + date.getUTCDate()); ok(date.getUTCDay() === 4, "date.getUTCDay() = " + date.getUTCDay()); +ok(date.getUTCHours() === 1, "date.getUTCHours() = " + date.getUTCHours()); date.setTime(Infinity); ok(isNaN(date.getUTCFullYear()), "date.getUTCFullYear() is not NaN"); ok(isNaN(date.getUTCMonth()), "date.getUTCMonth() is not NaN"); ok(isNaN(date.getUTCDate()), "date.getUTCDate() is not NaN"); ok(isNaN(date.getUTCDay()), "date.getUTCDay() is not NaN"); +ok(isNaN(date.getUTCHours()), "date.getUTCHours() is not NaN");
ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);
-
Alexandre Julliard