Module: wine Branch: master Commit: 5cb1631fe221e981d68d7c1b1555c67f1cf6fd28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cb1631fe221e981d68d7c1b1...
Author: Jacek Caban jacek@codeweavers.com Date: Fri Nov 1 17:51:11 2019 +0100
vbscript: Add interpreter support for redim statement.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/vbscript/compile.c | 20 +++++++++++++++ dlls/vbscript/interp.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 86 insertions(+)
diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 07279794c6..90b0cf5342 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1122,6 +1122,23 @@ static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) return S_OK; }
+static HRESULT compile_redim_statement(compile_ctx_t *ctx, redim_statement_t *stat) +{ + unsigned arg_cnt; + HRESULT hres; + + if(stat->preserve) { + FIXME("Preserving redim not supported\n"); + return E_NOTIMPL; + } + + hres = compile_args(ctx, stat->dims, &arg_cnt); + if(FAILED(hres)) + return hres; + + return push_instr_bstr_uint(ctx, OP_redim, stat->identifier, arg_cnt); +} + static HRESULT compile_const_statement(compile_ctx_t *ctx, const_statement_t *stat) { const_decl_t *decl, *next_decl = stat->decls; @@ -1344,6 +1361,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_ctx_t *stat_ctx, case STAT_ONERROR: hres = compile_onerror_statement(ctx, (onerror_statement_t*)stat); break; + case STAT_REDIM: + hres = compile_redim_statement(ctx, (redim_statement_t*)stat); + break; case STAT_SELECT: hres = compile_select_statement(ctx, (select_statement_t*)stat); break; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 97360f9b22..8568b7098c 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1145,6 +1145,71 @@ static HRESULT interp_dim(exec_ctx_t *ctx) return S_OK; }
+static HRESULT array_bounds_from_stack(exec_ctx_t *ctx, unsigned dim_cnt, SAFEARRAYBOUND **ret) +{ + SAFEARRAYBOUND *bounds; + unsigned i; + int dim; + HRESULT hres; + + if(!(bounds = heap_alloc(dim_cnt * sizeof(*bounds)))) + return E_OUTOFMEMORY; + + for(i = 0; i < dim_cnt; i++) { + hres = to_int(stack_top(ctx, dim_cnt - i - 1), &dim); + if(FAILED(hres)) { + heap_free(bounds); + return hres; + } + + bounds[i].cElements = dim + 1; + bounds[i].lLbound = 0; + } + + stack_popn(ctx, dim_cnt); + *ret = bounds; + return S_OK; +} + +static HRESULT interp_redim(exec_ctx_t *ctx) +{ + BSTR identifier = ctx->instr->arg1.bstr; + const unsigned dim_cnt = ctx->instr->arg2.uint; + SAFEARRAYBOUND *bounds; + SAFEARRAY *array; + ref_t ref; + HRESULT hres; + + TRACE("%s %u\n", debugstr_w(identifier), dim_cnt); + + hres = lookup_identifier(ctx, identifier, VBDISP_LET, &ref); + if(FAILED(hres)) { + FIXME("lookup %s failed: %08x\n", debugstr_w(identifier), hres); + return hres; + } + + if(ref.type != REF_VAR) { + FIXME("got ref.type = %d\n", ref.type); + return E_FAIL; + } + + hres = array_bounds_from_stack(ctx, dim_cnt, &bounds); + if(FAILED(hres)) + return hres; + + array = SafeArrayCreate(VT_VARIANT, dim_cnt, bounds); + heap_free(bounds); + if(!array) + return E_OUTOFMEMORY; + + /* FIXME: We should check if we're not modifying an existing static array here */ + + VariantClear(ref.u.v); + V_VT(ref.u.v) = VT_ARRAY|VT_VARIANT; + V_ARRAY(ref.u.v) = array; + return S_OK; +} + static HRESULT interp_step(exec_ctx_t *ctx) { const BSTR ident = ctx->instr->arg2.bstr; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index fefed63edb..2d9647eb2e 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -263,6 +263,7 @@ typedef enum { X(null, 1, 0, 0) \ X(or, 1, 0, 0) \ X(pop, 1, ARG_UINT, 0) \ + X(redim, 1, ARG_BSTR, ARG_UINT) \ X(ret, 0, 0, 0) \ X(retval, 1, 0, 0) \ X(set_ident, 1, ARG_BSTR, ARG_UINT) \