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

vbscript: Add LBound function implementation. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2019-10-23 15:11:14 +02:00 committed by Alexandre Julliard
parent 9e3c806e53
commit 872d33f29c
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dlls/vbscript/global.c
View File

@ -1082,8 +1082,40 @@ static HRESULT Global_Timer(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt,
static HRESULT Global_LBound(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) static HRESULT Global_LBound(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
{ {
FIXME("\n"); SAFEARRAY *sa;
HRESULT hres;
LONG ubound;
int dim;
assert(args_cnt == 1 || args_cnt == 2);
TRACE("%s %s\n", debugstr_variant(arg), args_cnt == 2 ? debugstr_variant(arg + 1) : "1");
switch(V_VT(arg)) {
case VT_VARIANT|VT_ARRAY:
sa = V_ARRAY(arg);
break;
case VT_VARIANT|VT_ARRAY|VT_BYREF:
sa = *V_ARRAYREF(arg);
break;
default:
FIXME("arg %s not supported\n", debugstr_variant(arg));
return E_NOTIMPL; return E_NOTIMPL;
}
if(args_cnt == 2) {
hres = to_int(arg + 1, &dim);
if(FAILED(hres))
return hres;
}else {
dim = 1;
}
hres = SafeArrayGetLBound(sa, dim, &ubound);
if(FAILED(hres))
return hres;
return return_int(res, ubound);
} }
static HRESULT Global_UBound(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) static HRESULT Global_UBound(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
@ -2597,7 +2629,7 @@ static const builtin_prop_t global_props[] = {
{L"IsNumeric", Global_IsNumeric, 0, 1}, {L"IsNumeric", Global_IsNumeric, 0, 1},
{L"IsObject", Global_IsObject, 0, 1}, {L"IsObject", Global_IsObject, 0, 1},
{L"Join", Global_Join, 0, 1, 2}, {L"Join", Global_Join, 0, 1, 2},
{L"LBound", Global_LBound, 0, 1}, {L"LBound", Global_LBound, 0, 1, 2},
{L"LCase", Global_LCase, 0, 1}, {L"LCase", Global_LCase, 0, 1},
{L"Left", Global_Left, 0, 2}, {L"Left", Global_Left, 0, 2},
{L"LeftB", Global_LeftB, 0, 2}, {L"LeftB", Global_LeftB, 0, 2},

3
dlls/vbscript/tests/api.vbs
View File

@ -247,6 +247,9 @@ Dim arr2(2, 4)
Call ok(UBound(arr2) = 2, "UBound(x) = " & UBound(x)) Call ok(UBound(arr2) = 2, "UBound(x) = " & UBound(x))
Call ok(UBound(arr2, 1) = 2, "UBound(x) = " & UBound(x)) Call ok(UBound(arr2, 1) = 2, "UBound(x) = " & UBound(x))
Call ok(UBound(arr2, 2) = 4, "UBound(x) = " & UBound(x)) Call ok(UBound(arr2, 2) = 4, "UBound(x) = " & UBound(x))
Call ok(Lbound(arr2) = 0, "Lbound(x) = " & Lbound(x))
Call ok(Lbound(arr2, 1) = 0, "Lbound(x) = " & Lbound(x))
Call ok(Lbound(arr2, 2) = 0, "Lbound(x) = " & Lbound(x))
sub testUBoundError() sub testUBoundError()
on error resume next on error resume next