Piotr Caban : jscript: Added Date_getDay and Date_getUTCDay implementation.

[Alexandre Julliard]

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

Author: Piotr Caban <piotr.caban at gmail.com>
Date:   Tue Jun  9 14:05:23 2009 +0200

jscript: Added Date_getDay and Date_getUTCDay implementation.

---

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

diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c
index 84d4170..8056cc2 100644
--- a/dlls/jscript/date.c
+++ b/dlls/jscript/date.c
@@ -206,6 +206,15 @@ static inline DOUBLE date_from_time(DOUBLE time)
     return dwy-333-ily;
 }
 
+/* ECMA-262 3th Edition    15.9.1.6 */
+static inline DOUBLE week_day(DOUBLE time)
+{
+    if(isnan(time))
+        return ret_nan();
+
+    return (int)(day(time)+4) % 7;
+}
+
 /* ECMA-262 3rd Edition    15.9.1.14 */
 static inline DOUBLE time_clip(DOUBLE time)
 {
@@ -425,18 +434,42 @@ static HRESULT Date_getUTCDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA
     return S_OK;
 }
 
+/* ECMA-262 3th Edition    15.9.1.6 */
 static HRESULT Date_getDay(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
         VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller)
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    TRACE("\n");
+
+    if(!is_class(dispex, JSCLASS_DATE)) {
+        FIXME("throw TypeError\n");
+        return E_FAIL;
+    }
+
+    if(retv) {
+        DateInstance *date = (DateInstance*)dispex;
+        DOUBLE time = date->time - date->bias*MS_PER_MINUTE;
+
+        num_set_val(retv, week_day(time));
+    }
+    return S_OK;
 }
 
+/* ECMA-262 3th Edition    15.9.1.6 */
 static HRESULT Date_getUTCDay(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
         VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller)
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    TRACE("\n");
+
+    if(!is_class(dispex, JSCLASS_DATE)) {
+        FIXME("throw TypeError\n");
+        return E_FAIL;
+    }
+
+    if(retv) {
+        DateInstance *date = (DateInstance*)dispex;
+        num_set_val(retv, week_day(date->time));
+    }
+    return S_OK;
 }
 
 static HRESULT Date_getHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js
index 8616cc0..2238a94 100644
--- a/dlls/jscript/tests/api.js
+++ b/dlls/jscript/tests/api.js
@@ -949,19 +949,23 @@ ok(date.setTime(0) === date.getTime(), "date.setTime(0) !== date.getTime()");
 ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullYear());
 ok(date.getUTCMonth() === 0, "date.getUTCMonth() = " + date.getUTCMonth());
 ok(date.getUTCDate() === 1, "date.getUTCDate() = " + date.getUTCDate());
+ok(date.getUTCDay() === 4, "date.getUTCDay() = " + date.getUTCDay());
 date.setTime(60*24*60*60*1000);
 ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullYear());
 ok(date.getUTCMonth() === 2, "date.getUTCMonth() = " + date.getUTCMonth());
 ok(date.getUTCDate() === 2, "date.getUTCDate() = " + date.getUTCDate());
+ok(date.getUTCDay() === 1, "date.getUTCDay() = " + date.getUTCDay());
 date.setTime(59*24*60*60*1000 + 4*365*24*60*60*1000);
 ok(date.getUTCFullYear() === 1974, "date.getUTCFullYear() = " + date.getUTCFullYear());
 ok(date.getUTCMonth() === 1, "date.getUTCMonth() = " + date.getUTCMonth());
 ok(date.getUTCMonth(123) === 1, "date.getUTCMonth() = " + date.getUTCMonth());
 ok(date.getUTCDate() === 28, "date.getUTCDate() = " + date.getUTCDate());
+ok(date.getUTCDay() === 4, "date.getUTCDay() = " + date.getUTCDay());
 date.setTime(Infinity);
 ok(isNaN(date.getUTCFullYear()), "date.getUTCFullYear() is not NaN");
 ok(isNaN(date.getUTCMonth()), "date.getUTCMonth() is not NaN");
 ok(isNaN(date.getUTCDate()), "date.getUTCDate() is not NaN");
+ok(isNaN(date.getUTCDay()), "date.getUTCDay() is not NaN");
 
 ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI));
 ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);