diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index b5039a7b2f..ee499a5404 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, LCID lcid, jsexcept_t *ei, DWORD *ret) +static HRESULT get_jsdisp_length(DispatchEx *obj, jsexcept_t *ei, DWORD *ret) { VARIANT var; HRESULT hres; @@ -84,7 +84,7 @@ static WCHAR *idx_to_str(DWORD idx, WCHAR *ptr) return ptr+1; } -static HRESULT Array_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Array_length(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { ArrayInstance *This = (ArrayInstance*)dispex; @@ -128,7 +128,7 @@ static HRESULT Array_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM return S_OK; } -static HRESULT concat_array(DispatchEx *array, ArrayInstance *obj, DWORD *len, LCID lcid, +static HRESULT concat_array(DispatchEx *array, ArrayInstance *obj, DWORD *len, jsexcept_t *ei, IServiceProvider *caller) { VARIANT var; @@ -152,7 +152,7 @@ static HRESULT concat_array(DispatchEx *array, ArrayInstance *obj, DWORD *len, L return S_OK; } -static HRESULT concat_obj(DispatchEx *array, IDispatch *obj, DWORD *len, LCID lcid, jsexcept_t *ei, IServiceProvider *caller) +static HRESULT concat_obj(DispatchEx *array, IDispatch *obj, DWORD *len, jsexcept_t *ei, IServiceProvider *caller) { DispatchEx *jsobj; VARIANT var; @@ -161,7 +161,7 @@ static HRESULT concat_obj(DispatchEx *array, IDispatch *obj, DWORD *len, LCID lc jsobj = iface_to_jsdisp((IUnknown*)obj); if(jsobj) { if(is_class(jsobj, JSCLASS_ARRAY)) { - hres = concat_array(array, (ArrayInstance*)jsobj, len, lcid, ei, caller); + hres = concat_array(array, (ArrayInstance*)jsobj, len, ei, caller); jsdisp_release(jsobj); return hres; } @@ -173,7 +173,7 @@ static HRESULT concat_obj(DispatchEx *array, IDispatch *obj, DWORD *len, LCID lc return jsdisp_propput_idx(array, (*len)++, &var, ei, caller); } -static HRESULT Array_concat(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Array_concat(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { DispatchEx *ret; @@ -186,7 +186,7 @@ static HRESULT Array_concat(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM if(FAILED(hres)) return hres; - hres = concat_obj(ret, (IDispatch*)_IDispatchEx_(dispex), &len, lcid, ei, caller); + hres = concat_obj(ret, (IDispatch*)_IDispatchEx_(dispex), &len, ei, caller); if(SUCCEEDED(hres)) { VARIANT *arg; DWORD i; @@ -194,7 +194,7 @@ static HRESULT Array_concat(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM for(i=0; i < arg_cnt(dp); i++) { arg = get_arg(dp, i); if(V_VT(arg) == VT_DISPATCH) - hres = concat_obj(ret, V_DISPATCH(arg), &len, lcid, ei, caller); + hres = concat_obj(ret, V_DISPATCH(arg), &len, ei, caller); else hres = jsdisp_propput_idx(ret, len++, arg, ei, caller); if(FAILED(hres)) @@ -214,7 +214,7 @@ static HRESULT Array_concat(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM return S_OK; } -static HRESULT array_join(DispatchEx *array, LCID lcid, DWORD length, const WCHAR *sep, VARIANT *retv, +static HRESULT array_join(DispatchEx *array, DWORD length, const WCHAR *sep, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { BSTR *str_tab, ret = NULL; @@ -312,7 +312,7 @@ static HRESULT array_join(DispatchEx *array, LCID lcid, DWORD length, const WCHA } /* ECMA-262 3rd Edition 15.4.4.5 */ -static HRESULT Array_join(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Array_join(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { DWORD length; @@ -334,17 +334,17 @@ static HRESULT Array_join(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS if(FAILED(hres)) return hres; - hres = array_join(dispex, lcid, length, sep, retv, ei, caller); + hres = array_join(dispex, length, sep, retv, ei, caller); SysFreeString(sep); }else { - hres = array_join(dispex, lcid, length, default_separatorW, retv, ei, caller); + hres = array_join(dispex, length, default_separatorW, retv, ei, caller); } return hres; } -static HRESULT Array_pop(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Array_pop(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT val; @@ -406,7 +406,7 @@ static HRESULT Array_pop(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * } /* ECMA-262 3rd Edition 15.4.4.7 */ -static HRESULT Array_push(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Array_push(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { DWORD length = 0; @@ -418,7 +418,7 @@ static HRESULT Array_push(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS if(dispex->builtin_info->class == JSCLASS_ARRAY) { length = ((ArrayInstance*)dispex)->length; }else { - hres = get_jsdisp_length(dispex, lcid, ei, &length); + hres = get_jsdisp_length(dispex, ei, &length); if(FAILED(hres)) return hres; } @@ -443,7 +443,7 @@ static HRESULT Array_push(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS return S_OK; } -static HRESULT Array_reverse(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Array_reverse(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); @@ -451,7 +451,7 @@ static HRESULT Array_reverse(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA } /* ECMA-262 3rd Edition 15.4.4.9 */ -static HRESULT Array_shift(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Array_shift(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { DWORD length = 0, i; @@ -463,7 +463,7 @@ static HRESULT Array_shift(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS if(is_class(dispex, JSCLASS_ARRAY)) { length = ((ArrayInstance*)dispex)->length; }else { - hres = get_jsdisp_length(dispex, lcid, ei, &length); + hres = get_jsdisp_length(dispex, ei, &length); if(SUCCEEDED(hres) && !length) hres = set_jsdisp_length(dispex, ei, 0); if(FAILED(hres)) @@ -504,7 +504,7 @@ static HRESULT Array_shift(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS } /* ECMA-262 3rd Edition 15.4.4.10 */ -static HRESULT Array_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Array_slice(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { DispatchEx *arr; @@ -518,7 +518,7 @@ static HRESULT Array_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS if(is_class(dispex, JSCLASS_ARRAY)) { length = ((ArrayInstance*)dispex)->length; }else { - hres = get_jsdisp_length(dispex, lcid, ei, &length); + hres = get_jsdisp_length(dispex, ei, &length); if(FAILED(hres)) return hres; } @@ -641,7 +641,7 @@ static HRESULT sort_cmp(script_ctx_t *ctx, DispatchEx *cmp_func, VARIANT *v1, VA } /* ECMA-262 3rd Edition 15.4.4.11 */ -static HRESULT Array_sort(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Array_sort(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { DispatchEx *cmp_func = NULL; @@ -798,7 +798,7 @@ static HRESULT Array_sort(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS } /* ECMA-262 3rd Edition 15.4.4.12 */ -static HRESULT Array_splice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Array_splice(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { DWORD length, start=0, delete_cnt=0, argc, i, add_args = 0; @@ -811,7 +811,7 @@ static HRESULT Array_splice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM if(is_class(dispex, JSCLASS_ARRAY)) { length = ((ArrayInstance*)dispex)->length; }else { - hres = get_jsdisp_length(dispex, lcid, ei, &length); + hres = get_jsdisp_length(dispex, ei, &length); if(FAILED(hres)) return hres; } @@ -912,7 +912,7 @@ static HRESULT Array_splice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } /* ECMA-262 3rd Edition 15.4.4.2 */ -static HRESULT Array_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Array_toString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -922,10 +922,10 @@ static HRESULT Array_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return E_FAIL; } - return array_join(dispex, lcid, ((ArrayInstance*)dispex)->length, default_separatorW, retv, ei, sp); + return array_join(dispex, ((ArrayInstance*)dispex)->length, default_separatorW, retv, ei, sp); } -static HRESULT Array_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Array_toLocaleString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); @@ -933,7 +933,7 @@ static HRESULT Array_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, D } /* ECMA-262 3rd Edition 15.4.4.13 */ -static HRESULT Array_unshift(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Array_unshift(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { WCHAR buf[14], *buf_end, *str; @@ -947,7 +947,7 @@ static HRESULT Array_unshift(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA if(is_class(dispex, JSCLASS_ARRAY)) { length = ((ArrayInstance*)dispex)->length; }else { - hres = get_jsdisp_length(dispex, lcid, ei, &length); + hres = get_jsdisp_length(dispex, ei, &length); if(FAILED(hres)) return hres; } @@ -999,7 +999,7 @@ static HRESULT Array_unshift(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return S_OK; } -static HRESULT Array_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Array_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -1008,7 +1008,7 @@ static HRESULT Array_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS case INVOKE_FUNC: return throw_type_error(dispex->ctx, ei, IDS_NOT_FUNC, NULL); case INVOKE_PROPERTYGET: - return array_join(dispex, lcid, ((ArrayInstance*)dispex)->length, default_separatorW, retv, ei, sp); + return array_join(dispex, ((ArrayInstance*)dispex)->length, default_separatorW, retv, ei, sp); default: FIXME("unimplemented flags %x\n", flags); return E_NOTIMPL; @@ -1068,7 +1068,7 @@ static const builtin_info_t Array_info = { Array_on_put }; -static HRESULT ArrayConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT ArrayConstr_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { DispatchEx *obj; diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index 9393ffb7c1..c7d8c63bf5 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -33,7 +33,7 @@ static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; /* ECMA-262 3rd Edition 15.6.4.2 */ -static HRESULT Bool_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Bool_toString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { static const WCHAR trueW[] = {'t','r','u','e',0}; @@ -62,7 +62,7 @@ static HRESULT Bool_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA } /* ECMA-262 3rd Edition 15.6.4.3 */ -static HRESULT Bool_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Bool_valueOf(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -80,7 +80,7 @@ static HRESULT Bool_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM return S_OK; } -static HRESULT Bool_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Bool_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -111,7 +111,7 @@ static const builtin_info_t Bool_info = { NULL }; -static HRESULT BoolConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT BoolConstr_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { HRESULT hres; diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 1b1e26f45f..871bb32af4 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -583,7 +583,7 @@ 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(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_toString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { DateInstance *date; @@ -604,7 +604,7 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA } /* ECMA-262 3rd Edition 15.9.1.5 */ -static HRESULT Date_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_toLocaleString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { static const WCHAR NaNW[] = { 'N','a','N',0 }; @@ -633,16 +633,16 @@ static HRESULT Date_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DI st = create_systemtime(local_time(date->time, date)); if(st.wYear<1601 || st.wYear>9999) - return Date_toString(dispex, lcid, flags, dp, retv, ei, caller); + return Date_toString(dispex, flags, dp, retv, ei, caller); if(retv) { - date_len = GetDateFormatW(lcid, DATE_LONGDATE, &st, NULL, NULL, 0); - time_len = GetTimeFormatW(lcid, 0, &st, NULL, NULL, 0); + date_len = GetDateFormatW(dispex->ctx->lcid, DATE_LONGDATE, &st, NULL, NULL, 0); + time_len = GetTimeFormatW(dispex->ctx->lcid, 0, &st, NULL, NULL, 0); date_str = SysAllocStringLen(NULL, date_len+time_len-1); if(!date_str) return E_OUTOFMEMORY; - GetDateFormatW(lcid, DATE_LONGDATE, &st, NULL, date_str, date_len); - GetTimeFormatW(lcid, 0, &st, NULL, &date_str[date_len], time_len); + GetDateFormatW(dispex->ctx->lcid, DATE_LONGDATE, &st, NULL, date_str, date_len); + GetTimeFormatW(dispex->ctx->lcid, 0, &st, NULL, &date_str[date_len], time_len); date_str[date_len-1] = ' '; V_VT(retv) = VT_BSTR; @@ -651,7 +651,7 @@ static HRESULT Date_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DI return S_OK; } -static HRESULT Date_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_valueOf(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -667,7 +667,7 @@ static HRESULT Date_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } /* ECMA-262 3rd Edition 15.9.5.42 */ -static HRESULT Date_toUTCString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_toUTCString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { static const WCHAR NaNW[] = { 'N','a','N',0 }; @@ -775,7 +775,7 @@ static HRESULT Date_toUTCString(DispatchEx *dispex, LCID lcid, WORD flags, DISPP } /* ECMA-262 3rd Edition 15.9.5.3 */ -static HRESULT Date_toDateString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_toDateString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { static const WCHAR NaNW[] = { 'N','a','N',0 }; @@ -882,7 +882,7 @@ static HRESULT Date_toDateString(DispatchEx *dispex, LCID lcid, WORD flags, DISP } /* ECMA-262 3rd Edition 15.9.5.4 */ -static HRESULT Date_toTimeString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_toTimeString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { static const WCHAR NaNW[] = { 'N','a','N',0 }; @@ -944,7 +944,7 @@ static HRESULT Date_toTimeString(DispatchEx *dispex, LCID lcid, WORD flags, DISP } /* ECMA-262 3rd Edition 15.9.5.6 */ -static HRESULT Date_toLocaleDateString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_toLocaleDateString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { static const WCHAR NaNW[] = { 'N','a','N',0 }; @@ -973,14 +973,14 @@ static HRESULT Date_toLocaleDateString(DispatchEx *dispex, LCID lcid, WORD flags st = create_systemtime(local_time(date->time, date)); if(st.wYear<1601 || st.wYear>9999) - return Date_toDateString(dispex, lcid, flags, dp, retv, ei, caller); + return Date_toDateString(dispex, flags, dp, retv, ei, caller); if(retv) { - len = GetDateFormatW(lcid, DATE_LONGDATE, &st, NULL, NULL, 0); + len = GetDateFormatW(dispex->ctx->lcid, DATE_LONGDATE, &st, NULL, NULL, 0); date_str = SysAllocStringLen(NULL, len); if(!date_str) return E_OUTOFMEMORY; - GetDateFormatW(lcid, DATE_LONGDATE, &st, NULL, date_str, len); + GetDateFormatW(dispex->ctx->lcid, DATE_LONGDATE, &st, NULL, date_str, len); V_VT(retv) = VT_BSTR; V_BSTR(retv) = date_str; @@ -989,7 +989,7 @@ static HRESULT Date_toLocaleDateString(DispatchEx *dispex, LCID lcid, WORD flags } /* ECMA-262 3rd Edition 15.9.5.7 */ -static HRESULT Date_toLocaleTimeString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_toLocaleTimeString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { static const WCHAR NaNW[] = { 'N','a','N',0 }; @@ -1018,14 +1018,14 @@ static HRESULT Date_toLocaleTimeString(DispatchEx *dispex, LCID lcid, WORD flags st = create_systemtime(local_time(date->time, date)); if(st.wYear<1601 || st.wYear>9999) - return Date_toTimeString(dispex, lcid, flags, dp, retv, ei, caller); + return Date_toTimeString(dispex, flags, dp, retv, ei, caller); if(retv) { - len = GetTimeFormatW(lcid, 0, &st, NULL, NULL, 0); + len = GetTimeFormatW(dispex->ctx->lcid, 0, &st, NULL, NULL, 0); date_str = SysAllocStringLen(NULL, len); if(!date_str) return E_OUTOFMEMORY; - GetTimeFormatW(lcid, 0, &st, NULL, date_str, len); + GetTimeFormatW(dispex->ctx->lcid, 0, &st, NULL, date_str, len); V_VT(retv) = VT_BSTR; V_BSTR(retv) = date_str; @@ -1034,7 +1034,7 @@ static HRESULT Date_toLocaleTimeString(DispatchEx *dispex, LCID lcid, WORD flags } /* ECMA-262 3rd Edition 15.9.5.9 */ -static HRESULT Date_getTime(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getTime(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1050,7 +1050,7 @@ static HRESULT Date_getTime(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } /* ECMA-262 3rd Edition 15.9.5.10 */ -static HRESULT Date_getFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getFullYear(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1068,7 +1068,7 @@ static HRESULT Date_getFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPP } /* ECMA-262 3rd Edition 15.9.5.11 */ -static HRESULT Date_getUTCFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getUTCFullYear(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1084,7 +1084,7 @@ static HRESULT Date_getUTCFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DI } /* ECMA-262 3rd Edition 15.9.5.12 */ -static HRESULT Date_getMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getMonth(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1102,7 +1102,7 @@ static HRESULT Date_getMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA } /* ECMA-262 3rd Edition 15.9.5.13 */ -static HRESULT Date_getUTCMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getUTCMonth(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1118,7 +1118,7 @@ static HRESULT Date_getUTCMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPP } /* ECMA-262 3rd Edition 15.9.5.14 */ -static HRESULT Date_getDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getDate(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1136,7 +1136,7 @@ static HRESULT Date_getDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } /* ECMA-262 3rd Edition 15.9.5.15 */ -static HRESULT Date_getUTCDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getUTCDate(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1152,7 +1152,7 @@ static HRESULT Date_getUTCDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA } /* ECMA-262 3rd Edition 15.9.5.16 */ -static HRESULT Date_getDay(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getDay(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1170,7 +1170,7 @@ static HRESULT Date_getDay(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS } /* ECMA-262 3rd Edition 15.9.5.17 */ -static HRESULT Date_getUTCDay(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getUTCDay(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1186,7 +1186,7 @@ static HRESULT Date_getUTCDay(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR } /* ECMA-262 3rd Edition 15.9.5.18 */ -static HRESULT Date_getHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getHours(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1204,7 +1204,7 @@ static HRESULT Date_getHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA } /* ECMA-262 3rd Edition 15.9.5.19 */ -static HRESULT Date_getUTCHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getUTCHours(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1220,7 +1220,7 @@ static HRESULT Date_getUTCHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPP } /* ECMA-262 3rd Edition 15.9.5.20 */ -static HRESULT Date_getMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getMinutes(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1238,7 +1238,7 @@ static HRESULT Date_getMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA } /* ECMA-262 3rd Edition 15.9.5.21 */ -static HRESULT Date_getUTCMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getUTCMinutes(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1254,7 +1254,7 @@ static HRESULT Date_getUTCMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DIS } /* ECMA-262 3rd Edition 15.9.5.22 */ -static HRESULT Date_getSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getSeconds(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1272,7 +1272,7 @@ static HRESULT Date_getSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA } /* ECMA-262 3rd Edition 15.9.5.23 */ -static HRESULT Date_getUTCSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getUTCSeconds(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1288,7 +1288,7 @@ static HRESULT Date_getUTCSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DIS } /* ECMA-262 3rd Edition 15.9.5.24 */ -static HRESULT Date_getMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getMilliseconds(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1306,7 +1306,7 @@ static HRESULT Date_getMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, D } /* ECMA-262 3rd Edition 15.9.5.25 */ -static HRESULT Date_getUTCMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getUTCMilliseconds(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1322,7 +1322,7 @@ static HRESULT Date_getUTCMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags } /* ECMA-262 3rd Edition 15.9.5.26 */ -static HRESULT Date_getTimezoneOffset(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getTimezoneOffset(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -1339,7 +1339,7 @@ static HRESULT Date_getTimezoneOffset(DispatchEx *dispex, LCID lcid, WORD flags, } /* ECMA-262 3rd Edition 15.9.5.27 */ -static HRESULT Date_setTime(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_setTime(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; @@ -1368,7 +1368,7 @@ static HRESULT Date_setTime(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } /* ECMA-262 3rd Edition 15.9.5.28 */ -static HRESULT Date_setMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_setMilliseconds(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; @@ -1401,7 +1401,7 @@ static HRESULT Date_setMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, D } /* ECMA-262 3rd Edition 15.9.5.29 */ -static HRESULT Date_setUTCMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_setUTCMilliseconds(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; @@ -1434,7 +1434,7 @@ static HRESULT Date_setUTCMilliseconds(DispatchEx *dispex, LCID lcid, WORD flags } /* ECMA-262 3rd Edition 15.9.5.30 */ -static HRESULT Date_setSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_setSeconds(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; @@ -1477,7 +1477,7 @@ static HRESULT Date_setSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA } /* ECMA-262 3rd Edition 15.9.5.31 */ -static HRESULT Date_setUTCSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_setUTCSeconds(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; @@ -1520,7 +1520,7 @@ static HRESULT Date_setUTCSeconds(DispatchEx *dispex, LCID lcid, WORD flags, DIS } /* ECMA-262 3rd Edition 15.9.5.33 */ -static HRESULT Date_setMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_setMinutes(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; @@ -1571,7 +1571,7 @@ static HRESULT Date_setMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA } /* ECMA-262 3rd Edition 15.9.5.34 */ -static HRESULT Date_setUTCMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_setUTCMinutes(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; @@ -1622,7 +1622,7 @@ static HRESULT Date_setUTCMinutes(DispatchEx *dispex, LCID lcid, WORD flags, DIS } /* ECMA-262 3rd Edition 15.9.5.35 */ -static HRESULT Date_setHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_setHours(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; @@ -1680,7 +1680,7 @@ static HRESULT Date_setHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA } /* ECMA-262 3rd Edition 15.9.5.36 */ -static HRESULT Date_setUTCHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_setUTCHours(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; @@ -1738,7 +1738,7 @@ static HRESULT Date_setUTCHours(DispatchEx *dispex, LCID lcid, WORD flags, DISPP } /* ECMA-262 3rd Edition 15.9.5.36 */ -static HRESULT Date_setDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_setDate(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; @@ -1771,7 +1771,7 @@ static HRESULT Date_setDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } /* ECMA-262 3rd Edition 15.9.5.37 */ -static HRESULT Date_setUTCDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_setUTCDate(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; @@ -1804,7 +1804,7 @@ static HRESULT Date_setUTCDate(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA } /* ECMA-262 3rd Edition 15.9.5.38 */ -static HRESULT Date_setMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_setMonth(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; @@ -1847,7 +1847,7 @@ static HRESULT Date_setMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA } /* ECMA-262 3rd Edition 15.9.5.39 */ -static HRESULT Date_setUTCMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_setUTCMonth(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; @@ -1890,7 +1890,7 @@ static HRESULT Date_setUTCMonth(DispatchEx *dispex, LCID lcid, WORD flags, DISPP } /* ECMA-262 3rd Edition 15.9.5.40 */ -static HRESULT Date_setFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_setFullYear(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; @@ -1940,7 +1940,7 @@ static HRESULT Date_setFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPP } /* ECMA-262 3rd Edition 15.9.5.41 */ -static HRESULT Date_setUTCFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_setUTCFullYear(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { VARIANT v; @@ -1990,7 +1990,7 @@ static HRESULT Date_setUTCFullYear(DispatchEx *dispex, LCID lcid, WORD flags, DI } /* ECMA-262 3rd Edition B2.4 */ -static HRESULT Date_getYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_getYear(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { DateInstance *date; @@ -2018,7 +2018,7 @@ static HRESULT Date_getYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM return S_OK; } -static HRESULT Date_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Date_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { TRACE("\n"); @@ -2380,7 +2380,7 @@ static inline HRESULT date_parse(BSTR input, VARIANT *retv) { return S_OK; } -static HRESULT DateConstr_parse(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT DateConstr_parse(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { BSTR parse_str; @@ -2404,7 +2404,7 @@ static HRESULT DateConstr_parse(DispatchEx *dispex, LCID lcid, WORD flags, DISPP return hres; } -static HRESULT DateConstr_UTC(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT DateConstr_UTC(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT year, month, vdate, hours, minutes, seconds, ms; @@ -2495,7 +2495,7 @@ static HRESULT DateConstr_UTC(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return S_OK; } -static HRESULT DateConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT DateConstr_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { DispatchEx *date; @@ -2549,7 +2549,7 @@ static HRESULT DateConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPP VARIANT ret_date; DateInstance *di; - DateConstr_UTC(dispex, lcid, flags, dp, &ret_date, ei, sp); + DateConstr_UTC(dispex, flags, dp, &ret_date, ei, sp); hres = create_date(dispex->ctx, NULL, num_val(&ret_date), &date); if(FAILED(hres)) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index f2bbb40a01..54d0b3a02c 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -250,7 +250,7 @@ static HRESULT invoke_prop_func(DispatchEx *This, DispatchEx *jsthis, dispex_pro WARN("%s is not a constructor\n", debugstr_w(prop->name)); return E_INVALIDARG; } - return prop->u.p->invoke(jsthis, This->ctx->lcid, flags, dp, retv, ei, caller); + return prop->u.p->invoke(jsthis, flags, dp, retv, ei, caller); case PROP_PROTREF: return invoke_prop_func(This->prototype, jsthis, This->prototype->props+prop->u.ref, flags, dp, retv, ei, caller); case PROP_VARIANT: { @@ -304,7 +304,7 @@ static HRESULT prop_get(DispatchEx *This, dispex_prop_t *prop, DISPPARAMS *dp, hres = VariantCopy(retv, &prop->u.var); }else { - hres = prop->u.p->invoke(This, This->ctx->lcid, DISPATCH_PROPERTYGET, dp, retv, ei, caller); + hres = prop->u.p->invoke(This, DISPATCH_PROPERTYGET, dp, retv, ei, caller); } break; case PROP_PROTREF: @@ -336,7 +336,7 @@ static HRESULT prop_put(DispatchEx *This, dispex_prop_t *prop, DISPPARAMS *dp, switch(prop->type) { case PROP_BUILTIN: if(!(prop->flags & PROPF_METHOD)) - return prop->u.p->invoke(This, This->ctx->lcid, DISPATCH_PROPERTYPUT, dp, NULL, ei, caller); + return prop->u.p->invoke(This, DISPATCH_PROPERTYPUT, dp, NULL, ei, caller); case PROP_PROTREF: prop->type = PROP_VARIANT; prop->flags = PROPF_ENUM; @@ -474,8 +474,8 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti return S_OK; } -static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) +static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) { DispatchEx *This = DISPATCHEX_THIS(iface); FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); @@ -483,8 +483,8 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, } static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) + LPOLESTR *rgszNames, UINT cNames, LCID lcid, + DISPID *rgDispId) { DispatchEx *This = DISPATCHEX_THIS(iface); UINT i; @@ -503,7 +503,7 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, } static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { DispatchEx *This = DISPATCHEX_THIS(iface); @@ -826,7 +826,7 @@ HRESULT jsdisp_get_id(DispatchEx *jsdisp, const WCHAR *name, DWORD flags, DISPID HRESULT jsdisp_call_value(DispatchEx *disp, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - return disp->builtin_info->value_prop.invoke(disp, disp->ctx->lcid, flags, dp, retv, ei, caller); + return disp->builtin_info->value_prop.invoke(disp, flags, dp, retv, ei, caller); } HRESULT jsdisp_call(DispatchEx *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIANT *retv, diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 1aeb867f0e..e7f726335a 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -39,7 +39,7 @@ static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0}; static const WCHAR numberW[] = {'n','u','m','b','e','r',0}; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; -static HRESULT Error_number(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT Error_number(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { ErrorInstance *This = (ErrorInstance*)dispex; @@ -57,7 +57,7 @@ static HRESULT Error_number(DispatchEx *dispex, LCID lcid, WORD flags, } } -static HRESULT Error_description(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT Error_description(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { ErrorInstance *This = (ErrorInstance*)dispex; @@ -76,7 +76,7 @@ static HRESULT Error_description(DispatchEx *dispex, LCID lcid, WORD flags, } /* ECMA-262 3rd Edition 15.11.4.3 */ -static HRESULT Error_message(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT Error_message(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { ErrorInstance *This = (ErrorInstance*)dispex; @@ -95,7 +95,7 @@ static HRESULT Error_message(DispatchEx *dispex, LCID lcid, WORD flags, } /* ECMA-262 3rd Edition 15.11.4.4 */ -static HRESULT Error_toString(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT Error_toString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { static const WCHAR str[] = {'[','o','b','j','e','c','t',' ','E','r','r','o','r',']',0}; @@ -112,7 +112,7 @@ static HRESULT Error_toString(DispatchEx *dispex, LCID lcid, WORD flags, return S_OK; } -static HRESULT Error_value(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT Error_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -278,7 +278,7 @@ static HRESULT error_constr(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, } } -static HRESULT ErrorConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT ErrorConstr_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -286,7 +286,7 @@ static HRESULT ErrorConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, dispex->ctx->error_constr); } -static HRESULT EvalErrorConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT EvalErrorConstr_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -294,7 +294,7 @@ static HRESULT EvalErrorConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, dispex->ctx->eval_error_constr); } -static HRESULT RangeErrorConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT RangeErrorConstr_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -302,7 +302,7 @@ static HRESULT RangeErrorConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, dispex->ctx->range_error_constr); } -static HRESULT ReferenceErrorConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT ReferenceErrorConstr_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -310,7 +310,7 @@ static HRESULT ReferenceErrorConstr_value(DispatchEx *dispex, LCID lcid, WORD fl dispex->ctx->reference_error_constr); } -static HRESULT RegExpErrorConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT RegExpErrorConstr_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -318,7 +318,7 @@ static HRESULT RegExpErrorConstr_value(DispatchEx *dispex, LCID lcid, WORD flags dispex->ctx->regexp_error_constr); } -static HRESULT SyntaxErrorConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT SyntaxErrorConstr_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -326,7 +326,7 @@ static HRESULT SyntaxErrorConstr_value(DispatchEx *dispex, LCID lcid, WORD flags dispex->ctx->syntax_error_constr); } -static HRESULT TypeErrorConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT TypeErrorConstr_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -334,7 +334,7 @@ static HRESULT TypeErrorConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, dispex->ctx->type_error_constr); } -static HRESULT URIErrorConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT URIErrorConstr_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 0f55862aa8..b0c260bdb2 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -62,7 +62,7 @@ static IDispatch *get_this(DISPPARAMS *dp) return NULL; } -static HRESULT init_parameters(DispatchEx *var_disp, FunctionInstance *function, LCID lcid, DISPPARAMS *dp, +static HRESULT init_parameters(DispatchEx *var_disp, FunctionInstance *function, DISPPARAMS *dp, jsexcept_t *ei, IServiceProvider *caller) { parameter_t *param; @@ -85,7 +85,7 @@ static HRESULT init_parameters(DispatchEx *var_disp, FunctionInstance *function, return S_OK; } -static HRESULT Arguments_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Arguments_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { FIXME("\n"); @@ -100,7 +100,7 @@ static const builtin_info_t Arguments_info = { NULL }; -static HRESULT create_arguments(script_ctx_t *ctx, IDispatch *calee, LCID lcid, DISPPARAMS *dp, +static HRESULT create_arguments(script_ctx_t *ctx, IDispatch *calee, DISPPARAMS *dp, jsexcept_t *ei, IServiceProvider *caller, DispatchEx **ret) { DispatchEx *args; @@ -147,7 +147,7 @@ static HRESULT create_arguments(script_ctx_t *ctx, IDispatch *calee, LCID lcid, return S_OK; } -static HRESULT create_var_disp(FunctionInstance *function, LCID lcid, DISPPARAMS *dp, jsexcept_t *ei, +static HRESULT create_var_disp(FunctionInstance *function, DISPPARAMS *dp, jsexcept_t *ei, IServiceProvider *caller, DispatchEx **ret) { DispatchEx *var_disp, *arg_disp; @@ -160,7 +160,7 @@ static HRESULT create_var_disp(FunctionInstance *function, LCID lcid, DISPPARAMS return hres; hres = create_arguments(function->dispex.ctx, (IDispatch*)_IDispatchEx_(&function->dispex), - lcid, dp, ei, caller, &arg_disp); + dp, ei, caller, &arg_disp); if(SUCCEEDED(hres)) { VARIANT var; @@ -171,7 +171,7 @@ static HRESULT create_var_disp(FunctionInstance *function, LCID lcid, DISPPARAMS } if(SUCCEEDED(hres)) - hres = init_parameters(var_disp, function, lcid, dp, ei, caller); + hres = init_parameters(var_disp, function, dp, ei, caller); if(FAILED(hres)) { jsdisp_release(var_disp); return hres; @@ -181,7 +181,7 @@ static HRESULT create_var_disp(FunctionInstance *function, LCID lcid, DISPPARAMS return S_OK; } -static HRESULT invoke_source(FunctionInstance *function, IDispatch *this_obj, LCID lcid, DISPPARAMS *dp, +static HRESULT invoke_source(FunctionInstance *function, IDispatch *this_obj, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { DispatchEx *var_disp; @@ -194,7 +194,7 @@ static HRESULT invoke_source(FunctionInstance *function, IDispatch *this_obj, LC return E_FAIL; } - hres = create_var_disp(function, lcid, dp, ei, caller, &var_disp); + hres = create_var_disp(function, dp, ei, caller, &var_disp); if(FAILED(hres)) return hres; @@ -212,7 +212,7 @@ static HRESULT invoke_source(FunctionInstance *function, IDispatch *this_obj, LC return hres; } -static HRESULT invoke_function(FunctionInstance *function, LCID lcid, DISPPARAMS *dp, +static HRESULT invoke_function(FunctionInstance *function, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { IDispatch *this_obj; @@ -220,10 +220,10 @@ static HRESULT invoke_function(FunctionInstance *function, LCID lcid, DISPPARAMS if(!(this_obj = get_this(dp))) this_obj = (IDispatch*)_IDispatchEx_(function->dispex.ctx->script_disp); - return invoke_source(function, this_obj, lcid, dp, retv, ei, caller); + return invoke_source(function, this_obj, dp, retv, ei, caller); } -static HRESULT invoke_constructor(FunctionInstance *function, LCID lcid, DISPPARAMS *dp, +static HRESULT invoke_constructor(FunctionInstance *function, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { DispatchEx *this_obj; @@ -233,7 +233,7 @@ static HRESULT invoke_constructor(FunctionInstance *function, LCID lcid, DISPPAR if(FAILED(hres)) return hres; - hres = invoke_source(function, (IDispatch*)_IDispatchEx_(this_obj), lcid, dp, retv, ei, caller); + hres = invoke_source(function, (IDispatch*)_IDispatchEx_(this_obj), dp, retv, ei, caller); if(FAILED(hres)) { jsdisp_release(this_obj); return hres; @@ -244,7 +244,7 @@ static HRESULT invoke_constructor(FunctionInstance *function, LCID lcid, DISPPAR return S_OK; } -static HRESULT invoke_value_proc(FunctionInstance *function, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT invoke_value_proc(FunctionInstance *function, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { DispatchEx *this_obj = NULL; @@ -255,7 +255,7 @@ static HRESULT invoke_value_proc(FunctionInstance *function, LCID lcid, WORD fla if(this_disp) this_obj = iface_to_jsdisp((IUnknown*)this_disp); - hres = function->value_proc(this_obj ? this_obj : function->dispex.ctx->script_disp, lcid, + hres = function->value_proc(this_obj ? this_obj : function->dispex.ctx->script_disp, flags, dp, retv, ei, caller); if(this_obj) @@ -263,7 +263,7 @@ static HRESULT invoke_value_proc(FunctionInstance *function, LCID lcid, WORD fla return hres; } -static HRESULT call_function(FunctionInstance *function, IDispatch *this_obj, LCID lcid, DISPPARAMS *args, +static HRESULT call_function(FunctionInstance *function, IDispatch *this_obj, DISPPARAMS *args, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { HRESULT hres; @@ -277,7 +277,7 @@ static HRESULT call_function(FunctionInstance *function, IDispatch *this_obj, LC FIXME("this_obj is not DispatchEx\n"); } - hres = function->value_proc(jsthis ? jsthis : function->dispex.ctx->script_disp, lcid, + hres = function->value_proc(jsthis ? jsthis : function->dispex.ctx->script_disp, DISPATCH_METHOD, args, retv, ei, caller); if(jsthis) @@ -285,7 +285,7 @@ static HRESULT call_function(FunctionInstance *function, IDispatch *this_obj, LC }else { hres = invoke_source(function, this_obj ? this_obj : (IDispatch*)_IDispatchEx_(function->dispex.ctx->script_disp), - lcid, args, retv, ei, caller); + args, retv, ei, caller); } return hres; @@ -320,7 +320,7 @@ static HRESULT function_to_string(FunctionInstance *function, BSTR *ret) return S_OK; } -static HRESULT Function_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Function_length(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FunctionInstance *This = (FunctionInstance*)dispex; @@ -340,7 +340,7 @@ static HRESULT Function_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA return S_OK; } -static HRESULT Function_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Function_toString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FunctionInstance *function; @@ -367,7 +367,7 @@ static HRESULT Function_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISP return S_OK; } -static HRESULT array_to_args(DispatchEx *arg_array, LCID lcid, jsexcept_t *ei, IServiceProvider *caller, +static HRESULT array_to_args(DispatchEx *arg_array, jsexcept_t *ei, IServiceProvider *caller, DISPPARAMS *args) { VARIANT var, *argv; @@ -402,7 +402,7 @@ static HRESULT array_to_args(DispatchEx *arg_array, LCID lcid, jsexcept_t *ei, I return S_OK; } -static HRESULT Function_apply(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Function_apply(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { FunctionInstance *function; @@ -440,7 +440,7 @@ static HRESULT Function_apply(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR } if(arg_array) { - hres = array_to_args(arg_array, lcid, ei, caller, &args); + hres = array_to_args(arg_array, ei, caller, &args); jsdisp_release(arg_array); }else { FIXME("throw TypeError\n"); @@ -448,7 +448,7 @@ static HRESULT Function_apply(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR } } - hres = call_function(function, this_obj, lcid, &args, retv, ei, caller); + hres = call_function(function, this_obj, &args, retv, ei, caller); if(this_obj) IDispatch_Release(this_obj); @@ -458,7 +458,7 @@ static HRESULT Function_apply(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return hres; } -static HRESULT Function_call(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Function_call(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { FunctionInstance *function; @@ -487,14 +487,14 @@ static HRESULT Function_call(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA if(args.cArgs) args.rgvarg = dp->rgvarg + dp->cArgs - args.cArgs-1; - hres = call_function(function, this_obj, lcid, &args, retv, ei, caller); + hres = call_function(function, this_obj, &args, retv, ei, caller); if(this_obj) IDispatch_Release(this_obj); return hres; } -HRESULT Function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +HRESULT Function_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { FunctionInstance *function; @@ -511,9 +511,9 @@ HRESULT Function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp switch(flags) { case DISPATCH_METHOD: if(function->value_proc) - return invoke_value_proc(function, lcid, flags, dp, retv, ei, caller); + return invoke_value_proc(function, flags, dp, retv, ei, caller); - return invoke_function(function, lcid, dp, retv, ei, caller); + return invoke_function(function, dp, retv, ei, caller); case DISPATCH_PROPERTYGET: { HRESULT hres; @@ -530,9 +530,9 @@ HRESULT Function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp case DISPATCH_CONSTRUCT: if(function->value_proc) - return invoke_value_proc(function, lcid, flags, dp, retv, ei, caller); + return invoke_value_proc(function, flags, dp, retv, ei, caller); - return invoke_constructor(function, lcid, dp, retv, ei, caller); + return invoke_constructor(function, dp, retv, ei, caller); default: FIXME("not implemented flags %x\n", flags); @@ -569,14 +569,14 @@ static const builtin_info_t Function_info = { NULL }; -static HRESULT FunctionConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT FunctionConstr_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT FunctionProt_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT FunctionProt_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index d4cb43b158..3c4438d4e1 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -103,7 +103,7 @@ static WCHAR int_to_char(int i) return 'A'+i-10; } -static HRESULT constructor_call(DispatchEx *constr, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT constructor_call(DispatchEx *constr, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { if(flags != DISPATCH_PROPERTYGET) @@ -115,7 +115,7 @@ static HRESULT constructor_call(DispatchEx *constr, LCID lcid, WORD flags, DISPP return S_OK; } -static HRESULT JSGlobal_NaN(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_NaN(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -133,7 +133,7 @@ static HRESULT JSGlobal_NaN(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM return S_OK; } -static HRESULT JSGlobal_Infinity(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_Infinity(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -151,148 +151,148 @@ static HRESULT JSGlobal_Infinity(DispatchEx *dispex, LCID lcid, WORD flags, DISP return S_OK; } -static HRESULT JSGlobal_Array(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_Array(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); - return constructor_call(dispex->ctx->array_constr, lcid, flags, dp, retv, ei, sp); + return constructor_call(dispex->ctx->array_constr, flags, dp, retv, ei, sp); } -static HRESULT JSGlobal_Boolean(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_Boolean(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); - return constructor_call(dispex->ctx->bool_constr, lcid, flags, dp, retv, ei, sp); + return constructor_call(dispex->ctx->bool_constr, flags, dp, retv, ei, sp); } -static HRESULT JSGlobal_Date(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_Date(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); - return constructor_call(dispex->ctx->date_constr, lcid, flags, dp, retv, ei, sp); + return constructor_call(dispex->ctx->date_constr, flags, dp, retv, ei, sp); } -static HRESULT JSGlobal_Error(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_Error(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); - return constructor_call(dispex->ctx->error_constr, lcid, flags, dp, retv, ei, sp); + return constructor_call(dispex->ctx->error_constr, flags, dp, retv, ei, sp); } -static HRESULT JSGlobal_EvalError(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_EvalError(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); - return constructor_call(dispex->ctx->eval_error_constr, lcid, flags, dp, retv, ei, sp); + return constructor_call(dispex->ctx->eval_error_constr, flags, dp, retv, ei, sp); } -static HRESULT JSGlobal_RangeError(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_RangeError(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); - return constructor_call(dispex->ctx->range_error_constr, lcid, flags, dp, retv, ei, sp); + return constructor_call(dispex->ctx->range_error_constr, flags, dp, retv, ei, sp); } -static HRESULT JSGlobal_ReferenceError(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_ReferenceError(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); - return constructor_call(dispex->ctx->reference_error_constr, lcid, flags, dp, retv, ei, sp); + return constructor_call(dispex->ctx->reference_error_constr, flags, dp, retv, ei, sp); } -static HRESULT JSGlobal_SyntaxError(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_SyntaxError(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); - return constructor_call(dispex->ctx->syntax_error_constr, lcid, flags, dp, retv, ei, sp); + return constructor_call(dispex->ctx->syntax_error_constr, flags, dp, retv, ei, sp); } -static HRESULT JSGlobal_TypeError(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_TypeError(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); - return constructor_call(dispex->ctx->type_error_constr, lcid, flags, dp, retv, ei, sp); + return constructor_call(dispex->ctx->type_error_constr, flags, dp, retv, ei, sp); } -static HRESULT JSGlobal_URIError(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_URIError(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); - return constructor_call(dispex->ctx->uri_error_constr, lcid, flags, dp, retv, ei, sp); + return constructor_call(dispex->ctx->uri_error_constr, flags, dp, retv, ei, sp); } -static HRESULT JSGlobal_Function(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_Function(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); - return constructor_call(dispex->ctx->function_constr, lcid, flags, dp, retv, ei, sp); + return constructor_call(dispex->ctx->function_constr, flags, dp, retv, ei, sp); } -static HRESULT JSGlobal_Number(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_Number(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); - return constructor_call(dispex->ctx->number_constr, lcid, flags, dp, retv, ei, sp); + return constructor_call(dispex->ctx->number_constr, flags, dp, retv, ei, sp); } -static HRESULT JSGlobal_Object(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_Object(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); - return constructor_call(dispex->ctx->object_constr, lcid, flags, dp, retv, ei, sp); + return constructor_call(dispex->ctx->object_constr, flags, dp, retv, ei, sp); } -static HRESULT JSGlobal_String(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_String(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); - return constructor_call(dispex->ctx->string_constr, lcid, flags, dp, retv, ei, sp); + return constructor_call(dispex->ctx->string_constr, flags, dp, retv, ei, sp); } -static HRESULT JSGlobal_RegExp(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_RegExp(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); - return constructor_call(dispex->ctx->regexp_constr, lcid, flags, dp, retv, ei, sp); + return constructor_call(dispex->ctx->regexp_constr, flags, dp, retv, ei, sp); } -static HRESULT JSGlobal_ActiveXObject(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_ActiveXObject(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT JSGlobal_VBArray(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_VBArray(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT JSGlobal_Enumerator(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_Enumerator(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT JSGlobal_escape(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_escape(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); @@ -300,7 +300,7 @@ static HRESULT JSGlobal_escape(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA } /* ECMA-262 3rd Edition 15.1.2.1 */ -static HRESULT JSGlobal_eval(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_eval(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { parser_ctx_t *parser_ctx; @@ -342,7 +342,7 @@ static HRESULT JSGlobal_eval(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return hres; } -static HRESULT JSGlobal_isNaN(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_isNaN(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT_BOOL ret = VARIANT_FALSE; @@ -369,7 +369,7 @@ static HRESULT JSGlobal_isNaN(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return S_OK; } -static HRESULT JSGlobal_isFinite(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_isFinite(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT_BOOL ret = VARIANT_FALSE; @@ -406,7 +406,7 @@ static INT char_to_int(WCHAR c) return 100; } -static HRESULT JSGlobal_parseInt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_parseInt(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { DOUBLE ret = 0.0; @@ -474,7 +474,7 @@ static HRESULT JSGlobal_parseInt(DispatchEx *dispex, LCID lcid, WORD flags, DISP return S_OK; } -static HRESULT JSGlobal_parseFloat(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_parseFloat(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { LONGLONG d = 0, hlp; @@ -582,7 +582,7 @@ static inline int hex_to_int(const WCHAR wch) { return -1; } -static HRESULT JSGlobal_unescape(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_unescape(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { BSTR ret, str; @@ -657,49 +657,49 @@ static HRESULT JSGlobal_unescape(DispatchEx *dispex, LCID lcid, WORD flags, DISP return S_OK; } -static HRESULT JSGlobal_GetObject(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_GetObject(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT JSGlobal_ScriptEngine(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_ScriptEngine(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT JSGlobal_ScriptEngineMajorVersion(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_ScriptEngineMajorVersion(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT JSGlobal_ScriptEngineMinorVersion(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_ScriptEngineMinorVersion(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT JSGlobal_ScriptEngineBuildVersion(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_ScriptEngineBuildVersion(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT JSGlobal_CollectGarbage(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_CollectGarbage(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT JSGlobal_encodeURI(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT JSGlobal_encodeURI(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { const WCHAR *ptr; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 0d400637a8..699850b59b 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -86,7 +86,7 @@ typedef enum { JSCLASS_ARGUMENTS } jsclass_t; -typedef HRESULT (*builtin_invoke_t)(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); +typedef HRESULT (*builtin_invoke_t)(DispatchEx*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); typedef struct { const WCHAR *name; @@ -146,7 +146,7 @@ HRESULT jsdisp_delete_idx(DispatchEx*,DWORD); HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, DispatchEx*,DispatchEx**); -HRESULT Function_value(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); +HRESULT Function_value(DispatchEx*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT throw_eval_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); HRESULT throw_range_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 628707ed17..d00c7d5d29 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -73,7 +73,7 @@ static HRESULT math_constant(DOUBLE val, WORD flags, VARIANT *retv) } /* ECMA-262 3rd Edition 15.8.1.1 */ -static HRESULT Math_E(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_E(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -81,7 +81,7 @@ static HRESULT Math_E(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, } /* ECMA-262 3rd Edition 15.8.1.4 */ -static HRESULT Math_LOG2E(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_LOG2E(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -89,21 +89,21 @@ static HRESULT Math_LOG2E(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS } /* ECMA-262 3rd Edition 15.8.1.4 */ -static HRESULT Math_LOG10E(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_LOG10E(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); return math_constant(M_LOG10E, flags, retv); } -static HRESULT Math_LN2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_LN2(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); return math_constant(M_LN2, flags, retv); } -static HRESULT Math_LN10(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_LN10(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -111,21 +111,21 @@ static HRESULT Math_LN10(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * } /* ECMA-262 3rd Edition 15.8.1.6 */ -static HRESULT Math_PI(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_PI(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); return math_constant(M_PI, flags, retv); } -static HRESULT Math_SQRT2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_SQRT2(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); return math_constant(M_SQRT2, flags, retv); } -static HRESULT Math_SQRT1_2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_SQRT1_2(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -133,7 +133,7 @@ static HRESULT Math_SQRT1_2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM } /* ECMA-262 3rd Edition 15.8.2.12 */ -static HRESULT Math_abs(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_abs(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT v; @@ -158,7 +158,7 @@ static HRESULT Math_abs(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d return S_OK; } -static HRESULT Math_acos(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_acos(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT v; @@ -179,7 +179,7 @@ static HRESULT Math_acos(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * return S_OK; } -static HRESULT Math_asin(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_asin(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT v; @@ -200,7 +200,7 @@ static HRESULT Math_asin(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * return S_OK; } -static HRESULT Math_atan(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_atan(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT v; @@ -221,7 +221,7 @@ static HRESULT Math_atan(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * return S_OK; } -static HRESULT Math_atan2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_atan2(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT v1, v2; @@ -247,7 +247,7 @@ static HRESULT Math_atan2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS } /* ECMA-262 3rd Edition 15.8.2.6 */ -static HRESULT Math_ceil(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_ceil(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT v; @@ -270,7 +270,7 @@ static HRESULT Math_ceil(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * return S_OK; } -static HRESULT Math_cos(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_cos(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT v; @@ -291,7 +291,7 @@ static HRESULT Math_cos(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d return S_OK; } -static HRESULT Math_exp(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_exp(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT v; @@ -312,7 +312,7 @@ static HRESULT Math_exp(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d return S_OK; } -static HRESULT Math_floor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_floor(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT v; @@ -335,7 +335,7 @@ static HRESULT Math_floor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS return S_OK; } -static HRESULT Math_log(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_log(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT v; @@ -359,7 +359,7 @@ static HRESULT Math_log(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d } /* ECMA-262 3rd Edition 15.8.2.11 */ -static HRESULT Math_max(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_max(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { DOUBLE max, d; @@ -396,7 +396,7 @@ static HRESULT Math_max(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d } /* ECMA-262 3rd Edition 15.8.2.12 */ -static HRESULT Math_min(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_min(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { DOUBLE min, d; @@ -433,7 +433,7 @@ static HRESULT Math_min(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d } /* ECMA-262 3rd Edition 15.8.2.13 */ -static HRESULT Math_pow(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_pow(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT x, y; @@ -460,7 +460,7 @@ static HRESULT Math_pow(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d } /* ECMA-262 3rd Edition 15.8.2.14 */ -static HRESULT Math_random(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_random(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { UINT r; @@ -477,7 +477,7 @@ static HRESULT Math_random(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS } /* ECMA-262 3rd Edition 15.8.2.15 */ -static HRESULT Math_round(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_round(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT v; @@ -499,7 +499,7 @@ static HRESULT Math_round(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS return S_OK; } -static HRESULT Math_sin(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_sin(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT v; @@ -520,7 +520,7 @@ static HRESULT Math_sin(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d return S_OK; } -static HRESULT Math_sqrt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_sqrt(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT v; @@ -541,7 +541,7 @@ static HRESULT Math_sqrt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * return S_OK; } -static HRESULT Math_tan(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Math_tan(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT v; diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 3159eb1072..af14690867 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -42,7 +42,7 @@ static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; #define NUMBER_TOSTRING_BUF_SIZE 64 /* ECMA-262 3rd Edition 15.7.4.2 */ -static HRESULT Number_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Number_toString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { NumberInstance *number; @@ -170,35 +170,35 @@ static HRESULT Number_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA return S_OK; } -static HRESULT Number_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Number_toLocaleString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT Number_toFixed(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Number_toFixed(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT Number_toExponential(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Number_toExponential(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT Number_toPrecision(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Number_toPrecision(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT Number_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Number_valueOf(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -213,7 +213,7 @@ static HRESULT Number_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return S_OK; } -static HRESULT Number_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Number_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { NumberInstance *number = (NumberInstance*)dispex; @@ -251,7 +251,7 @@ static const builtin_info_t Number_info = { NULL }; -static HRESULT NumberConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT NumberConstr_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { VARIANT num; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index b947fd8072..c028116978 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -32,7 +32,7 @@ static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p',' static const WCHAR default_valueW[] = {'[','o','b','j','e','c','t',' ','O','b','j','e','c','t',']',0}; -static HRESULT Object_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Object_toString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { static const WCHAR formatW[] = {'[','o','b','j','e','c','t',' ','%','s',']',0}; @@ -71,7 +71,7 @@ static HRESULT Object_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA return S_OK; } -static HRESULT Object_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Object_toLocaleString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { DISPPARAMS params = {NULL, NULL, 0, 0}; @@ -81,7 +81,7 @@ static HRESULT Object_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, return jsdisp_call_name(dispex, toStringW, DISPATCH_METHOD, ¶ms, retv, ei, sp); } -static HRESULT Object_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Object_valueOf(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -96,28 +96,28 @@ static HRESULT Object_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return S_OK; } -static HRESULT Object_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Object_hasOwnProperty(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT Object_propertyIsEnumerable(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Object_propertyIsEnumerable(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT Object_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Object_isPrototypeOf(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT Object_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT Object_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -162,7 +162,7 @@ static const builtin_info_t Object_info = { NULL }; -static HRESULT ObjectConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT ObjectConstr_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { HRESULT hres; diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 84fd950650..1236327391 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3425,7 +3425,7 @@ HRESULT regexp_match(DispatchEx *dispex, const WCHAR *str, DWORD len, BOOL gflag return S_OK; } -static HRESULT RegExp_source(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT RegExp_source(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -3448,28 +3448,28 @@ static HRESULT RegExp_source(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return S_OK; } -static HRESULT RegExp_global(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT RegExp_global(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT RegExp_ignoreCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT RegExp_ignoreCase(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT RegExp_multiline(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT RegExp_multiline(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT RegExp_lastIndex(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT RegExp_lastIndex(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -3489,7 +3489,7 @@ static HRESULT RegExp_lastIndex(DispatchEx *dispex, LCID lcid, WORD flags, DISPP return S_OK; } -static HRESULT RegExp_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT RegExp_toString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); @@ -3497,7 +3497,7 @@ static HRESULT RegExp_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA } static HRESULT create_match_array(script_ctx_t *ctx, BSTR input, const match_result_t *result, - const match_result_t *parens, DWORD parens_cnt, LCID lcid, jsexcept_t *ei, IDispatch **ret) + const match_result_t *parens, DWORD parens_cnt, jsexcept_t *ei, IDispatch **ret) { DispatchEx *array; VARIANT var; @@ -3558,7 +3558,7 @@ static HRESULT create_match_array(script_ctx_t *ctx, BSTR input, const match_res return S_OK; } -static HRESULT run_exec(DispatchEx *dispex, VARIANT *arg, LCID lcid, jsexcept_t *ei, BSTR *input, +static HRESULT run_exec(DispatchEx *dispex, VARIANT *arg, jsexcept_t *ei, BSTR *input, match_result_t *match, match_result_t **parens, DWORD *parens_cnt, VARIANT_BOOL *ret) { RegExpInstance *regexp; @@ -3609,7 +3609,7 @@ static HRESULT run_exec(DispatchEx *dispex, VARIANT *arg, LCID lcid, jsexcept_t return S_OK; } -static HRESULT RegExp_exec(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT RegExp_exec(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { match_result_t *parens = NULL, match; @@ -3620,7 +3620,7 @@ static HRESULT RegExp_exec(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS TRACE("\n"); - hres = run_exec(dispex, arg_cnt(dp) ? get_arg(dp,0) : NULL, lcid, ei, &string, &match, &parens, &parens_cnt, &b); + hres = run_exec(dispex, arg_cnt(dp) ? get_arg(dp,0) : NULL, ei, &string, &match, &parens, &parens_cnt, &b); if(FAILED(hres)) return hres; @@ -3628,7 +3628,7 @@ static HRESULT RegExp_exec(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS if(b) { IDispatch *ret; - hres = create_match_array(dispex->ctx, string, &match, parens, parens_cnt, lcid, ei, &ret); + hres = create_match_array(dispex->ctx, string, &match, parens, parens_cnt, ei, &ret); if(SUCCEEDED(hres)) { V_VT(retv) = VT_DISPATCH; V_DISPATCH(retv) = ret; @@ -3643,7 +3643,7 @@ static HRESULT RegExp_exec(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS return hres; } -static HRESULT RegExp_test(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT RegExp_test(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { match_result_t match; @@ -3652,7 +3652,7 @@ static HRESULT RegExp_test(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS TRACE("\n"); - hres = run_exec(dispex, arg_cnt(dp) ? get_arg(dp,0) : NULL, lcid, ei, NULL, &match, NULL, NULL, &b); + hres = run_exec(dispex, arg_cnt(dp) ? get_arg(dp,0) : NULL, ei, NULL, &match, NULL, NULL, &b); if(FAILED(hres)) return hres; @@ -3663,7 +3663,7 @@ static HRESULT RegExp_test(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS return S_OK; } -static HRESULT RegExp_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT RegExp_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); @@ -3828,7 +3828,7 @@ static HRESULT regexp_constructor(script_ctx_t *ctx, DISPPARAMS *dp, VARIANT *re return S_OK; } -static HRESULT RegExpConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT RegExpConstr_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index e0b900c027..1e7cde322f 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -64,7 +64,7 @@ static const WCHAR toLocaleUpperCaseW[] = {'t','o','L','o','c','a','l','e','U',' static const WCHAR localeCompareW[] = {'l','o','c','a','l','e','C','o','m','p','a','r','e',0}; static const WCHAR fromCharCodeW[] = {'f','r','o','m','C','h','a','r','C','o','d','e',0}; -static HRESULT String_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_length(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("%p\n", dispex); @@ -86,7 +86,7 @@ static HRESULT String_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA } /* ECMA-262 3rd Edition 15.5.4.2 */ -static HRESULT String_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_toString(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { StringInstance *string; @@ -112,15 +112,15 @@ static HRESULT String_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA } /* ECMA-262 3rd Edition 15.5.4.2 */ -static HRESULT String_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_valueOf(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { TRACE("\n"); - return String_toString(dispex, lcid, flags, dp, retv, ei, sp); + return String_toString(dispex, flags, dp, retv, ei, sp); } -static HRESULT do_attributeless_tag_format(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT do_attributeless_tag_format(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp, const WCHAR *tagname) { static const WCHAR tagfmt[] = {'<','%','s','>','%','s','<','/','%','s','>',0}; @@ -166,7 +166,7 @@ static HRESULT do_attributeless_tag_format(DispatchEx *dispex, LCID lcid, WORD f return S_OK; } -static HRESULT do_attribute_tag_format(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT do_attribute_tag_format(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp, const WCHAR *tagname, const WCHAR *attr) { @@ -234,38 +234,38 @@ static HRESULT do_attribute_tag_format(DispatchEx *dispex, LCID lcid, WORD flags return S_OK; } -static HRESULT String_anchor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_anchor(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { static const WCHAR fontW[] = {'A',0}; static const WCHAR colorW[] = {'N','A','M','E',0}; - return do_attribute_tag_format(dispex, lcid, flags, dp, retv, ei, sp, fontW, colorW); + return do_attribute_tag_format(dispex, flags, dp, retv, ei, sp, fontW, colorW); } -static HRESULT String_big(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_big(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { static const WCHAR bigtagW[] = {'B','I','G',0}; - return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, bigtagW); + return do_attributeless_tag_format(dispex, flags, dp, retv, ei, sp, bigtagW); } -static HRESULT String_blink(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_blink(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { static const WCHAR blinktagW[] = {'B','L','I','N','K',0}; - return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, blinktagW); + return do_attributeless_tag_format(dispex, flags, dp, retv, ei, sp, blinktagW); } -static HRESULT String_bold(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_bold(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { static const WCHAR boldtagW[] = {'B',0}; - return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, boldtagW); + return do_attributeless_tag_format(dispex, flags, dp, retv, ei, sp, boldtagW); } /* ECMA-262 3rd Edition 15.5.4.5 */ -static HRESULT String_charAt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_charAt(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { const WCHAR *str; @@ -333,7 +333,7 @@ static HRESULT String_charAt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA } /* ECMA-262 3rd Edition 15.5.4.5 */ -static HRESULT String_charCodeAt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_charCodeAt(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { const WCHAR *str; @@ -391,7 +391,7 @@ static HRESULT String_charCodeAt(DispatchEx *dispex, LCID lcid, WORD flags, DISP } /* ECMA-262 3rd Edition 15.5.4.6 */ -static HRESULT String_concat(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_concat(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { BSTR *strs = NULL, ret = NULL; @@ -448,32 +448,32 @@ static HRESULT String_concat(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return S_OK; } -static HRESULT String_fixed(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_fixed(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { static const WCHAR fixedtagW[] = {'T','T',0}; - return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, fixedtagW); + return do_attributeless_tag_format(dispex, flags, dp, retv, ei, sp, fixedtagW); } -static HRESULT String_fontcolor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_fontcolor(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { static const WCHAR fontW[] = {'F','O','N','T',0}; static const WCHAR colorW[] = {'C','O','L','O','R',0}; - return do_attribute_tag_format(dispex, lcid, flags, dp, retv, ei, sp, fontW, colorW); + return do_attribute_tag_format(dispex, flags, dp, retv, ei, sp, fontW, colorW); } -static HRESULT String_fontsize(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_fontsize(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { static const WCHAR fontW[] = {'F','O','N','T',0}; static const WCHAR colorW[] = {'S','I','Z','E',0}; - return do_attribute_tag_format(dispex, lcid, flags, dp, retv, ei, sp, fontW, colorW); + return do_attribute_tag_format(dispex, flags, dp, retv, ei, sp, fontW, colorW); } -static HRESULT String_indexOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_indexOf(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { DWORD length, pos = 0; @@ -555,15 +555,15 @@ static HRESULT String_indexOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return S_OK; } -static HRESULT String_italics(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_italics(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { static const WCHAR italicstagW[] = {'I',0}; - return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, italicstagW); + return do_attributeless_tag_format(dispex, flags, dp, retv, ei, sp, italicstagW); } /* ECMA-262 3rd Edition 15.5.4.8 */ -static HRESULT String_lastIndexOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_lastIndexOf(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { BSTR search_str, val_str = NULL; @@ -649,17 +649,17 @@ static HRESULT String_lastIndexOf(DispatchEx *dispex, LCID lcid, WORD flags, DIS return S_OK; } -static HRESULT String_link(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_link(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { static const WCHAR fontW[] = {'A',0}; static const WCHAR colorW[] = {'H','R','E','F',0}; - return do_attribute_tag_format(dispex, lcid, flags, dp, retv, ei, sp, fontW, colorW); + return do_attribute_tag_format(dispex, flags, dp, retv, ei, sp, fontW, colorW); } /* ECMA-262 3rd Edition 15.5.4.10 */ -static HRESULT String_match(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_match(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { const WCHAR *str; @@ -810,7 +810,7 @@ static HRESULT strbuf_append(strbuf_t *buf, const WCHAR *str, DWORD len) } static HRESULT rep_call(DispatchEx *func, const WCHAR *str, match_result_t *match, match_result_t *parens, - DWORD parens_cnt, LCID lcid, BSTR *ret, jsexcept_t *ei, IServiceProvider *caller) + DWORD parens_cnt, BSTR *ret, jsexcept_t *ei, IServiceProvider *caller) { DISPPARAMS dp = {NULL, NULL, 0, 0}; VARIANTARG *args, *arg; @@ -871,7 +871,7 @@ static HRESULT rep_call(DispatchEx *func, const WCHAR *str, match_result_t *matc } /* ECMA-262 3rd Edition 15.5.4.11 */ -static HRESULT String_replace(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_replace(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { const WCHAR *str; @@ -999,7 +999,7 @@ static HRESULT String_replace(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR if(rep_func) { BSTR cstr; - hres = rep_call(rep_func, str, &match, parens, parens_cnt, lcid, &cstr, ei, caller); + hres = rep_call(rep_func, str, &match, parens, parens_cnt, &cstr, ei, caller); if(FAILED(hres)) break; @@ -1105,7 +1105,7 @@ static HRESULT String_replace(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return hres; } -static HRESULT String_search(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_search(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); @@ -1113,7 +1113,7 @@ static HRESULT String_search(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA } /* ECMA-262 3rd Edition 15.5.4.13 */ -static HRESULT String_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_slice(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { const WCHAR *str; @@ -1209,14 +1209,14 @@ static HRESULT String_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM return S_OK; } -static HRESULT String_small(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_small(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { static const WCHAR smalltagW[] = {'S','M','A','L','L',0}; - return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, smalltagW); + return do_attributeless_tag_format(dispex, flags, dp, retv, ei, sp, smalltagW); } -static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_split(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { match_result_t *match_result = NULL; @@ -1357,22 +1357,22 @@ static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM return hres; } -static HRESULT String_strike(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_strike(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { static const WCHAR striketagW[] = {'S','T','R','I','K','E',0}; - return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, striketagW); + return do_attributeless_tag_format(dispex, flags, dp, retv, ei, sp, striketagW); } -static HRESULT String_sub(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_sub(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { static const WCHAR subtagW[] = {'S','U','B',0}; - return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, subtagW); + return do_attributeless_tag_format(dispex, flags, dp, retv, ei, sp, subtagW); } /* ECMA-262 3rd Edition 15.5.4.15 */ -static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_substring(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { const WCHAR *str; @@ -1461,7 +1461,7 @@ static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPP } /* ECMA-262 3rd Edition B.2.3 */ -static HRESULT String_substr(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_substr(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { BSTR val_str = NULL; @@ -1541,14 +1541,14 @@ static HRESULT String_substr(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return hres; } -static HRESULT String_sup(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_sup(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { static const WCHAR suptagW[] = {'S','U','P',0}; - return do_attributeless_tag_format(dispex, lcid, flags, dp, retv, ei, sp, suptagW); + return do_attributeless_tag_format(dispex, flags, dp, retv, ei, sp, suptagW); } -static HRESULT String_toLowerCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_toLowerCase(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { const WCHAR* str; @@ -1594,7 +1594,7 @@ static HRESULT String_toLowerCase(DispatchEx *dispex, LCID lcid, WORD flags, DIS return S_OK; } -static HRESULT String_toUpperCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_toUpperCase(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { const WCHAR* str; @@ -1640,28 +1640,28 @@ static HRESULT String_toUpperCase(DispatchEx *dispex, LCID lcid, WORD flags, DIS return S_OK; } -static HRESULT String_toLocaleLowerCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_toLocaleLowerCase(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT String_toLocaleUpperCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_toLocaleUpperCase(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT String_localeCompare(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_localeCompare(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT String_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT String_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { StringInstance *This = (StringInstance*)dispex; @@ -1742,7 +1742,7 @@ static const builtin_info_t String_info = { }; /* ECMA-262 3rd Edition 15.5.3.2 */ -static HRESULT StringConstr_fromCharCode(DispatchEx *dispex, LCID lcid, WORD flags, +static HRESULT StringConstr_fromCharCode(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { DWORD i, code; @@ -1772,7 +1772,7 @@ static HRESULT StringConstr_fromCharCode(DispatchEx *dispex, LCID lcid, WORD fla return S_OK; } -static HRESULT StringConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, +static HRESULT StringConstr_value(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { HRESULT hres;