[PATCH v9 1/1] vbscript: redim without dim

[Francis De Brabandere]

From: Francis De Brabandere

---
 dlls/vbscript/compile.c       |  7 +++++++
 dlls/vbscript/interp.c        | 26 +++++++++++++++++++++++---
 dlls/vbscript/tests/lang.vbs  | 27 +++++++++++++++++++++++++++
 dlls/vbscript/vbscript_defs.h |  1 +
 4 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c
index baddc51d7e4..b70ea6e5f6a 100644
--- a/dlls/vbscript/compile.c
+++ b/dlls/vbscript/compile.c
@@ -1173,6 +1173,13 @@ static HRESULT compile_redim_statement(compile_ctx_t *ctx, redim_statement_t *st
     HRESULT hres;

while(1) {
+        for (function_decl_t *func = ctx->func_decls; func; func = func->next) {
+            if (!wcsicmp(func->name, decl->identifier)) {
+                // compilation error: Name redefined
+                return MAKE_VBSERROR(VBS_COMPILE_ERROR);
+            }
+        }
+
         hres = compile_args(ctx, decl->dims, &arg_cnt);
         if(FAILED(hres))
             return hres;
diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index 937cdaf1c8c..4201408fbca 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -1316,9 +1316,29 @@ static HRESULT interp_redim(exec_ctx_t *ctx)
         return hres;
     }

-    if(ref.type != REF_VAR) {
-        FIXME("got ref.type = %d\n", ref.type);
-        return E_FAIL;
+    switch(ref.type) {
+        case REF_DISP:
+        case REF_OBJ:
+        case REF_CONST:
+            return MAKE_VBSERROR(VBSE_ILLEGAL_ASSIGNMENT);
+
+        case REF_FUNC:
+            // TODO compile errors should be handled by the parser
+            //   compilation error: Name redefined
+            return MAKE_VBSERROR(VBS_COMPILE_ERROR);
+
+        case REF_NONE:
+            ref.type = REF_VAR;
+            hres = add_dynamic_var(ctx, identifier, FALSE, &ref.u.v);
+            // Fall through to REF_VAR case
+
+        case REF_VAR:
+            // all ok
+            break;
+
+        default:
+            FIXME("!!!!!!got ref.type = %d\n", ref.type);
+            return E_FAIL;
     }

v = ref.u.v;
diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs
index 3c6ce656f1c..023af27f939 100644
--- a/dlls/vbscript/tests/lang.vbs
+++ b/dlls/vbscript/tests/lang.vbs
@@ -1701,6 +1701,33 @@ e = err.number
 on error goto 0
 ok e = 9, "e = " & e ' VBSE_OUT_OF_BOUNDS, can only change rightmost dimension

+' Redim without Dim should work, even in explicit mode
+redim toCreateArr(3)
+ok ubound(toCreateArr) = 3, "ubound(toCreateArr) = " & ubound(toCreateArr)
+toCreateArr(3) = 10
+ok toCreateArr(3) = 10, "toCreateArr(3) = " & toCreateArr(3)
+
+on error resume next
+const redimConst = 3
+redim redimConst(3)
+' REF_CONST -> runtime error: Type mismatch: 'redimConst'
+ok err.number = 501, "redim <const> err.number = " & err.number
+err.clear
+redim err(3)
+' REF_DISP -> runtime error: Object doesn't support this property or method
+ok err.number = 501, "redim <err> err.number = " & err.number
+err.clear
+' TODO where should we put this compilation error test?
+' Sub redimSub
+' End Sub
+' redim redimSub(3)
+' ' REF_FUNC -> compilation error: Name redefined
+' todo_wine_ok err.number = -1, "redim <sub> err.number = " & err.number
+' err.clear
+' ' TODO how do we test the REF_OBJ case?
+on error goto 0
+
+
 sub TestReDimFixed
     on error resume next

diff --git a/dlls/vbscript/vbscript_defs.h b/dlls/vbscript/vbscript_defs.h
index 139b71255a0..c32a94c7e85 100644
--- a/dlls/vbscript/vbscript_defs.h
+++ b/dlls/vbscript/vbscript_defs.h
@@ -267,6 +267,7 @@
 #define VBSE_INVALID_DLL_FUNCTION_NAME    453
 #define VBSE_INVALID_TYPELIB_VARIABLE     458
 #define VBSE_SERVER_NOT_FOUND             462
+#define VBSE_ILLEGAL_ASSIGNMENT           501
 #define VBSE_UNQUALIFIED_REFERENCE        505

#define VBS_COMPILE_ERROR                4096