Piotr Caban : jscript: Added Date_setUTCMilliseconds and Date_setMilliseconds implementation.

Alexandre Julliard julliard at winehq.org
Tue Jun 16 09:09:37 CDT 2009


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

Author: Piotr Caban <piotr.caban at gmail.com>
Date:   Tue Jun 16 11:42:10 2009 +0200

jscript: Added Date_setUTCMilliseconds and Date_setMilliseconds implementation.

---

 dlls/jscript/date.c       |   34 ++++++++++++++++++++++++++++++----
 dlls/jscript/tests/api.js |    6 ++++++
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c
index 1b2eaf0..119a442 100644
--- a/dlls/jscript/date.c
+++ b/dlls/jscript/date.c
@@ -708,6 +708,7 @@ static HRESULT Date_setTime(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM
     }
 
     if(!arg_cnt(dp)) {
+        FIXME("throw ArgumentNotOptional\n");
         if(retv) num_set_nan(retv);
         return S_OK;
     }
@@ -728,15 +729,40 @@ static HRESULT Date_setTime(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM
 static HRESULT Date_setMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
         VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller)
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    VARIANT v;
+    HRESULT hres;
+    DateInstance *date;
+
+    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;
+    date->time = time_clip(date->time - ms_from_time(date->time) + num_val(&v));
+
+    if(retv)
+        num_set_val(retv, date->time);
+
+    return S_OK;
 }
 
 static HRESULT Date_setUTCMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
         VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller)
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    return Date_setMilliseconds(dispex, lcid, flags, dp, retv, ei, caller);
 }
 
 static HRESULT Date_setSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js
index b143077..074aa0a 100644
--- a/dlls/jscript/tests/api.js
+++ b/dlls/jscript/tests/api.js
@@ -982,6 +982,12 @@ ok(isNaN(date.getUTCHours()), "date.getUTCHours() is not NaN");
 ok(isNaN(date.getUTCMinutes()), "date.getUTCMinutes() is not NaN");
 ok(isNaN(date.getUTCSeconds()), "date.getUTCSeconds() is not NaN");
 ok(isNaN(date.getUTCMilliseconds()), "date.getUTCMilliseconds() is not NaN");
+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)");
 
 ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI));
 ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);




More information about the wine-cvs mailing list