Piotr Caban : jscript: Added Date_setUTCHours and Date_setHours implementation.

[Alexandre Julliard]

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

Author: Piotr Caban 
Date:   Tue Jun 16 11:42:27 2009 +0200

jscript: Added Date_setUTCHours and Date_setHours implementation.

---

dlls/jscript/date.c       |   65 +++++++++++++++++++++++++++++++++++++++++---
 dlls/jscript/tests/api.js |    6 ++++
 2 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c
index 62b9848..3fd856e 100644
--- a/dlls/jscript/date.c
+++ b/dlls/jscript/date.c
@@ -75,7 +75,7 @@ static const WCHAR setUTCSecondsW[] = {'s','e','t','U','T','C','S','e','c','o','
 static const WCHAR setMinutesW[] = {'s','e','t','M','i','n','u','t','e','s',0};
 static const WCHAR setUTCMinutesW[] = {'s','e','t','U','T','C','M','i','n','u','t','e','s',0};
 static const WCHAR setHoursW[] = {'s','e','t','H','o','u','r','s',0};
-static const WCHAR setUTCHoursW[] = {'s','e','t','H','o','u','r','s',0};
+static const WCHAR setUTCHoursW[] = {'s','e','t','U','T','C','H','o','u','r','s',0};
 static const WCHAR setDateW[] = {'s','e','t','D','a','t','e',0};
 static const WCHAR setUTCDateW[] = {'s','e','t','U','T','C','D','a','t','e',0};
 static const WCHAR setMonthW[] = {'s','e','t','M','o','n','t','h',0};
@@ -846,15 +846,70 @@ static HRESULT Date_setUTCMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DIS
 static HRESULT Date_setHours(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
+            - (hour_from_time(date->time - date->bias*MS_PER_MINUTE)
+                - num_val(&v))*MS_PER_HOUR);
+
+    if(retv)
+        num_set_val(retv, date->time);
+
+    return S_OK;
 }

static HRESULT Date_setUTCHours(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
+            - (hour_from_time(date->time) - num_val(&v))*MS_PER_HOUR);
+
+    if(retv)
+        num_set_val(retv, date->time);
+
+    return S_OK;
 }

static HRESULT Date_setDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js
index 52cd98d..ad4822c 100644
--- a/dlls/jscript/tests/api.js
+++ b/dlls/jscript/tests/api.js
@@ -994,6 +994,12 @@ ok(date.setSeconds(10) === date.setUTCSeconds(10), "date.setUTCSeconds(10) !== d
 date.setMinutes(-10);
 ok(date.getUTCMinutes() === 50, "date.getUTCMinutes() = " + date.getUTCMinutes());
 ok(date.setMinutes(10) === date.setUTCMinutes(10), "date.setUTCMinutes(10) !== date.setUTCMinutes(10)");
+date.setUTCHours(-10);
+ok(date.getUTCHours() === 14, "date.getUTCHours() = " + date.getUTCHours());
+date.setUTCHours(-123);
+ok(date.getTime() === -614989990, "date.getTime() = " + date.getTime());
+date.setHours(20);
+ok(date.getHours() === 20, "date.getHours() = " + date.getHours());

ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI));
 ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);