[PATCH v2 1/2] vbscript: Treat \r as a newline separator.
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/vbscript/lex.c | 6 ++++-- dlls/vbscript/tests/run.c | 12 ++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 98b4cbb..6466423 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -383,13 +383,14 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) static void skip_spaces(parser_ctx_t *ctx) { - while(*ctx->ptr == ' ' || *ctx->ptr == '\t' || *ctx->ptr == '\r') + while(*ctx->ptr == ' ' || *ctx->ptr == '\t') ctx->ptr++; } static int comment_line(parser_ctx_t *ctx) { - ctx->ptr = strchrW(ctx->ptr, '\n'); + static const WCHAR newlineW[] = {'\n','\r'}; + ctx->ptr = strpbrkW(ctx->ptr, newlineW); if(ctx->ptr) ctx->ptr++; else @@ -421,6 +422,7 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) switch(c) { case '\n': + case '\r': ctx->ptr++; return tNL; case '\'': diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 6b57540..191f5a7 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2394,6 +2394,18 @@ static void run_tests(void) ok(FAILED(hres), "script didn't fail\n"); todo_wine CHECK_CALLED(OnScriptError); + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_script_a("' comment\r" + "Sub testsub(arg)\r" + "If arg = 1 Then\r\r" + "Call reportSuccess()\n\n" + "End If\r\n" + "End Sub\n\r" + "Call testsub(1)"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + run_from_res("lang.vbs"); run_from_res("api.vbs"); run_from_res("regexp.vbs"); -- 2.7.4
On 05/22/2018 05:00 PM, Zebediah Figura wrote:
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/vbscript/lex.c | 6 ++++-- dlls/vbscript/tests/run.c | 12 ++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-)
It fails for me: ./../../tools/runtest -q -P wine -T ../../.. -M vbscript.dll -p vbscript_test.exe.so run && touch run.ok 003a:fixme:thread:GetThreadUILanguage : stub, returning default language. 003a:fixme:vbscript:parse_script parser failed around L"<!--" 003a:fixme:vbscript:do_icall L"y" not found 003a:fixme:vbscript:parse_script parser failed around L"\n'\n' This library is free software; you can redistribute it and/or\n' modify it under the terms of the GNU Lesser General Public\n' License as published by the Free Software Foundation; either\n' version 2.1 of the License, or (at your option) any later version.\n'\n' This library is distributed in"... run.c:2184: Test failed: expected global_success_d run.c:2185: Test failed: expected global_success_i run.c:2187: Test failed: parse_script failed: 80004005 003a:fixme:vbscript:parse_script parser failed around L"\n'\n' This library is free software; you can redistribute it and/or\n' modify it under the terms of the GNU Lesser General Public\n' License as published by the Free Software Foundation; either\n' version 2.1 of the License, or (at your option) any later version.\n'\n' This library is distributed in"... run.c:2184: Test failed: expected global_success_d run.c:2185: Test failed: expected global_success_i run.c:2187: Test failed: parse_script failed: 80004005 003a:fixme:vbscript:parse_script parser failed around L"\n'\n' This library is free software; you can redistribute it and/or\n' modify it under the terms of the GNU Lesser General Public\n' License as published by the Free Software Foundation; either\n' version 2.1 of the License, or (at your option) any later version.\n'\n' This library is distributed in"... run.c:2184: Test failed: expected global_success_d run.c:2185: Test failed: expected global_success_i run.c:2187: Test failed: parse_script failed: 80004005 003a:fixme:vbscript:parse_script parser failed around L"\n'\n' This library is free software; you can redistribute it and/or\n' modify it under the terms of the GNU Lesser General Public\n' License as published by the Free Software Foundation; either\n' version 2.1 of the License, or (at your option) any later version.\n'\n' This library is distributed in"... run.c:2184: Test failed: expected global_success_d run.c:2185: Test failed: expected global_success_i run.c:2187: Test failed: parse_script failed: 80004005 003a:fixme:vbscript:show_msgbox failed: 80004005 003a:fixme:vbscript:show_msgbox blocked Thanks, Jacek
participants (2)
-
Jacek Caban -
Zebediah Figura