September 2009 - Wine-Commits

Jacek Caban : jscript: Don't use dispex->ctx in date.c.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: da16d42e175c2b31133237b9e63025d4e850180d URL: http://source.winehq.org/git/wine.git/?a=commit;h=da16d42e175c2b31133237b9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 16:15:55 2009 +0200 jscript: Don't use dispex->ctx in date.c. --- dlls/jscript/date.c | 210 +++++++++++++++++++++++++------------------------- 1 files changed, 105 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da16d42e175c2b3113323…

1 0

Jacek Caban : jscript: Don't use dispex->ctx in array.c.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: 8337986efa88fcb6a92acb1b8af086e212709c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8337986efa88fcb6a92acb1b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 16:14:48 2009 +0200 jscript: Don't use dispex->ctx in array.c. --- dlls/jscript/array.c | 58 +++++++++++++++++++++++++------------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 3a79d5f..71b526d 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -46,7 +46,7 @@ static const WCHAR unshiftW[] = {'u','n','s','h','i','f','t',0}; static const WCHAR default_separatorW[] = {',',0}; -static HRESULT get_jsdisp_length(DispatchEx *obj, jsexcept_t *ei, DWORD *ret) +static HRESULT get_jsdisp_length(script_ctx_t *ctx, DispatchEx *obj, jsexcept_t *ei, DWORD *ret) { VARIANT var; HRESULT hres; @@ -55,7 +55,7 @@ static HRESULT get_jsdisp_length(DispatchEx *obj, jsexcept_t *ei, DWORD *ret) if(FAILED(hres)) return hres; - hres = to_uint32(obj->ctx, &var, ei, ret); + hres = to_uint32(ctx, &var, ei, ret); VariantClear(&var); return hres; } @@ -102,14 +102,14 @@ static HRESULT Array_length(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, D DWORD i; HRESULT hres; - hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &num); + hres = to_number(ctx, get_arg(dp, 0), ei, &num); if(V_VT(&num) == VT_I4) len = V_I4(&num); else len = floor(V_R8(&num)); if(len!=(DWORD)len) - return throw_range_error(dispex->ctx, ei, IDS_INVALID_LENGTH, NULL); + return throw_range_error(ctx, ei, IDS_INVALID_LENGTH, NULL); for(i=len; i<This->length; i++) { hres = jsdisp_delete_idx(dispex, i); @@ -182,7 +182,7 @@ static HRESULT Array_concat(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, D TRACE("\n"); - hres = create_array(dispex->ctx, 0, &ret); + hres = create_array(ctx, 0, &ret); if(FAILED(hres)) return hres; @@ -214,7 +214,7 @@ static HRESULT Array_concat(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, D return S_OK; } -static HRESULT array_join(DispatchEx *array, DWORD length, const WCHAR *sep, VARIANT *retv, +static HRESULT array_join(script_ctx_t *ctx, DispatchEx *array, DWORD length, const WCHAR *sep, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { BSTR *str_tab, ret = NULL; @@ -242,7 +242,7 @@ static HRESULT array_join(DispatchEx *array, DWORD length, const WCHAR *sep, VAR break; if(V_VT(&var) != VT_EMPTY && V_VT(&var) != VT_NULL) - hres = to_string(array->ctx, &var, ei, str_tab+i); + hres = to_string(ctx, &var, ei, str_tab+i); VariantClear(&var); if(FAILED(hres)) break; @@ -330,15 +330,15 @@ static HRESULT Array_join(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DIS if(arg_cnt(dp)) { BSTR sep; - hres = to_string(dispex->ctx, get_arg(dp,0), ei, &sep); + hres = to_string(ctx, get_arg(dp,0), ei, &sep); if(FAILED(hres)) return hres; - hres = array_join(dispex, length, sep, retv, ei, caller); + hres = array_join(ctx, dispex, length, sep, retv, ei, caller); SysFreeString(sep); }else { - hres = array_join(dispex, length, default_separatorW, retv, ei, caller); + hres = array_join(ctx, dispex, length, default_separatorW, retv, ei, caller); } return hres; @@ -418,7 +418,7 @@ static HRESULT Array_push(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DIS if(dispex->builtin_info->class == JSCLASS_ARRAY) { length = ((ArrayInstance*)dispex)->length; }else { - hres = get_jsdisp_length(dispex, ei, &length); + hres = get_jsdisp_length(ctx, dispex, ei, &length); if(FAILED(hres)) return hres; } @@ -463,7 +463,7 @@ static HRESULT Array_shift(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DI if(is_class(dispex, JSCLASS_ARRAY)) { length = ((ArrayInstance*)dispex)->length; }else { - hres = get_jsdisp_length(dispex, ei, &length); + hres = get_jsdisp_length(ctx, dispex, ei, &length); if(SUCCEEDED(hres) && !length) hres = set_jsdisp_length(dispex, ei, 0); if(FAILED(hres)) @@ -518,13 +518,13 @@ static HRESULT Array_slice(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DI if(is_class(dispex, JSCLASS_ARRAY)) { length = ((ArrayInstance*)dispex)->length; }else { - hres = get_jsdisp_length(dispex, ei, &length); + hres = get_jsdisp_length(ctx, dispex, ei, &length); if(FAILED(hres)) return hres; } if(arg_cnt(dp)) { - hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + hres = to_number(ctx, get_arg(dp, 0), ei, &v); if(FAILED(hres)) return hres; @@ -541,7 +541,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DI else start = 0; if(arg_cnt(dp)>1) { - hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + hres = to_number(ctx, get_arg(dp, 1), ei, &v); if(FAILED(hres)) return hres; @@ -557,7 +557,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DI } else end = length; - hres = create_array(dispex->ctx, (end>start)?end-start:0, &arr); + hres = create_array(ctx, (end>start)?end-start:0, &arr); if(FAILED(hres)) return hres; @@ -722,7 +722,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DIS sorttab[i] = vtab+i; for(i=0; i < length/2; i++) { - hres = sort_cmp(dispex->ctx, cmp_func, sorttab[2*i+1], sorttab[2*i], ei, caller, &cmp); + hres = sort_cmp(ctx, cmp_func, sorttab[2*i+1], sorttab[2*i], ei, caller, &cmp); if(FAILED(hres)) break; @@ -747,7 +747,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DIS memcpy(tmpbuf, sorttab+i, k*sizeof(VARIANT*)); while(a < k && b < bend) { - hres = sort_cmp(dispex->ctx, cmp_func, tmpbuf[a], sorttab[i+k+b], ei, caller, &cmp); + hres = sort_cmp(ctx, cmp_func, tmpbuf[a], sorttab[i+k+b], ei, caller, &cmp); if(FAILED(hres)) break; @@ -811,14 +811,14 @@ static HRESULT Array_splice(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, D if(is_class(dispex, JSCLASS_ARRAY)) { length = ((ArrayInstance*)dispex)->length; }else { - hres = get_jsdisp_length(dispex, ei, &length); + hres = get_jsdisp_length(ctx, dispex, ei, &length); if(FAILED(hres)) return hres; } argc = arg_cnt(dp); if(argc >= 1) { - hres = to_integer(dispex->ctx, get_arg(dp,0), ei, &v); + hres = to_integer(ctx, get_arg(dp,0), ei, &v); if(FAILED(hres)) return hres; @@ -833,7 +833,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, D } if(argc >= 2) { - hres = to_integer(dispex->ctx, get_arg(dp,1), ei, &v); + hres = to_integer(ctx, get_arg(dp,1), ei, &v); if(FAILED(hres)) return hres; @@ -848,7 +848,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, D } if(retv) { - hres = create_array(dispex->ctx, 0, &ret_array); + hres = create_array(ctx, 0, &ret_array); if(FAILED(hres)) return hres; @@ -922,7 +922,7 @@ static HRESULT Array_toString(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, return E_FAIL; } - return array_join(dispex, ((ArrayInstance*)dispex)->length, default_separatorW, retv, ei, sp); + return array_join(ctx, dispex, ((ArrayInstance*)dispex)->length, default_separatorW, retv, ei, sp); } static HRESULT Array_toLocaleString(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPARAMS *dp, @@ -947,7 +947,7 @@ static HRESULT Array_unshift(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, if(is_class(dispex, JSCLASS_ARRAY)) { length = ((ArrayInstance*)dispex)->length; }else { - hres = get_jsdisp_length(dispex, ei, &length); + hres = get_jsdisp_length(ctx, dispex, ei, &length); if(FAILED(hres)) return hres; } @@ -1006,9 +1006,9 @@ static HRESULT Array_value(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DI switch(flags) { case INVOKE_FUNC: - return throw_type_error(dispex->ctx, ei, IDS_NOT_FUNC, NULL); + return throw_type_error(ctx, ei, IDS_NOT_FUNC, NULL); case INVOKE_PROPERTYGET: - return array_join(dispex, ((ArrayInstance*)dispex)->length, default_separatorW, retv, ei, sp); + return array_join(ctx, dispex, ((ArrayInstance*)dispex)->length, default_separatorW, retv, ei, sp); default: FIXME("unimplemented flags %x\n", flags); return E_NOTIMPL; @@ -1083,9 +1083,9 @@ static HRESULT ArrayConstr_value(script_ctx_t *ctx, DispatchEx *dispex, WORD fla case DISPATCH_CONSTRUCT: { if(arg_cnt(dp) == 1 && V_VT((arg_var = get_arg(dp, 0))) == VT_I4) { if(V_I4(arg_var) < 0) - return throw_range_error(dispex->ctx, ei, IDS_INVALID_LENGTH, NULL); + return throw_range_error(ctx, ei, IDS_INVALID_LENGTH, NULL); - hres = create_array(dispex->ctx, V_I4(arg_var), &obj); + hres = create_array(ctx, V_I4(arg_var), &obj); if(FAILED(hres)) return hres; @@ -1094,7 +1094,7 @@ static HRESULT ArrayConstr_value(script_ctx_t *ctx, DispatchEx *dispex, WORD fla return S_OK; } - hres = create_array(dispex->ctx, arg_cnt(dp), &obj); + hres = create_array(ctx, arg_cnt(dp), &obj); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Avoid calling JS builtin functions directly.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: a5e828194788497a88199686ffd900d5a943b174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5e828194788497a88199686f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 16:14:25 2009 +0200 jscript: Avoid calling JS builtin functions directly. --- dlls/jscript/string.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index b44cbfd..b7d689f 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -85,14 +85,10 @@ static HRESULT String_length(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, return S_OK; } -/* ECMA-262 3rd Edition 15.5.4.2 */ -static HRESULT String_toString(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +static HRESULT stringobj_to_string(DispatchEx *dispex, VARIANT *retv) { StringInstance *string; - TRACE("\n"); - if(!is_class(dispex, JSCLASS_STRING)) { WARN("this is not a string object\n"); return E_FAIL; @@ -112,12 +108,21 @@ static HRESULT String_toString(script_ctx_t *ctx, DispatchEx *dispex, WORD flags } /* ECMA-262 3rd Edition 15.5.4.2 */ +static HRESULT String_toString(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + TRACE("\n"); + + return stringobj_to_string(dispex, retv); +} + +/* ECMA-262 3rd Edition 15.5.4.2 */ static HRESULT String_valueOf(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); - return String_toString(ctx, dispex, flags, dp, retv, ei, sp); + return stringobj_to_string(dispex, retv); } static HRESULT do_attributeless_tag_format(DispatchEx *dispex, WORD flags, DISPPARAMS *dp,

1 0

Jacek Caban : jscript: Avoid calling JS builtin functions directly.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: 0b4fa6e426996b62fcfaa826f41c4a4921a40db6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b4fa6e426996b62fcfaa826f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 16:13:44 2009 +0200 jscript: Avoid calling JS builtin functions directly. --- dlls/jscript/date.c | 74 +++++++++++++++++++++++++++++--------------------- 1 files changed, 43 insertions(+), 31 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 677ccc7..d8bacf6 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -583,19 +583,11 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, } /* ECMA-262 3rd Edition 15.9.1.2 */ -static HRESULT Date_toString(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +static HRESULT dateobj_to_string(DateInstance *date, VARIANT *retv) { - DateInstance *date; DOUBLE time; int offset; - TRACE("\n"); - - if(!is_class(dispex, JSCLASS_DATE)) - return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - - date = (DateInstance*)dispex; time = local_time(date->time, date); offset = date->bias + daylight_saving_ta(time, date); @@ -603,6 +595,17 @@ static HRESULT Date_toString(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, return date_to_string(time, TRUE, offset, retv); } +static HRESULT Date_toString(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) + return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); + + return dateobj_to_string((DateInstance*)dispex, retv); +} + /* ECMA-262 3rd Edition 15.9.1.5 */ static HRESULT Date_toLocaleString(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) @@ -633,7 +636,7 @@ static HRESULT Date_toLocaleString(script_ctx_t *ctx, DispatchEx *dispex, WORD f st = create_systemtime(local_time(date->time, date)); if(st.wYear<1601 || st.wYear>9999) - return Date_toString(ctx, dispex, flags, dp, retv, ei, caller); + return dateobj_to_string(date, retv); if(retv) { date_len = GetDateFormatW(dispex->ctx->lcid, DATE_LONGDATE, &st, NULL, NULL, 0); @@ -775,8 +778,7 @@ static HRESULT Date_toUTCString(script_ctx_t *ctx, DispatchEx *dispex, WORD flag } /* ECMA-262 3rd Edition 15.9.5.3 */ -static HRESULT Date_toDateString(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +static HRESULT dateobj_to_date_string(DateInstance *date, VARIANT *retv) { static const WCHAR NaNW[] = { 'N','a','N',0 }; static const WCHAR formatADW[] = { '%','s',' ','%','s',' ','%','d',' ','%','d',0 }; @@ -794,19 +796,11 @@ static HRESULT Date_toDateString(script_ctx_t *ctx, DispatchEx *dispex, WORD fla BOOL formatAD = TRUE; BSTR week, month; - DateInstance *date; BSTR date_str; DOUBLE time; int len, size, year, day; DWORD lcid_en, week_id, month_id; - TRACE("\n"); - - if(!is_class(dispex, JSCLASS_DATE)) - return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); - - date = (DateInstance*)dispex; - if(isnan(date->time)) { if(retv) { V_VT(retv) = VT_BSTR; @@ -881,6 +875,15 @@ static HRESULT Date_toDateString(script_ctx_t *ctx, DispatchEx *dispex, WORD fla return S_OK; } +static HRESULT Date_toDateString(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + if(!is_class(dispex, JSCLASS_DATE)) + return throw_type_error(dispex->ctx, ei, IDS_NOT_DATE, NULL); + + return dateobj_to_date_string((DateInstance*)dispex, retv); +} + /* ECMA-262 3rd Edition 15.9.5.4 */ static HRESULT Date_toTimeString(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) @@ -973,7 +976,7 @@ static HRESULT Date_toLocaleDateString(script_ctx_t *ctx, DispatchEx *dispex, WO st = create_systemtime(local_time(date->time, date)); if(st.wYear<1601 || st.wYear>9999) - return Date_toDateString(ctx, dispex, flags, dp, retv, ei, caller); + return dateobj_to_date_string(date, retv); if(retv) { len = GetDateFormatW(dispex->ctx->lcid, DATE_LONGDATE, &st, NULL, NULL, 0); @@ -2404,8 +2407,7 @@ static HRESULT DateConstr_parse(script_ctx_t *ctx, DispatchEx *dispex, WORD flag return hres; } -static HRESULT DateConstr_UTC(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +static HRESULT date_utc(script_ctx_t *ctx, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { VARIANT year, month, vdate, hours, minutes, seconds, ms; DOUBLE y; @@ -2415,7 +2417,7 @@ static HRESULT DateConstr_UTC(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, TRACE("\n"); if(arg_no>0) { - hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &year); + hres = to_number(ctx, get_arg(dp, 0), ei, &year); if(FAILED(hres)) return hres; y = num_val(&year); @@ -2425,7 +2427,7 @@ static HRESULT DateConstr_UTC(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, else y = 1900; if(arg_no>1) { - hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &month); + hres = to_number(ctx, get_arg(dp, 1), ei, &month); if(FAILED(hres)) return hres; } @@ -2435,7 +2437,7 @@ static HRESULT DateConstr_UTC(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, } if(arg_no>2) { - hres = to_number(dispex->ctx, get_arg(dp, 2), ei, &vdate); + hres = to_number(ctx, get_arg(dp, 2), ei, &vdate); if(FAILED(hres)) return hres; } @@ -2445,7 +2447,7 @@ static HRESULT DateConstr_UTC(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, } if(arg_no>3) { - hres = to_number(dispex->ctx, get_arg(dp, 3), ei, &hours); + hres = to_number(ctx, get_arg(dp, 3), ei, &hours); if(FAILED(hres)) return hres; } @@ -2455,7 +2457,7 @@ static HRESULT DateConstr_UTC(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, } if(arg_no>4) { - hres = to_number(dispex->ctx, get_arg(dp, 4), ei, &minutes); + hres = to_number(ctx, get_arg(dp, 4), ei, &minutes); if(FAILED(hres)) return hres; } @@ -2465,7 +2467,7 @@ static HRESULT DateConstr_UTC(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, } if(arg_no>5) { - hres = to_number(dispex->ctx, get_arg(dp, 5), ei, &seconds); + hres = to_number(ctx, get_arg(dp, 5), ei, &seconds); if(FAILED(hres)) return hres; } @@ -2475,7 +2477,7 @@ static HRESULT DateConstr_UTC(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, } if(arg_no>6) { - hres = to_number(dispex->ctx, get_arg(dp, 6), ei, &ms); + hres = to_number(ctx, get_arg(dp, 6), ei, &ms); if(FAILED(hres)) return hres; } @@ -2495,6 +2497,14 @@ static HRESULT DateConstr_UTC(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, return S_OK; } +static HRESULT DateConstr_UTC(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + TRACE("\n"); + + return date_utc(ctx, dp, retv, ei); +} + static HRESULT DateConstr_value(script_ctx_t *ctx, DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -2549,7 +2559,9 @@ static HRESULT DateConstr_value(script_ctx_t *ctx, DispatchEx *dispex, WORD flag VARIANT ret_date; DateInstance *di; - DateConstr_UTC(ctx, dispex, flags, dp, &ret_date, ei, sp); + hres = date_utc(ctx, dp, &ret_date, ei); + if(FAILED(hres)) + return hres; hres = create_date(dispex->ctx, NULL, num_val(&ret_date), &date); if(FAILED(hres))

1 0

Jacek Caban : jscript: Pass script_ctx_t to builtin functions.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: 5511f7173f89fdcfc75cb48f1d0cec444ca03587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5511f7173f89fdcfc75cb48f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 16:12:57 2009 +0200 jscript: Pass script_ctx_t to builtin functions. --- dlls/jscript/array.c | 30 +++++++------- dlls/jscript/bool.c | 8 ++-- dlls/jscript/date.c | 100 +++++++++++++++++++++++----------------------- dlls/jscript/dispex.c | 8 ++-- dlls/jscript/error.c | 26 ++++++------ dlls/jscript/function.c | 22 +++++----- dlls/jscript/global.c | 68 ++++++++++++++++---------------- dlls/jscript/jscript.h | 4 +- dlls/jscript/math.c | 52 ++++++++++++------------ dlls/jscript/number.c | 16 ++++---- dlls/jscript/object.c | 16 ++++---- dlls/jscript/regexp.c | 20 +++++----- dlls/jscript/string.c | 74 +++++++++++++++++----------------- 13 files changed, 222 insertions(+), 222 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5511f7173f89fdcfc75cb…

1 0

Jacek Caban : jscript: Get rid of lcid argument in builtin function implementations.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: f14c5f074ad3872f644dc97170e9d85810e3f397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f14c5f074ad3872f644dc9717… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 16:12:12 2009 +0200 jscript: Get rid of lcid argument in builtin function implementations. --- dlls/jscript/array.c | 62 +++++++++++++------------- dlls/jscript/bool.c | 8 ++-- dlls/jscript/date.c | 116 +++++++++++++++++++++++----------------------- dlls/jscript/dispex.c | 18 ++++---- dlls/jscript/error.c | 26 +++++----- dlls/jscript/function.c | 64 +++++++++++++------------- dlls/jscript/global.c | 100 ++++++++++++++++++++-------------------- dlls/jscript/jscript.h | 4 +- dlls/jscript/math.c | 52 +++++++++++----------- dlls/jscript/number.c | 16 +++--- dlls/jscript/object.c | 16 +++--- dlls/jscript/regexp.c | 30 ++++++------ dlls/jscript/string.c | 108 ++++++++++++++++++++++---------------------- 13 files changed, 310 insertions(+), 310 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f14c5f074ad3872f644dc…

1 0

Jacek Caban : jscript: Use script LCID in *disp_propput* functions.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: fadfab5ff6ec71be6ee710972663f03c39ad8c47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fadfab5ff6ec71be6ee710972… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 16:11:11 2009 +0200 jscript: Use script LCID in *disp_propput* functions. --- dlls/jscript/array.c | 44 ++++++++++++++++++++++---------------------- dlls/jscript/dispex.c | 22 +++++++++++----------- dlls/jscript/engine.c | 13 ++++++------- dlls/jscript/error.c | 2 +- dlls/jscript/function.c | 12 ++++++------ dlls/jscript/global.c | 2 +- dlls/jscript/jscript.h | 6 +++--- dlls/jscript/regexp.c | 8 ++++---- dlls/jscript/string.c | 6 +++--- 9 files changed, 57 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fadfab5ff6ec71be6ee71…

1 0

Jacek Caban : jscript: Use script LCID in *disp_propget* functions.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: 8b338786aa57f07f8cea3185e1f8fe3fcaf58aa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b338786aa57f07f8cea3185e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 16:10:36 2009 +0200 jscript: Use script LCID in *disp_propget* functions. --- dlls/jscript/array.c | 24 ++++++++++++------------ dlls/jscript/dispex.c | 32 +++++++++++++++----------------- dlls/jscript/engine.c | 6 +++--- dlls/jscript/function.c | 4 ++-- dlls/jscript/jscript.h | 8 ++++---- dlls/jscript/jsutils.c | 2 +- 6 files changed, 37 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b338786aa57f07f8cea3…

1 0

Jacek Caban : jscript: Use script global LCID in *disp_call* functions.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: 1f565ac095e37c8f9378d5cc3170d9e2296c6cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f565ac095e37c8f9378d5cc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 16:10:06 2009 +0200 jscript: Use script global LCID in *disp_call* functions. --- dlls/jscript/array.c | 2 +- dlls/jscript/dispex.c | 30 +++++++++++++++--------------- dlls/jscript/engine.c | 6 +++--- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.h | 8 ++++---- dlls/jscript/jsutils.c | 4 ++-- dlls/jscript/object.c | 2 +- dlls/jscript/string.c | 2 +- 8 files changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f565ac095e37c8f9378d…

1 0

Jacek Caban : jscript: Don't require semicolon after function expression.
by Alexandre Julliard Sept. 23, 2009

Sept. 23, 2009

Module: wine Branch: master Commit: b2b197faba101016ae1bd44453a7812735972228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2b197faba101016ae1bd4445… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 23 16:09:43 2009 +0200 jscript: Don't require semicolon after function expression. --- dlls/jscript/parser.y | 3 +-- dlls/jscript/tests/lang.js | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 57f0744..d4b4908 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -264,8 +264,6 @@ HtmlComment /* ECMA-262 3rd Edition 14 */ SourceElements : /* empty */ { $$ = new_source_elements(ctx); } - | SourceElements FunctionExpression - { $$ = $1; } | SourceElements Statement { $$ = source_elements_add_statement($1, $2); } @@ -297,6 +295,7 @@ Statement : Block { $$ = $1; } | VariableStatement { $$ = $1; } | EmptyStatement { $$ = $1; } + | FunctionExpression { $$ = new_empty_statement(ctx); } /* FIXME: return NULL */ | ExpressionStatement { $$ = $1; } | IfStatement { $$ = $1; } | IterationStatement { $$ = $1; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index b6458d4..eed0589 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -953,6 +953,12 @@ function do_test() {} function nosemicolon() {} nosemicolon(); function () {} nosemicolon(); +if(false) { + function in_if_false() { return true; } ok(false, "!?"); +} + +ok(in_if_false(), "in_if_false failed"); + ok(typeof(doesnotexist) === "undefined", "typeof(doesnotexist) = " + typeof(doesnotexist)); (function() { newValue = 1; })();

1 0