marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vbscript: Handle carriage return in more places. 

This fixes a regression introduced by 5800c9ed23.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46772
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 1bd7dbfbc4)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
oldstable
Zebediah Figura 2019-03-04 17:14:55 -06:00 committed by Michael Stefaniuc
parent ddec4bd912
commit 2e94bb648f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/vbscript/lex.c
View File

@ -225,7 +225,7 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret)
int len = 0;
while(ctx->ptr < ctx->end) {
if(*ctx->ptr == '\n') {
if(*ctx->ptr == '\n' || *ctx->ptr == '\r') {
FIXME("newline inside string literal\n");
return 0;
}
@ -497,11 +497,14 @@ int parser_lex(void *lval, parser_ctx_t *ctx)
ret = parse_next_token(lval, ctx);
if(ret == '_') {
skip_spaces(ctx);
if(*ctx->ptr != '\n') {
if(*ctx->ptr != '\n' && *ctx->ptr != '\r') {
FIXME("'_' not followed by newline\n");
return 0;
}
ctx->ptr++;
if(*ctx->ptr == '\r')
ctx->ptr++;
if(*ctx->ptr == '\n')
ctx->ptr++;
continue;
}
if(ret != tNL || ctx->last_token != tNL)

3
dlls/vbscript/tests/run.c
View File

@ -2476,6 +2476,9 @@ static void run_tests(void)
SET_EXPECT(global_success_d);
SET_EXPECT(global_success_i);
parse_script_a("' comment\r"
"x = _\r3\r"
"x = _\n3\r"
"x = _\r\n3\r"
"Sub testsub(arg)\r"
"If arg = 1 Then\r\r"
"Call reportSuccess()\n\n"