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

jscript: Return DateInstance from create_date. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2021-01-19 14:33:16 +01:00 committed by Alexandre Julliard
parent 9521c6a1eb
commit 5f8e6137b4
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/jscript/date.c
View File

@ -1918,7 +1918,7 @@ static const builtin_info_t DateInst_info = {
NULL NULL
}; };
static HRESULT create_date(script_ctx_t *ctx, jsdisp_t *object_prototype, DOUBLE time, jsdisp_t **ret) static HRESULT create_date(script_ctx_t *ctx, jsdisp_t *object_prototype, DOUBLE time, DateInstance **ret)
{ {
DateInstance *date; DateInstance *date;
HRESULT hres; HRESULT hres;
@ -1946,7 +1946,7 @@ static HRESULT create_date(script_ctx_t *ctx, jsdisp_t *object_prototype, DOUBLE
date->daylightDate = tzi.DaylightDate; date->daylightDate = tzi.DaylightDate;
date->daylightBias = tzi.DaylightBias; date->daylightBias = tzi.DaylightBias;
*ret = &date->dispex; *ret = date;
return S_OK; return S_OK;
} }
@ -2354,7 +2354,7 @@ static HRESULT DateConstr_now(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
static HRESULT DateConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, static HRESULT DateConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r) jsval_t *r)
{ {
jsdisp_t *date; DateInstance *date;
HRESULT hres; HRESULT hres;
TRACE("\n"); TRACE("\n");
@ -2396,7 +2396,6 @@ static HRESULT DateConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
/* ECMA-262 3rd Edition 15.9.3.1 */ /* ECMA-262 3rd Edition 15.9.3.1 */
default: { default: {
double ret_date; double ret_date;
DateInstance *di;
hres = date_utc(ctx, argc, argv, &ret_date); hres = date_utc(ctx, argc, argv, &ret_date);
if(FAILED(hres)) if(FAILED(hres))
@ -2406,12 +2405,11 @@ static HRESULT DateConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
di = date_from_jsdisp(date); date->time = utc(date->time, date);
di->time = utc(di->time, di);
} }
} }
*r = jsval_obj(date); *r = jsval_obj(&date->dispex);
return S_OK; return S_OK;
case INVOKE_FUNC: { case INVOKE_FUNC: {
@ -2451,7 +2449,7 @@ static const builtin_info_t DateConstr_info = {
HRESULT create_date_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp_t **ret) HRESULT create_date_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp_t **ret)
{ {
jsdisp_t *date; DateInstance *date;
HRESULT hres; HRESULT hres;
hres = create_date(ctx, object_prototype, 0.0, &date); hres = create_date(ctx, object_prototype, 0.0, &date);
@ -2459,8 +2457,8 @@ HRESULT create_date_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp
return hres; return hres;
hres = create_builtin_constructor(ctx, DateConstr_value, L"Date", &DateConstr_info, hres = create_builtin_constructor(ctx, DateConstr_value, L"Date", &DateConstr_info,
PROPF_CONSTR|7, date, ret); PROPF_CONSTR|7, &date->dispex, ret);
jsdisp_release(date); jsdisp_release(&date->dispex);
return hres; return hres;
} }