diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 0a865e4b764..ab279c03225 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -882,6 +882,7 @@ static HRESULT Date_setMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, D VARIANT v; HRESULT hres; DateInstance *date; + DOUBLE t; TRACE("\n"); @@ -901,7 +902,10 @@ static HRESULT Date_setMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, D return hres; date = (DateInstance*)dispex; - date->time = time_clip(date->time - ms_from_time(date->time) + num_val(&v)); + t = local_time(date->time, date); + t = make_date(day(t), make_time(hour_from_time(t), min_from_time(t), + sec_from_time(t), num_val(&v))); + date->time = time_clip(utc(t, date)); if(retv) num_set_val(retv, date->time); @@ -913,7 +917,38 @@ static HRESULT Date_setMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, D static HRESULT Date_setUTCMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - return Date_setMilliseconds(dispex, lcid, flags, dp, retv, ei, caller); + VARIANT v; + HRESULT hres; + DateInstance *date; + DOUBLE t; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + FIXME("throw ArgumentNotOptional\n"); + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + date = (DateInstance*)dispex; + t = date->time; + t = make_date(day(t), make_time(hour_from_time(t), min_from_time(t), + sec_from_time(t), num_val(&v))); + date->time = time_clip(t); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; } /* ECMA-262 3rd Edition 15.9.5.30 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 5236152373b..a865e9f394f 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1003,7 +1003,8 @@ ok(isNaN(date.setMilliseconds(0)), "date.setMilliseconds() is not NaN"); date.setTime(0); date.setMilliseconds(-10, 2); ok(date.getUTCMilliseconds() === 990, "date.getUTCMilliseconds() = " + date.getUTCMilliseconds()); -ok(date.setMilliseconds(10) === date.setUTCMilliseconds(10), "date.setUTCMilliseconds(10) !== date.setUTCMilliseconds(10)"); +date.setUTCMilliseconds(10); +ok(date.getUTCMilliseconds() === 10, "date.getUTCMilliseconds() = " + date.getUTCMilliseconds()); date.setSeconds(-10); ok(date.getUTCSeconds() === 50, "date.getUTCSeconds() = " + date.getUTCSeconds()); ok(date.setSeconds(10) === date.setUTCSeconds(10), "date.setUTCSeconds(10) !== date.setUTCSeconds(10)");