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

jscript: Improved error handling in VBArray functions.

This commit is contained in:
Piotr Caban 2010-10-19 13:52:21 +02:00 committed by Alexandre Julliard
parent 53f2765445
commit 185ef44d00
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/jscript/jscript.h
View File

@ -377,6 +377,12 @@ static inline DOUBLE num_val(const VARIANT *v)
return V_VT(v) == VT_I4 ? V_I4(v) : V_R8(v); return V_VT(v) == VT_I4 ? V_I4(v) : V_R8(v);
} }
static inline void num_set_int(VARIANT *v, INT i)
{
V_VT(v) = VT_I4;
V_I4(v) = i;
}
static inline void num_set_val(VARIANT *v, DOUBLE d) static inline void num_set_val(VARIANT *v, DOUBLE d)
{ {
if(d == (DOUBLE)(INT)d) { if(d == (DOUBLE)(INT)d) {

26
dlls/jscript/vbarray.c
View File

@ -56,7 +56,7 @@ static HRESULT VBArray_dimensions(script_ctx_t *ctx, vdisp_t *vthis, WORD flags,
return throw_type_error(ctx, ei, IDS_NOT_VBARRAY, NULL); return throw_type_error(ctx, ei, IDS_NOT_VBARRAY, NULL);
if(retv) if(retv)
num_set_val(retv, SafeArrayGetDim(vbarray->safearray)); num_set_int(retv, SafeArrayGetDim(vbarray->safearray));
return S_OK; return S_OK;
} }
@ -79,6 +79,9 @@ static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DI
return throw_range_error(ctx, ei, IDS_SUBSCRIPT_OUT_OF_RANGE, NULL); return throw_range_error(ctx, ei, IDS_SUBSCRIPT_OUT_OF_RANGE, NULL);
indexes = heap_alloc(sizeof(int)*size); indexes = heap_alloc(sizeof(int)*size);
if(!indexes)
return E_OUTOFMEMORY;
for(i=0; i<size; i++) { for(i=0; i<size; i++) {
hres = to_int32(ctx, get_arg(dp, i), ei, indexes+i); hres = to_int32(ctx, get_arg(dp, i), ei, indexes+i);
if(FAILED(hres)) { if(FAILED(hres)) {
@ -127,7 +130,7 @@ static HRESULT VBArray_lbound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DIS
return hres; return hres;
if(retv) if(retv)
num_set_val(retv, dim); num_set_int(retv, dim);
return S_OK; return S_OK;
} }
@ -206,7 +209,7 @@ static HRESULT VBArray_ubound(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DIS
return hres; return hres;
if(retv) if(retv)
num_set_val(retv, dim); num_set_int(retv, dim);
return S_OK; return S_OK;
} }
@ -286,8 +289,8 @@ static HRESULT VBArrayConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags
if(arg_cnt(dp)<1 || V_VT((arg = get_arg(dp, 0)))!=(VT_ARRAY|VT_VARIANT)) if(arg_cnt(dp)<1 || V_VT((arg = get_arg(dp, 0)))!=(VT_ARRAY|VT_VARIANT))
return throw_type_error(ctx, ei, IDS_NOT_VBARRAY, NULL); return throw_type_error(ctx, ei, IDS_NOT_VBARRAY, NULL);
VariantCopy(retv, arg); hres = VariantCopy(retv, arg);
break; return hres;
case DISPATCH_CONSTRUCT: case DISPATCH_CONSTRUCT:
if(arg_cnt(dp)<1 || V_VT((arg = get_arg(dp, 0)))!=(VT_ARRAY|VT_VARIANT)) if(arg_cnt(dp)<1 || V_VT((arg = get_arg(dp, 0)))!=(VT_ARRAY|VT_VARIANT))
@ -296,7 +299,12 @@ static HRESULT VBArrayConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags
hres = alloc_vbarray(ctx, NULL, &vbarray); hres = alloc_vbarray(ctx, NULL, &vbarray);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
SafeArrayCopy(V_ARRAY(arg), &vbarray->safearray);
hres = SafeArrayCopy(V_ARRAY(arg), &vbarray->safearray);
if(FAILED(hres)) {
jsdisp_release(&vbarray->dispex);
return hres;
}
var_set_jsdisp(retv, &vbarray->dispex); var_set_jsdisp(retv, &vbarray->dispex);
break; break;
@ -335,7 +343,11 @@ HRESULT create_vbarray(script_ctx_t *ctx, SAFEARRAY *sa, jsdisp_t **ret)
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
SafeArrayCopy(sa, &vbarray->safearray); hres = SafeArrayCopy(sa, &vbarray->safearray);
if(FAILED(hres)) {
jsdisp_release(&vbarray->dispex);
return hres;
}
*ret = &vbarray->dispex; *ret = &vbarray->dispex;
return S_OK; return S_OK;