vbscript: Support arrays in TypeName.

Signed-off-by: Robert Wilhelm <robert.wilhelm@gmx.net> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

vbscript: Support arrays in TypeName.
769dd6ae · Robert Wilhelm · Alexandre Julliard · b72d8118 · 769dd6ae · 769dd6ae
Commit 769dd6ae authored Aug 24, 2020 by Robert Wilhelm Committed by Alexandre Julliard Aug 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

global.c dlls/vbscript/global.c +3 -0

api.vbs dlls/vbscript/tests/api.vbs +2 -0

No files found.
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -2203,6 +2203,9 @@ static HRESULT Global_TypeName(BuiltinDisp *This, VARIANT *arg, unsigned args_cn
    assert(args_cnt == 1);
+    if (V_ISARRAY(arg))
+        return return_string(res, L"Variant()");
    switch(V_VT(arg)) {
        case VT_UI1:
            return return_string(res, ByteW);

--- a/dlls/vbscript/tests/api.vbs
+++ b/dlls/vbscript/tests/api.vbs
@@ -1380,6 +1380,8 @@ Call ok(TypeName(CStr(0.5)) = "String", "TypeName(CStr(0.5)) = " & TypeName(CStr
 Call ok(getVT(TypeName(CStr(0.5))) = "VT_BSTR", "getVT(TypeName(CStr(0.5))) = " & getVT(TypeName(CStr(0.5))))
 Call ok(TypeName(True) = "Boolean", "TypeName(True) = " & TypeName(True))
 Call ok(getVT(TypeName(True)) = "VT_BSTR", "getVT(TypeName(True)) = " & getVT(TypeName(True)))
+Call ok(TypeName(arr) = "Variant()", "TypeName(arr) = " & TypeName(arr))
+Call ok(getVT(TypeName(arr)) = "VT_BSTR", "getVT(TypeName(arr)) = " & getVT(TypeName(arr)))
 Call ok(VarType(Empty) = vbEmpty, "VarType(Empty) = " & VarType(Empty))
 Call ok(getVT(VarType(Empty)) = "VT_I2", "getVT(VarType(Empty)) = " & getVT(VarType(Empty)))