ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Fix DateConstr_value (with no argument) implementation.

This commit is contained in:
Piotr Caban 2009-06-04 22:36:27 +02:00 committed by Alexandre Julliard
parent 59a217847c
commit c144859b13
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/jscript/date.c
View File

@ -25,11 +25,16 @@
WINE_DEFAULT_DEBUG_CHANNEL(jscript); WINE_DEFAULT_DEBUG_CHANNEL(jscript);
/* 1601 to 1970 is 369 years plus 89 leap days */
#define TIME_EPOCH ((ULONGLONG)(369 * 365 + 89) * 86400 * 1000)
typedef struct { typedef struct {
DispatchEx dispex; DispatchEx dispex;
/* ECMA-262 3rd Edition 15.9.1.1 */ /* ECMA-262 3rd Edition 15.9.1.1 */
DOUBLE time; DOUBLE time;
LONG bias;
} DateInstance; } DateInstance;
static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0};
@ -474,6 +479,9 @@ static HRESULT create_date(script_ctx_t *ctx, BOOL use_constr, DOUBLE time, Disp
{ {
DateInstance *date; DateInstance *date;
HRESULT hres; HRESULT hres;
TIME_ZONE_INFORMATION tzi;
GetTimeZoneInformation(&tzi);
date = heap_alloc_zero(sizeof(DateInstance)); date = heap_alloc_zero(sizeof(DateInstance));
if(!date) if(!date)
@ -489,6 +497,7 @@ static HRESULT create_date(script_ctx_t *ctx, BOOL use_constr, DOUBLE time, Disp
} }
date->time = time; date->time = time;
date->bias = tzi.Bias;
*ret = &date->dispex; *ret = &date->dispex;
return S_OK; return S_OK;
@ -508,12 +517,13 @@ static HRESULT DateConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPP
/* ECMA-262 3rd Edition 15.9.3.3 */ /* ECMA-262 3rd Edition 15.9.3.3 */
case 0: { case 0: {
FILETIME time; FILETIME time;
LONGLONG lltime;
GetSystemTimeAsFileTime(&time); GetSystemTimeAsFileTime(&time);
lltime = ((LONGLONG)time.dwHighDateTime<<32)
+ time.dwLowDateTime;
hres = create_date(dispex->ctx, TRUE, hres = create_date(dispex->ctx, TRUE, lltime/10000-TIME_EPOCH, &date);
floor((DOUBLE)(time.dwLowDateTime/1e6) + (DOUBLE)time.dwHighDateTime*((DOUBLE)UINT_MAX+1.0)/1.e6),
&date);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
break; break;