Piotr Caban : jscript: Added Date_setFullYear and Date_setUTCFullYear implementation.

Alexandre Julliard julliard at winehq.org
Tue Jun 23 10:02:47 CDT 2009


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

Author: Piotr Caban <piotr.caban at gmail.com>
Date:   Mon Jun 22 20:42:15 2009 +0200

jscript: Added Date_setFullYear and Date_setUTCFullYear implementation.

---

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

diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c
index fe89989..e68b3e9 100644
--- a/dlls/jscript/date.c
+++ b/dlls/jscript/date.c
@@ -1469,18 +1469,114 @@ static HRESULT Date_setUTCMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPP
     return S_OK;
 }
 
+/* ECMA-262 3rd Edition    15.9.5.40 */
 static HRESULT Date_setFullYear(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;
+    DOUBLE t, year, month, ddate;
+
+    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 = local_time(date->time, date);
+
+    hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v);
+    if(FAILED(hres))
+        return hres;
+    year = num_val(&v);
+
+    if(arg_cnt(dp) > 1) {
+        hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v);
+        if(FAILED(hres))
+            return hres;
+        month = num_val(&v);
+    }
+    else month = month_from_time(t);
+
+    if(arg_cnt(dp) > 2) {
+        hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &v);
+        if(FAILED(hres))
+            return hres;
+        ddate = num_val(&v);
+    }
+    else ddate = date_from_time(t);
+
+    t = make_date(make_day(year, month, ddate), time_within_day(t));
+    date->time = time_clip(utc(t, date));
+
+    if(retv)
+        num_set_val(retv, date->time);
+
+    return S_OK;
 }
 
+/* ECMA-262 3rd Edition    15.9.5.41 */
 static HRESULT Date_setUTCFullYear(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;
+    DOUBLE t, year, month, ddate;
+
+    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;
+    year = num_val(&v);
+
+    if(arg_cnt(dp) > 1) {
+        hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v);
+        if(FAILED(hres))
+            return hres;
+        month = num_val(&v);
+    }
+    else month = month_from_time(t);
+
+    if(arg_cnt(dp) > 2) {
+        hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &v);
+        if(FAILED(hres))
+            return hres;
+        ddate = num_val(&v);
+    }
+    else ddate = date_from_time(t);
+
+    t = make_date(make_day(year, month, ddate), time_within_day(t));
+    date->time = time_clip(t);
+
+    if(retv)
+        num_set_val(retv, date->time);
+
+    return S_OK;
 }
 
 static HRESULT Date_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js
index 6a7e830..985d230 100644
--- a/dlls/jscript/tests/api.js
+++ b/dlls/jscript/tests/api.js
@@ -1019,6 +1019,8 @@ date.setUTCDate(32);
 ok(date.getUTCDate() === 1, "date.getUTCDate() = " + date.getUTCDate());
 date.setUTCMonth(22, 37);
 ok(date.getTime() === 60987050010, "date.getTime() = " + date.getTime());
+date.setUTCFullYear(83, 21, 321);
+ok(date.getTime() === -59464984149990, "date.getTime() = " + date.getTime());
 
 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