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

jscript: Code clean up.

Browse Source
This commit is contained in:
Jacek Caban 2009-09-01 13:26:34 +02:00 committed by Alexandre Julliard
parent c444a4907e
commit 81fc9ade37
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/jscript/array.c
View File

@ -315,7 +315,7 @@ static HRESULT Array_join(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS
if(arg_cnt(dp)) { if(arg_cnt(dp)) {
BSTR sep; BSTR sep;
hres = to_string(dispex->ctx, dp->rgvarg + dp->cArgs-1, ei, &sep); hres = to_string(dispex->ctx, get_arg(dp,0), ei, &sep);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;

5
dlls/jscript/function.c
View File

@ -70,12 +70,11 @@ static HRESULT init_parameters(DispatchEx *var_disp, FunctionInstance *function,
HRESULT hres; HRESULT hres;
V_VT(&var_empty) = VT_EMPTY; V_VT(&var_empty) = VT_EMPTY;
cargs = dp->cArgs - dp->cNamedArgs; cargs = arg_cnt(dp);
for(param = function->parameters; param; param = param->next) { for(param = function->parameters; param; param = param->next) {
hres = jsdisp_propput_name(var_disp, param->identifier, lcid, hres = jsdisp_propput_name(var_disp, param->identifier, lcid,
i < cargs ? dp->rgvarg + dp->cArgs-1 - i : &var_empty, i < cargs ? get_arg(dp,i) : &var_empty, ei, caller);
ei, caller);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;

12
dlls/jscript/string.c
View File

@ -1066,7 +1066,7 @@ static HRESULT String_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM
} }
if(arg_cnt(dp)) { if(arg_cnt(dp)) {
hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-1, ei, &v); hres = to_integer(dispex->ctx, get_arg(dp,0), ei, &v);
if(FAILED(hres)) { if(FAILED(hres)) {
SysFreeString(val_str); SysFreeString(val_str);
return hres; return hres;
@ -1089,7 +1089,7 @@ static HRESULT String_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM
} }
if(arg_cnt(dp) >= 2) { if(arg_cnt(dp) >= 2) {
hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-2, ei, &v); hres = to_integer(dispex->ctx, get_arg(dp,1), ei, &v);
if(FAILED(hres)) { if(FAILED(hres)) {
SysFreeString(val_str); SysFreeString(val_str);
return hres; return hres;
@ -1325,7 +1325,7 @@ static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPP
} }
if(arg_cnt(dp) >= 1) { if(arg_cnt(dp) >= 1) {
hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-1, ei, &v); hres = to_integer(dispex->ctx, get_arg(dp,0), ei, &v);
if(FAILED(hres)) { if(FAILED(hres)) {
SysFreeString(val_str); SysFreeString(val_str);
return hres; return hres;
@ -1343,7 +1343,7 @@ static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPP
} }
if(arg_cnt(dp) >= 2) { if(arg_cnt(dp) >= 2) {
hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-2, ei, &v); hres = to_integer(dispex->ctx, get_arg(dp,1), ei, &v);
if(FAILED(hres)) { if(FAILED(hres)) {
SysFreeString(val_str); SysFreeString(val_str);
return hres; return hres;
@ -1412,7 +1412,7 @@ static HRESULT String_substr(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA
} }
if(arg_cnt(dp) >= 1) { if(arg_cnt(dp) >= 1) {
hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-1, ei, &v); hres = to_integer(dispex->ctx, get_arg(dp,0), ei, &v);
if(FAILED(hres)) { if(FAILED(hres)) {
SysFreeString(val_str); SysFreeString(val_str);
return hres; return hres;
@ -1430,7 +1430,7 @@ static HRESULT String_substr(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA
} }
if(arg_cnt(dp) >= 2) { if(arg_cnt(dp) >= 2) {
hres = to_integer(dispex->ctx, dp->rgvarg + dp->cArgs-2, ei, &v); hres = to_integer(dispex->ctx, get_arg(dp,1), ei, &v);
if(FAILED(hres)) { if(FAILED(hres)) {
SysFreeString(val_str); SysFreeString(val_str);
return hres; return hres;