[PATCH v2 0/1] MR10483: vbscript: Return "Illegal assignment" error for Const and function assignment.

[Francis De Brabandere (＠francisdb)]

Assigning to a Const variable or a function/sub name should return
error 501 (Illegal assignment), not 445 (Object doesn't support this
action). Change the REF_CONST and REF_FUNC cases in assign_ident()
to use MAKE_VBSERROR(VBSE_ILLEGAL_ASSIGNMENT).

--
  v2: vbscript: Return "Illegal assignment" error for Const and function assignment.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10483

[PATCH v2 1/1] vbscript: Return "Illegal assignment" error for Const and function assignment. Assigning to a Const variable or a function/sub name should return error 501 (Illegal assignment), not 445 (Object doesn't support this action). Change the REF_CONST and REF_FUNC cases in assign_ident() to use MAKE_VBSERROR(VBSE_ILLEGAL_ASSIGNMENT).

[Francis De Brabandere]

From: Francis De Brabandere <[e-mail]>

---
 dlls/vbscript/interp.c        |  8 ++++----
 dlls/vbscript/tests/lang.vbs  | 31 +++++++++++++++++++++++++++++++
 dlls/vbscript/vbscript.rc     |  1 +
 dlls/vbscript/vbscript_defs.h |  1 +
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index 2a73a7fb51a..309d14c6ed9 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -943,14 +943,14 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, WORD flags, DISPPARAMS *
         hres = disp_propput(ctx->script, ref.u.d.disp, ref.u.d.id, flags, dp);
         break;
     case REF_FUNC:
-        FIXME("functions not implemented\n");
-        return E_NOTIMPL;
+        WARN("assign to function %s\n", debugstr_w(name));
+        return MAKE_VBSERROR(VBSE_ILLEGAL_ASSIGNMENT);
     case REF_OBJ:
         FIXME("REF_OBJ\n");
         return E_NOTIMPL;
     case REF_CONST:
-        FIXME("REF_CONST\n");
-        return E_NOTIMPL;
+        WARN("assign to const %s\n", debugstr_w(name));
+        return MAKE_VBSERROR(VBSE_ILLEGAL_ASSIGNMENT);
     case REF_NONE:
         if(ctx->func->code_ctx->option_explicit) {
             FIXME("throw exception\n");
diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs
index ed483602176..43fc3808ca1 100644
--- a/dlls/vbscript/tests/lang.vbs
+++ b/dlls/vbscript/tests/lang.vbs
@@ -1188,6 +1188,37 @@ Sub TestDimVsConst
 End Sub
 Call TestDimVsConst
 
+Sub TestIllegalAssignment
+    on error resume next
+
+    ' Assign to Const should give error 501
+    err.clear
+    c10 = 99
+    Call ok(err.number = 501, "assign to const: err.number = " & err.number)
+    Call ok(c10 = 10, "c10 = " & c10)
+
+    ' Set on Const should give error 501
+    err.clear
+    set c10 = Nothing
+    Call ok(err.number = 501, "set const: err.number = " & err.number)
+
+    ' Assign to Sub name should give error 501
+    err.clear
+    TestIllegalAssignment = 10
+    Call ok(err.number = 501, "assign to sub name: err.number = " & err.number)
+End Sub
+Call TestIllegalAssignment
+
+' Assign to function name from outside should give error 501
+Function IllegalAssignTarget
+    IllegalAssignTarget = 0
+End Function
+on error resume next
+err.clear
+IllegalAssignTarget = 10
+Call ok(err.number = 501, "assign to func name: err.number = " & err.number)
+on error goto 0
+
 Function TestFuncMultiArgs(a,b,c,d,e)
     Call ok(a=1, "a = " & a)
     Call ok(b=2, "b = " & b)
diff --git a/dlls/vbscript/vbscript.rc b/dlls/vbscript/vbscript.rc
index 770052b641f..5e3adddc789 100644
--- a/dlls/vbscript/vbscript.rc
+++ b/dlls/vbscript/vbscript.rc
@@ -60,6 +60,7 @@ STRINGTABLE
     VBSE_INVALID_TYPELIB_VARIABLE      "Variable uses an Automation type not supported in VBScript"
     VBSE_SERVER_NOT_FOUND              "The remote server machine does not exist or is unavailable"
     VBSE_VARIABLE_UNDEFINED            "Variable is undefined"
+    VBSE_ILLEGAL_ASSIGNMENT            "Illegal assignment"
     VBSE_UNQUALIFIED_REFERENCE         "Invalid or unqualified reference"
     VBSE_SYNTAX_ERROR                  "Syntax error"
     VBSE_EXPECTED_LPAREN               "Expected '('"
diff --git a/dlls/vbscript/vbscript_defs.h b/dlls/vbscript/vbscript_defs.h
index 4654798b8a1..0dc7b677517 100644
--- a/dlls/vbscript/vbscript_defs.h
+++ b/dlls/vbscript/vbscript_defs.h
@@ -271,6 +271,7 @@
 #define VBSE_INVALID_TYPELIB_VARIABLE     458
 #define VBSE_SERVER_NOT_FOUND             462
 #define VBSE_VARIABLE_UNDEFINED           500
+#define VBSE_ILLEGAL_ASSIGNMENT           501
 #define VBSE_UNQUALIFIED_REFERENCE        505
 #define VBSE_SYNTAX_ERROR                1002
 #define VBSE_EXPECTED_LPAREN             1005
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10483

[PATCH v2 0/1] MR10483: vbscript: Return "Illegal assignment" error for Const and function assignment. - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10483