From 1532037bcd2ee318a7f0e90aa55c85cf5cd29a1d Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Wed, 20 Jun 2012 11:18:59 +0200 Subject: [PATCH] jscript: Use num_set_int where possible. --- dlls/jscript/engine.c | 6 ++---- dlls/jscript/error.c | 3 +-- dlls/jscript/function.c | 9 +++------ dlls/jscript/global.c | 18 ++++++------------ dlls/jscript/number.c | 6 ++---- dlls/jscript/regexp.c | 13 +++++-------- dlls/jscript/string.c | 42 ++++++++++++++--------------------------- 7 files changed, 33 insertions(+), 64 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0b97fddd86..8117cb5dc1 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2030,16 +2030,14 @@ static HRESULT equal_values(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jse if(V_VT(rval) == VT_BOOL) { VARIANT v; - V_VT(&v) = VT_I4; - V_I4(&v) = V_BOOL(rval) ? 1 : 0; + num_set_int(&v, V_BOOL(rval) ? 1 : 0); return equal_values(ctx, lval, &v, ei, ret); } if(V_VT(lval) == VT_BOOL) { VARIANT v; - V_VT(&v) = VT_I4; - V_I4(&v) = V_BOOL(lval) ? 1 : 0; + num_set_int(&v, V_BOOL(lval) ? 1 : 0); return equal_values(ctx, &v, rval, ei, ret); } diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 00560dbfe7..31117149b4 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -199,8 +199,7 @@ static HRESULT create_error(script_ctx_t *ctx, jsdisp_t *constr, if(FAILED(hres)) return hres; - V_VT(&v) = VT_I4; - V_I4(&v) = number; + num_set_int(&v, number); hres = jsdisp_propput_name(err, numberW, &v, NULL/*FIXME*/); if(FAILED(hres)) { jsdisp_release(err); diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 31d3be3caa..cfd57a7440 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -133,8 +133,7 @@ static HRESULT create_arguments(script_ctx_t *ctx, IDispatch *calee, DISPPARAMS } if(SUCCEEDED(hres)) { - V_VT(&var) = VT_I4; - V_I4(&var) = arg_cnt(dp); + num_set_int(&var, arg_cnt(dp)); hres = jsdisp_propput_name(args, lengthW, &var, ei); if(SUCCEEDED(hres)) { @@ -315,8 +314,7 @@ static HRESULT Function_length(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D switch(flags) { case DISPATCH_PROPERTYGET: - V_VT(retv) = VT_I4; - V_I4(retv) = This->length; + num_set_int(retv, This->length); break; default: FIXME("unimplemented flags %x\n", flags); @@ -635,8 +633,7 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, if(builtin_info) { VARIANT var; - V_VT(&var) = VT_I4; - V_I4(&var) = function->length; + num_set_int(&var, function->length); hres = jsdisp_propput_const(&function->dispex, lengthW, &var); } diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 3732b65f90..c01b082203 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -745,10 +745,8 @@ static HRESULT JSGlobal_ScriptEngineMajorVersion(script_ctx_t *ctx, vdisp_t *jst { TRACE("\n"); - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = JSCRIPT_MAJOR_VERSION; - } + if(retv) + num_set_int(retv, JSCRIPT_MAJOR_VERSION); return S_OK; } @@ -757,10 +755,8 @@ static HRESULT JSGlobal_ScriptEngineMinorVersion(script_ctx_t *ctx, vdisp_t *jst { TRACE("\n"); - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = JSCRIPT_MINOR_VERSION; - } + if(retv) + num_set_int(retv, JSCRIPT_MINOR_VERSION); return S_OK; } @@ -769,10 +765,8 @@ static HRESULT JSGlobal_ScriptEngineBuildVersion(script_ctx_t *ctx, vdisp_t *jst { TRACE("\n"); - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = JSCRIPT_BUILD_VERSION; - } + if(retv) + num_set_int(retv, JSCRIPT_BUILD_VERSION); return S_OK; } diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 8f6eeabfac..3d2283aec3 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -554,10 +554,8 @@ static HRESULT NumberConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags switch(flags) { case INVOKE_FUNC: if(!arg_cnt(dp)) { - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = 0; - } + if(retv) + num_set_int(retv, 0); return S_OK; } diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index f5a987e6b3..399635ec8c 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3606,13 +3606,12 @@ static HRESULT create_match_array(script_ctx_t *ctx, BSTR input, const match_res } while(SUCCEEDED(hres)) { - V_VT(&var) = VT_I4; - V_I4(&var) = result->str-input; + num_set_int(&var, result->str-input); hres = jsdisp_propput_name(array, indexW, &var, ei); if(FAILED(hres)) break; - V_I4(&var) = result->str-input+result->len; + num_set_int(&var, result->str-input+result->len); hres = jsdisp_propput_name(array, lastIndexW, &var, ei); if(FAILED(hres)) break; @@ -3862,8 +3861,7 @@ HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD flags, return E_FAIL; } - V_VT(®exp->last_index_var) = VT_I4; - V_I4(®exp->last_index_var) = 0; + num_set_int(®exp->last_index_var, 0); *ret = ®exp->dispex; return S_OK; @@ -3990,13 +3988,12 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, BSTR str, } while(SUCCEEDED(hres)) { - V_VT(&var) = VT_I4; - V_I4(&var) = match_result[match_cnt-1].str-str; + num_set_int(&var, match_result[match_cnt-1].str-str); hres = jsdisp_propput_name(array, indexW, &var, ei); if(FAILED(hres)) break; - V_I4(&var) = match_result[match_cnt-1].str-str+match_result[match_cnt-1].len; + num_set_int(&var, match_result[match_cnt-1].str-str+match_result[match_cnt-1].len); hres = jsdisp_propput_name(array, lastIndexW, &var, ei); if(FAILED(hres)) break; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index d1142ff1c2..2adc605441 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -111,8 +111,7 @@ static HRESULT String_length(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS case DISPATCH_PROPERTYGET: { StringInstance *string = string_from_vdisp(jsthis); - V_VT(retv) = VT_I4; - V_I4(retv) = string->length; + num_set_int(retv, string->length); break; } default: @@ -368,10 +367,8 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, idx = d; } - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = str[idx]; - } + if(retv) + num_set_int(retv, str[idx]); SysFreeString(val_str); return S_OK; @@ -476,10 +473,8 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI return hres; if(!arg_cnt(dp)) { - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = -1; - } + if(retv) + num_set_int(retv, -1); SysFreeString(val_str); return S_OK; } @@ -513,10 +508,8 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI if(FAILED(hres)) return hres; - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = ret; - } + if(retv) + num_set_int(retv, ret); return S_OK; } @@ -544,10 +537,8 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return hres; if(!arg_cnt(dp)) { - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = -1; - } + if(retv) + num_set_int(retv, -1); SysFreeString(val_str); return S_OK; } @@ -586,10 +577,8 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(FAILED(hres)) return hres; - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = ret; - } + if(retv) + num_set_int(retv, ret); return S_OK; } @@ -729,8 +718,7 @@ static HRESULT rep_call(script_ctx_t *ctx, jsdisp_t *func, const WCHAR *str, mat if(SUCCEEDED(hres)) { arg = get_arg(&dp,parens_cnt+1); - V_VT(arg) = VT_I4; - V_I4(arg) = match->str - str; + num_set_int(arg, match->str - str); arg = get_arg(&dp,parens_cnt+2); V_VT(arg) = VT_BSTR; @@ -1046,10 +1034,8 @@ static HRESULT String_search(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS if(FAILED(hres)) return hres; - if(retv) { - V_VT(retv) = VT_I4; - V_I4(retv) = hres == S_OK ? match.str-str : -1; - } + if(retv) + num_set_int(retv, hres == S_OK ? match.str-str : -1); return S_OK; } -- 2.32.0.93.g670b81a890