Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
cfb76176
Commit
cfb76176
authored
Jun 09, 2009
by
Piotr Caban
Committed by
Alexandre Julliard
Jun 10, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jscript: Added Date_getHours and Date_getUTCHours implementation.
parent
28e033e3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
5 deletions
+43
-5
date.c
dlls/jscript/date.c
+38
-4
api.js
dlls/jscript/tests/api.js
+5
-1
No files found.
dlls/jscript/date.c
View file @
cfb76176
...
@@ -85,6 +85,7 @@ static const WCHAR setUTCFullYearW[] = {'s','e','t','U','T','C','F','u','l','l',
...
@@ -85,6 +85,7 @@ static const WCHAR setUTCFullYearW[] = {'s','e','t','U','T','C','F','u','l','l',
/*ECMA-262 3th Edition 15.9.1.2 */
/*ECMA-262 3th Edition 15.9.1.2 */
#define MS_PER_DAY 86400000
#define MS_PER_DAY 86400000
#define MS_PER_HOUR 3600000
#define MS_PER_MINUTE 60000
#define MS_PER_MINUTE 60000
/* ECMA-262 3th Edition 15.9.1.2 */
/* ECMA-262 3th Edition 15.9.1.2 */
...
@@ -215,6 +216,15 @@ static inline DOUBLE week_day(DOUBLE time)
...
@@ -215,6 +216,15 @@ static inline DOUBLE week_day(DOUBLE time)
return
(
int
)(
day
(
time
)
+
4
)
%
7
;
return
(
int
)(
day
(
time
)
+
4
)
%
7
;
}
}
/* ECMA-262 3th Edition 15.9.1.10 */
static
inline
DOUBLE
hour_from_time
(
DOUBLE
time
)
{
if
(
isnan
(
time
))
return
ret_nan
();
return
(
int
)
floor
(
time
/
MS_PER_HOUR
)
%
24
;
}
/* ECMA-262 3rd Edition 15.9.1.14 */
/* ECMA-262 3rd Edition 15.9.1.14 */
static
inline
DOUBLE
time_clip
(
DOUBLE
time
)
static
inline
DOUBLE
time_clip
(
DOUBLE
time
)
{
{
...
@@ -472,18 +482,42 @@ static HRESULT Date_getUTCDay(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR
...
@@ -472,18 +482,42 @@ static HRESULT Date_getUTCDay(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR
return
S_OK
;
return
S_OK
;
}
}
/* ECMA-262 3th Edition 15.9.1.10 */
static
HRESULT
Date_getHours
(
DispatchEx
*
dispex
,
LCID
lcid
,
WORD
flags
,
DISPPARAMS
*
dp
,
static
HRESULT
Date_getHours
(
DispatchEx
*
dispex
,
LCID
lcid
,
WORD
flags
,
DISPPARAMS
*
dp
,
VARIANT
*
retv
,
jsexcept_t
*
ei
,
IServiceProvider
*
caller
)
VARIANT
*
retv
,
jsexcept_t
*
ei
,
IServiceProvider
*
caller
)
{
{
FIXME
(
"
\n
"
);
TRACE
(
"
\n
"
);
return
E_NOTIMPL
;
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
,
hour_from_time
(
time
));
}
return
S_OK
;
}
}
/* ECMA-262 3th Edition 15.9.1.10 */
static
HRESULT
Date_getUTCHours
(
DispatchEx
*
dispex
,
LCID
lcid
,
WORD
flags
,
DISPPARAMS
*
dp
,
static
HRESULT
Date_getUTCHours
(
DispatchEx
*
dispex
,
LCID
lcid
,
WORD
flags
,
DISPPARAMS
*
dp
,
VARIANT
*
retv
,
jsexcept_t
*
ei
,
IServiceProvider
*
caller
)
VARIANT
*
retv
,
jsexcept_t
*
ei
,
IServiceProvider
*
caller
)
{
{
FIXME
(
"
\n
"
);
TRACE
(
"
\n
"
);
return
E_NOTIMPL
;
if
(
!
is_class
(
dispex
,
JSCLASS_DATE
))
{
FIXME
(
"throw TypeError
\n
"
);
return
E_FAIL
;
}
if
(
retv
)
{
DateInstance
*
date
=
(
DateInstance
*
)
dispex
;
num_set_val
(
retv
,
hour_from_time
(
date
->
time
));
}
return
S_OK
;
}
}
static
HRESULT
Date_getMinutes
(
DispatchEx
*
dispex
,
LCID
lcid
,
WORD
flags
,
DISPPARAMS
*
dp
,
static
HRESULT
Date_getMinutes
(
DispatchEx
*
dispex
,
LCID
lcid
,
WORD
flags
,
DISPPARAMS
*
dp
,
...
...
dlls/jscript/tests/api.js
View file @
cfb76176
...
@@ -950,22 +950,26 @@ ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullY
...
@@ -950,22 +950,26 @@ ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullY
ok
(
date
.
getUTCMonth
()
===
0
,
"date.getUTCMonth() = "
+
date
.
getUTCMonth
());
ok
(
date
.
getUTCMonth
()
===
0
,
"date.getUTCMonth() = "
+
date
.
getUTCMonth
());
ok
(
date
.
getUTCDate
()
===
1
,
"date.getUTCDate() = "
+
date
.
getUTCDate
());
ok
(
date
.
getUTCDate
()
===
1
,
"date.getUTCDate() = "
+
date
.
getUTCDate
());
ok
(
date
.
getUTCDay
()
===
4
,
"date.getUTCDay() = "
+
date
.
getUTCDay
());
ok
(
date
.
getUTCDay
()
===
4
,
"date.getUTCDay() = "
+
date
.
getUTCDay
());
ok
(
date
.
getUTCHours
()
===
0
,
"date.getUTCHours() = "
+
date
.
getUTCHours
());
date
.
setTime
(
60
*
24
*
60
*
60
*
1000
);
date
.
setTime
(
60
*
24
*
60
*
60
*
1000
);
ok
(
date
.
getUTCFullYear
()
===
1970
,
"date.getUTCFullYear() = "
+
date
.
getUTCFullYear
());
ok
(
date
.
getUTCFullYear
()
===
1970
,
"date.getUTCFullYear() = "
+
date
.
getUTCFullYear
());
ok
(
date
.
getUTCMonth
()
===
2
,
"date.getUTCMonth() = "
+
date
.
getUTCMonth
());
ok
(
date
.
getUTCMonth
()
===
2
,
"date.getUTCMonth() = "
+
date
.
getUTCMonth
());
ok
(
date
.
getUTCDate
()
===
2
,
"date.getUTCDate() = "
+
date
.
getUTCDate
());
ok
(
date
.
getUTCDate
()
===
2
,
"date.getUTCDate() = "
+
date
.
getUTCDate
());
ok
(
date
.
getUTCDay
()
===
1
,
"date.getUTCDay() = "
+
date
.
getUTCDay
());
ok
(
date
.
getUTCDay
()
===
1
,
"date.getUTCDay() = "
+
date
.
getUTCDay
());
date
.
setTime
(
59
*
24
*
60
*
60
*
1000
+
4
*
365
*
24
*
60
*
60
*
1000
);
ok
(
date
.
getUTCHours
()
===
0
,
"date.getUTCHours() = "
+
date
.
getUTCHours
());
date
.
setTime
(
59
*
24
*
60
*
60
*
1000
+
4
*
365
*
24
*
60
*
60
*
1000
+
1000
*
60
*
60
);
ok
(
date
.
getUTCFullYear
()
===
1974
,
"date.getUTCFullYear() = "
+
date
.
getUTCFullYear
());
ok
(
date
.
getUTCFullYear
()
===
1974
,
"date.getUTCFullYear() = "
+
date
.
getUTCFullYear
());
ok
(
date
.
getUTCMonth
()
===
1
,
"date.getUTCMonth() = "
+
date
.
getUTCMonth
());
ok
(
date
.
getUTCMonth
()
===
1
,
"date.getUTCMonth() = "
+
date
.
getUTCMonth
());
ok
(
date
.
getUTCMonth
(
123
)
===
1
,
"date.getUTCMonth() = "
+
date
.
getUTCMonth
());
ok
(
date
.
getUTCMonth
(
123
)
===
1
,
"date.getUTCMonth() = "
+
date
.
getUTCMonth
());
ok
(
date
.
getUTCDate
()
===
28
,
"date.getUTCDate() = "
+
date
.
getUTCDate
());
ok
(
date
.
getUTCDate
()
===
28
,
"date.getUTCDate() = "
+
date
.
getUTCDate
());
ok
(
date
.
getUTCDay
()
===
4
,
"date.getUTCDay() = "
+
date
.
getUTCDay
());
ok
(
date
.
getUTCDay
()
===
4
,
"date.getUTCDay() = "
+
date
.
getUTCDay
());
ok
(
date
.
getUTCHours
()
===
1
,
"date.getUTCHours() = "
+
date
.
getUTCHours
());
date
.
setTime
(
Infinity
);
date
.
setTime
(
Infinity
);
ok
(
isNaN
(
date
.
getUTCFullYear
()),
"date.getUTCFullYear() is not NaN"
);
ok
(
isNaN
(
date
.
getUTCFullYear
()),
"date.getUTCFullYear() is not NaN"
);
ok
(
isNaN
(
date
.
getUTCMonth
()),
"date.getUTCMonth() is not NaN"
);
ok
(
isNaN
(
date
.
getUTCMonth
()),
"date.getUTCMonth() is not NaN"
);
ok
(
isNaN
(
date
.
getUTCDate
()),
"date.getUTCDate() is not NaN"
);
ok
(
isNaN
(
date
.
getUTCDate
()),
"date.getUTCDate() is not NaN"
);
ok
(
isNaN
(
date
.
getUTCDay
()),
"date.getUTCDay() is not NaN"
);
ok
(
isNaN
(
date
.
getUTCDay
()),
"date.getUTCDay() is not NaN"
);
ok
(
isNaN
(
date
.
getUTCHours
()),
"date.getUTCHours() is not NaN"
);
ok
(
typeof
(
Math
.
PI
)
===
"number"
,
"typeof(Math.PI) = "
+
typeof
(
Math
.
PI
));
ok
(
typeof
(
Math
.
PI
)
===
"number"
,
"typeof(Math.PI) = "
+
typeof
(
Math
.
PI
));
ok
(
Math
.
floor
(
Math
.
PI
*
100
)
===
314
,
"Math.PI = "
+
Math
.
PI
);
ok
(
Math
.
floor
(
Math
.
PI
*
100
)
===
314
,
"Math.PI = "
+
Math
.
PI
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment