ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Fix Date_setMinutes implementation.

This commit is contained in:
Piotr Caban 2009-06-22 20:41:28 +02:00 committed by Alexandre Julliard
parent bbfab68bb8
commit ece2654ef9
1 changed files with 74 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
dlls/jscript/date.c
View File

@ -1054,6 +1054,7 @@ static HRESULT Date_setMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA
VARIANT v; VARIANT v;
HRESULT hres; HRESULT hres;
DateInstance *date; DateInstance *date;
DOUBLE t, min, sec, ms;
TRACE("\n"); TRACE("\n");
@ -1068,12 +1069,33 @@ static HRESULT Date_setMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA
return S_OK; return S_OK;
} }
date = (DateInstance*)dispex;
t = local_time(date->time, date);
hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
min = num_val(&v);
date = (DateInstance*)dispex; if(arg_cnt(dp) > 1) {
date->time = time_clip(date->time - (min_from_time(date->time) - num_val(&v))*MS_PER_MINUTE); hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v);
if(FAILED(hres))
return hres;
sec = num_val(&v);
}
else sec = sec_from_time(t);
if(arg_cnt(dp) > 2) {
hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &v);
if(FAILED(hres))
return hres;
ms = num_val(&v);
}
else ms = ms_from_time(t);
t = make_date(day(t), make_time(hour_from_time(t),
min, sec, ms));
date->time = time_clip(utc(t, date));
if(retv) if(retv)
num_set_val(retv, date->time); num_set_val(retv, date->time);
@ -1085,7 +1107,56 @@ static HRESULT Date_setMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA
static HRESULT Date_setUTCMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, static HRESULT Date_setUTCMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller)
{ {
return Date_setMinutes(dispex, lcid, flags, dp, retv, ei, caller); VARIANT v;
HRESULT hres;
DateInstance *date;
DOUBLE t, min, sec, ms;
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;
}
date = (DateInstance*)dispex;
t = date->time;
hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v);
if(FAILED(hres))
return hres;
min = num_val(&v);
if(arg_cnt(dp) > 1) {
hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v);
if(FAILED(hres))
return hres;
sec = num_val(&v);
}
else sec = sec_from_time(t);
if(arg_cnt(dp) > 2) {
hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &v);
if(FAILED(hres))
return hres;
ms = num_val(&v);
}
else ms = ms_from_time(t);
t = make_date(day(t), make_time(hour_from_time(t),
min, sec, ms));
date->time = time_clip(t);
if(retv)
num_set_val(retv, date->time);
return S_OK;
} }
/* ECMA-262 3rd Edition 15.9.5.35 */ /* ECMA-262 3rd Edition 15.9.5.35 */