jscript: Added VBArray.dimensions() implementation.

This commit is contained in:
Piotr Caban 2010-10-18 18:47:46 +02:00 committed by Alexandre Julliard
parent 2aa7e3c614
commit 2f4607887f
2 changed files with 12 additions and 2 deletions

View File

@ -2253,6 +2253,7 @@ ok(String.length == 1, "String.length = " + String.length);
var tmp = new VBArray(createArray()); var tmp = new VBArray(createArray());
tmp = new VBArray(VBArray(createArray())); tmp = new VBArray(VBArray(createArray()));
ok(tmp.dimensions() == 2, "tmp.dimensions() = " + tmp.dimensions());
ok(tmp.lbound() == 0, "tmp.lbound() = " + tmp.lbound()); ok(tmp.lbound() == 0, "tmp.lbound() = " + tmp.lbound());
ok(tmp.lbound(1) == 0, "tmp.lbound(1) = " + tmp.lbound(1)); ok(tmp.lbound(1) == 0, "tmp.lbound(1) = " + tmp.lbound(1));
ok(tmp.lbound(2, 1) == 2, "tmp.lbound(2, 1) = " + tmp.lbound(2, 1)); ok(tmp.lbound(2, 1) == 2, "tmp.lbound(2, 1) = " + tmp.lbound(2, 1));

View File

@ -47,8 +47,17 @@ static inline VBArrayInstance *vbarray_this(vdisp_t *jsthis)
static HRESULT VBArray_dimensions(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, static HRESULT VBArray_dimensions(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp,
VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller)
{ {
FIXME("\n"); VBArrayInstance *vbarray;
return E_NOTIMPL;
TRACE("\n");
vbarray = vbarray_this(vthis);
if(!vbarray)
return throw_type_error(ctx, ei, IDS_NOT_VBARRAY, NULL);
if(retv)
num_set_val(retv, SafeArrayGetDim(vbarray->safearray));
return S_OK;
} }
static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, static HRESULT VBArray_getItem(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp,