[PATCH v13 0/1] MR10484: vbscript: Return "Invalid for loop control variable" error for member expressions.
Windows VBScript rejects member expressions (e.g. x.y) as For/For Each loop control variables with error 1040. Accept MemberExpression in the parser rules and check for obj_expr to report the proper error instead of a generic syntax error. -- v13: vbscript: Return "Invalid for loop control variable" error for member expressions. https://gitlab.winehq.org/wine/wine/-/merge_requests/10484
From: Francis De Brabandere <francisdb@gmail.com> Windows VBScript rejects member expressions (e.g. x.y) as For/For Each loop control variables with error 1040. Accept MemberExpression in the parser rules and check for obj_expr to report the proper error instead of a generic syntax error. --- dlls/vbscript/parser.y | 21 +++++++++++++-------- dlls/vbscript/tests/run.c | 12 ++++++++++++ dlls/vbscript/vbscript.rc | 1 + dlls/vbscript/vbscript_defs.h | 1 + 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 2e467639582..435728cdf14 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -257,16 +257,21 @@ SimpleStatement | tON tERROR tRESUME tNEXT { $$ = new_onerror_statement(ctx, @$, TRUE); CHECK_ERROR; } | tON tERROR tGOTO '0' { $$ = new_onerror_statement(ctx, @$, FALSE); CHECK_ERROR; } | tCONST ConstDeclList { $$ = new_const_statement(ctx, @$, $2); CHECK_ERROR; } - | tFOR Identifier '=' Expression tTO Expression Step_opt StSep StatementsNl_opt tNEXT - { $$ = new_forto_statement(ctx, @$, $2, $4, $6, $7, $9); CHECK_ERROR; } - | tFOR Identifier '=' Expression error + | tFOR MemberExpression '=' Expression tTO Expression Step_opt StSep StatementsNl_opt tNEXT + { if($2->obj_expr) { ctx->error_loc = @3; + ctx->hres = MAKE_VBSERROR(VBSE_INVALID_FOR_CONTROL); CHECK_ERROR; } + $$ = new_forto_statement(ctx, @$, $2->identifier, $4, $6, $7, $9); + CHECK_ERROR; } + | tFOR MemberExpression '=' Expression error { ctx->hres = MAKE_VBSERROR(VBSE_EXPECTED_TO); YYABORT; } - | tFOR Identifier '=' Expression tTO Expression Step_opt StSep StatementsNl_opt error + | tFOR MemberExpression '=' Expression tTO Expression Step_opt StSep StatementsNl_opt error { ctx->hres = MAKE_VBSERROR(VBSE_EXPECTED_NEXT); YYABORT; } - | tFOR tEACH Identifier tIN Expression StSep StatementsNl_opt tNEXT - { $$ = new_foreach_statement(ctx, @$, $3, $5, $7); } - | tFOR tEACH Identifier error { ctx->hres = MAKE_VBSERROR(VBSE_EXPECTED_IN); YYABORT; } - | tFOR tEACH Identifier tIN Expression StSep StatementsNl_opt error + | tFOR tEACH MemberExpression tIN Expression StSep StatementsNl_opt tNEXT + { if($3->obj_expr) { ctx->error_loc = @4; + ctx->hres = MAKE_VBSERROR(VBSE_INVALID_FOR_CONTROL); CHECK_ERROR; } + $$ = new_foreach_statement(ctx, @$, $3->identifier, $5, $7); } + | tFOR tEACH MemberExpression error { ctx->hres = MAKE_VBSERROR(VBSE_EXPECTED_IN); YYABORT; } + | tFOR tEACH MemberExpression tIN Expression StSep StatementsNl_opt error { ctx->hres = MAKE_VBSERROR(VBSE_EXPECTED_NEXT); YYABORT; } | tSELECT tCASE Expression StSep CaseClausules tEND tSELECT { $$ = new_select_statement(ctx, @$, $3, $5); } diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index f4b4829f902..ef7856d91cf 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -3424,6 +3424,18 @@ static void test_parse_errors(void) "End Class\n", 3, 8, L" Dim Foo", S_OK, 1041 + }, + { + /* Invalid 'for' loop control variable (member expression) - error 1040 */ + L"Dim x\nFor x.y = 1 To 3\nNext\n", + 1, 8, + NULL, S_OK, 1040 + }, + { + /* Invalid 'for each' loop control variable (member expression) - error 1040 */ + L"Dim x\nFor Each x.y In Array(1)\nNext\n", + 1, 13, + NULL, S_OK, 1040 } }; HRESULT hres; diff --git a/dlls/vbscript/vbscript.rc b/dlls/vbscript/vbscript.rc index afb08f4ec56..7837916603c 100644 --- a/dlls/vbscript/vbscript.rc +++ b/dlls/vbscript/vbscript.rc @@ -94,6 +94,7 @@ STRINGTABLE VBSE_INVALID_USE_OF_ME "Invalid use of 'Me' keyword" VBSE_LOOP_WITHOUT_DO "'loop' without 'do'" VBSE_INVALID_EXIT "Invalid 'exit' statement" + VBSE_INVALID_FOR_CONTROL "Invalid 'for' loop control variable" VBSE_NAME_REDEFINED "Name redefined" VBSE_MUST_BE_FIRST_STATEMENT "Must be first statement on the line" VBSE_CANNOT_USE_PARENS_CALLING_SUB "Cannot use parentheses when calling a Sub" diff --git a/dlls/vbscript/vbscript_defs.h b/dlls/vbscript/vbscript_defs.h index 610c4f54b15..d4ebc29d4b8 100644 --- a/dlls/vbscript/vbscript_defs.h +++ b/dlls/vbscript/vbscript_defs.h @@ -305,6 +305,7 @@ #define VBSE_INVALID_USE_OF_ME 1037 #define VBSE_LOOP_WITHOUT_DO 1038 #define VBSE_INVALID_EXIT 1039 +#define VBSE_INVALID_FOR_CONTROL 1040 #define VBSE_NAME_REDEFINED 1041 #define VBSE_MUST_BE_FIRST_STATEMENT 1042 #define VBSE_CANNOT_USE_PARENS_CALLING_SUB 1044 -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10484
Jacek Caban (@jacek) commented about dlls/vbscript/parser.y:
| tON tERROR tRESUME tNEXT { $$ = new_onerror_statement(ctx, @$, TRUE); CHECK_ERROR; } | tON tERROR tGOTO '0' { $$ = new_onerror_statement(ctx, @$, FALSE); CHECK_ERROR; } | tCONST ConstDeclList { $$ = new_const_statement(ctx, @$, $2); CHECK_ERROR; } - | tFOR Identifier '=' Expression tTO Expression Step_opt StSep StatementsNl_opt tNEXT - { $$ = new_forto_statement(ctx, @$, $2, $4, $6, $7, $9); CHECK_ERROR; } - | tFOR Identifier '=' Expression error + | tFOR MemberExpression '=' Expression tTO Expression Step_opt StSep StatementsNl_opt tNEXT + { if($2->obj_expr) { ctx->error_loc = @3; + ctx->hres = MAKE_VBSERROR(VBSE_INVALID_FOR_CONTROL); CHECK_ERROR; } + $$ = new_forto_statement(ctx, @$, $2->identifier, $4, $6, $7, $9);
Please follow the usual C indention here: indent `if` body and start `if` body in a new line. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10484#note_137450
On Thu Apr 23 16:58:21 2026 +0000, Jacek Caban wrote:
Please follow the usual C indention here: indent `if` body and start `if` body in a new line. done
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/10484#note_137484
participants (3)
-
Francis De Brabandere -
Francis De Brabandere (＠francisdb)
-
Jacek Caban (＠jacek)