Piotr Caban : jscript: Fix Date_setSeconds implementation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bbfab68bb84a63dc9cc69d3b996e11d40a96f4e8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bbfab68bb84a63dc9cc69d3b99...

Author: Piotr Caban 
Date:   Mon Jun 22 20:41:11 2009 +0200

jscript: Fix Date_setSeconds implementation.

---

dlls/jscript/date.c |   61 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c
index ab279c0..70c9db6 100644
--- a/dlls/jscript/date.c
+++ b/dlls/jscript/date.c
@@ -958,6 +958,7 @@ static HRESULT Date_setSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA
     VARIANT v;
     HRESULT hres;
     DateInstance *date;
+    DOUBLE t, sec, ms;

TRACE("\n");

@@ -972,12 +973,25 @@ static HRESULT Date_setSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA
         return S_OK;
     }

+    date = (DateInstance*)dispex;
+    t = local_time(date->time, date);
+
     hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v);
     if(FAILED(hres))
         return hres;
+    sec = num_val(&v);

-    date = (DateInstance*)dispex;
-    date->time = time_clip(date->time - (sec_from_time(date->time) - num_val(&v))*1000.0);
+    if(arg_cnt(dp) > 1) {
+        hres = to_number(dispex->ctx, get_arg(dp, 1), 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_from_time(t), sec, ms));
+    date->time = time_clip(utc(t, date));

if(retv)
         num_set_val(retv, date->time);
@@ -989,7 +1003,48 @@ static HRESULT Date_setSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA
 static HRESULT Date_setUTCSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
         VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller)
 {
-    return Date_setSeconds(dispex, lcid, flags, dp, retv, ei, caller);
+    VARIANT v;
+    HRESULT hres;
+    DateInstance *date;
+    DOUBLE t, 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;
+    sec = num_val(&v);
+
+    if(arg_cnt(dp) > 1) {
+        hres = to_number(dispex->ctx, get_arg(dp, 1), 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_from_time(t), 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.33 */