system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-06 11:50:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vbscript: Added support for getting array elements.

Browse source
This commit is contained in:
Jacek Caban 2013-11-13 16:29:39 +01:00 committed by Alexandre Julliard
parent 853c6c4eea
commit 79c55e1255
3 changed files with 73 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/vbscript/global.c
View file

@ -150,7 +150,7 @@ static inline HRESULT return_date(VARIANT *res, double date)
return S_OK;
}
static HRESULT to_int(VARIANT *v, int *ret)
HRESULT to_int(VARIANT *v, int *ret)
{
switch(V_VT(v)) {
case VT_I2:

76
dlls/vbscript/interp.c
View file

@ -478,6 +478,49 @@ static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, BOOL is_propput, DI
}
}
static HRESULT array_access(exec_ctx_t *ctx, SAFEARRAY *array, DISPPARAMS *dp, VARIANT **ret)
{
unsigned cell_off = 0, dim_size = 1, i;
unsigned argc = arg_cnt(dp);
VARIANT *data;
LONG idx;
HRESULT hres;
if(!array) {
FIXME("NULL array\n");
return E_FAIL;
}
if(array->cDims != argc) {
FIXME("argc %d does not match cDims %d\n", dp->cArgs, array->cDims);
return E_FAIL;
}
for(i=0; i < argc; i++) {
hres = to_int(get_arg(dp, i), &idx);
if(FAILED(hres))
return hres;
idx -= array->rgsabound[i].lLbound;
if(idx >= array->rgsabound[i].cElements) {
FIXME("out of bound element %d in dim %d of size %d\n", idx, i+1, array->rgsabound[i].cElements);
return E_FAIL;
}
cell_off += idx*dim_size;
dim_size *= array->rgsabound[i].cElements;
}
hres = SafeArrayAccessData(array, (void**)&data);
if(FAILED(hres))
return hres;
*ret = data+cell_off;
SafeArrayUnaccessData(array);
return S_OK;
}
static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res)
{
BSTR identifier = ctx->instr->arg1.bstr;
@ -490,30 +533,51 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res)
if(FAILED(hres))
return hres;
vbstack_to_dp(ctx, arg_cnt, FALSE, &dp);
switch(ref.type) {
case REF_VAR:
case REF_CONST:
case REF_CONST: {
VARIANT *v;
if(!res) {
FIXME("REF_VAR no res\n");
return E_NOTIMPL;
}
v = V_VT(ref.u.v) == (VT_VARIANT|VT_BYREF) ? V_VARIANTREF(ref.u.v) : ref.u.v;
if(arg_cnt) {
FIXME("arguments not implemented\n");
return E_NOTIMPL;
SAFEARRAY *array;
switch(V_VT(v)) {
case VT_ARRAY|VT_BYREF|VT_VARIANT:
array = *V_ARRAYREF(ref.u.v);
break;
case VT_ARRAY|VT_VARIANT:
array = V_ARRAY(ref.u.v);
break;
default:
FIXME("arguments not implemented\n");
return E_NOTIMPL;
}
vbstack_to_dp(ctx, arg_cnt, FALSE, &dp);
hres = array_access(ctx, array, &dp, &v);
if(FAILED(hres))
return hres;
}
V_VT(res) = VT_BYREF|VT_VARIANT;
V_BYREF(res) = V_VT(ref.u.v) == (VT_VARIANT|VT_BYREF) ? V_VARIANTREF(ref.u.v) : ref.u.v;
V_BYREF(res) = v;
break;
}
case REF_DISP:
vbstack_to_dp(ctx, arg_cnt, FALSE, &dp);
hres = disp_call(ctx->script, ref.u.d.disp, ref.u.d.id, &dp, res);
if(FAILED(hres))
return hres;
break;
case REF_FUNC:
vbstack_to_dp(ctx, arg_cnt, FALSE, &dp);
hres = exec_script(ctx->script, ref.u.f, NULL, &dp, res);
if(FAILED(hres))
return hres;

2
dlls/vbscript/vbscript.h
View file

@ -142,6 +142,8 @@ void collect_objects(script_ctx_t*) DECLSPEC_HIDDEN;
HRESULT create_procedure_disp(script_ctx_t*,vbscode_t*,IDispatch**) DECLSPEC_HIDDEN;
HRESULT create_script_disp(script_ctx_t*,ScriptDisp**) DECLSPEC_HIDDEN;
HRESULT to_int(VARIANT*,int*) DECLSPEC_HIDDEN;
static inline unsigned arg_cnt(const DISPPARAMS *dp)
{
return dp->cArgs - dp->cNamedArgs;