January 2020 - Wine-commits

Jacek Caban : vbscript: Alloc vbscode_t before parsing the script.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: 70cd4153c558fbfba9ddb86a591872ce55d4184e URL: https://source.winehq.org/git/wine.git/?a=commit;h=70cd4153c558fbfba9ddb86a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 22 23:27:09 2020 +0100 vbscript: Alloc vbscode_t before parsing the script. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index c76ba73bd8..4a1f1a5c6a 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1851,16 +1851,24 @@ void release_vbscode(vbscode_t *code) static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) { vbscode_t *ret; + size_t len; + + len = source ? lstrlenW(source) : 0; + if(len > INT32_MAX) + return NULL; ret = heap_alloc_zero(sizeof(*ret)); if(!ret) return NULL; - ret->source = heap_strdupW(source); + ret->source = heap_alloc((len + 1) * sizeof(WCHAR)); if(!ret->source) { heap_free(ret); return NULL; } + if(len) + memcpy(ret->source, source, len * sizeof(WCHAR)); + ret->source[len] = 0; ret->instrs = heap_alloc(32*sizeof(instr_t)); if(!ret->instrs) { @@ -1872,8 +1880,6 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ctx->instr_size = 32; heap_pool_init(&ret->heap); - ret->option_explicit = ctx->parser.option_explicit; - ret->main_code.type = FUNC_GLOBAL; ret->main_code.code_ctx = ret; ret->ref = 1; @@ -1899,15 +1905,16 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli vbscode_t *code; HRESULT hres; - if (!src) src = L""; - - hres = parse_script(&ctx.parser, src, delimiter, flags); - if(FAILED(hres)) - return compile_error(script, hres); - code = ctx.code = alloc_vbscode(&ctx, src); if(!ctx.code) - return compile_error(script, E_OUTOFMEMORY); + return E_OUTOFMEMORY; + + hres = parse_script(&ctx.parser, code->source, delimiter, flags); + if(FAILED(hres)) { + hres = compile_error(script, hres); + release_vbscode(code); + return hres; + } ctx.func_decls = NULL; ctx.labels = NULL; @@ -1922,6 +1929,8 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli } ctx.global_consts = ctx.const_decls; + code->option_explicit = ctx.parser.option_explicit; + for(func_decl = ctx.func_decls; func_decl; func_decl = func_decl->next) { hres = create_function(&ctx, func_decl, &new_func);

1 0

Jacek Caban : vbscript: Store source location in statement_t.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: 21346c76b4f8dae3cff5ac915bf59e08cfdfc3a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21346c76b4f8dae3cff5ac91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 22 23:27:14 2020 +0100 vbscript: Store source location in statement_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 7 ++- dlls/vbscript/parse.h | 4 +- dlls/vbscript/parser.y | 163 +++++++++++++++++++++++++------------------------ 3 files changed, 90 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21346c76b4f8dae3cff5…

1 0

Jacek Caban : vbscript: Store source location in instr_t.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: 7a76856e2d1652c0a7f6dd05dac26524c3d1f276 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a76856e2d1652c0a7f6dd05… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 22 23:27:20 2020 +0100 vbscript: Store source location in instr_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 8 ++++++++ dlls/vbscript/vbscript.h | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 4a1f1a5c6a..6e86bb07d0 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -44,6 +44,7 @@ typedef struct { unsigned instr_size; vbscode_t *code; + unsigned loc; statement_ctx_t *stat_ctx; unsigned *labels; @@ -162,6 +163,7 @@ static unsigned push_instr(compile_ctx_t *ctx, vbsop_t op) } ctx->code->instrs[ctx->instr_cnt].op = op; + ctx->code->instrs[ctx->instr_cnt].loc = ctx->loc; return ctx->instr_cnt++; } @@ -630,6 +632,8 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) for(elseif_decl = stat->elseifs; elseif_decl; elseif_decl = elseif_decl->next) { instr_ptr(ctx, cnd_jmp)->arg1.uint = ctx->instr_cnt; + ctx->loc = elseif_decl->loc; + hres = compile_expression(ctx, elseif_decl->expr); if(FAILED(hres)) return hres; @@ -723,6 +727,7 @@ static HRESULT compile_dowhile_statement(compile_ctx_t *ctx, while_statement_t * if(FAILED(hres)) return hres; + ctx->loc = stat->stat.loc; if(stat->expr) { hres = compile_expression(ctx, stat->expr); if(FAILED(hres)) @@ -778,6 +783,7 @@ static HRESULT compile_foreach_statement(compile_ctx_t *ctx, foreach_statement_t return hres; /* We need a separated enumnext here, because we need to jump out of the loop on exception. */ + ctx->loc = stat->stat.loc; hres = push_instr_uint_bstr(ctx, OP_enumnext, loop_ctx.for_end_label, stat->identifier); if(FAILED(hres)) return hres; @@ -1295,6 +1301,8 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_ctx_t *stat_ctx, } while(stat) { + ctx->loc = stat->loc; + switch(stat->type) { case STAT_ASSIGN: hres = compile_assign_statement(ctx, (assign_statement_t*)stat, FALSE); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 19431e23c3..d8b571b7d1 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -294,6 +294,7 @@ typedef union { typedef struct { vbsop_t op; + unsigned loc; instr_arg_t arg1; instr_arg_t arg2; } instr_t;

1 0

Jacek Caban : vbscript: Store source cookie and starting line in vbscode_t.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: 5436fc90f458ce86f2a7e073e1d4a08ebf967254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5436fc90f458ce86f2a7e073… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 22 23:27:25 2020 +0100 vbscript: Store source cookie and starting line in vbscode_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 15 ++++++++++----- dlls/vbscript/vbscript.c | 5 +++-- dlls/vbscript/vbscript.h | 9 ++++++--- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 6e86bb07d0..769bbf15ba 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1856,7 +1856,7 @@ void release_vbscode(vbscode_t *code) heap_free(code); } -static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) +static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source, DWORD_PTR cookie, unsigned start_line) { vbscode_t *ret; size_t len; @@ -1878,6 +1878,9 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) memcpy(ret->source, source, len * sizeof(WCHAR)); ret->source[len] = 0; + ret->cookie = cookie; + ret->start_line = start_line; + ret->instrs = heap_alloc(32*sizeof(instr_t)); if(!ret->instrs) { release_vbscode(ret); @@ -1904,7 +1907,8 @@ static void release_compiler(compile_ctx_t *ctx) release_vbscode(ctx->code); } -HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD flags, vbscode_t **ret) +HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD_PTR cookie, + unsigned start_line, DWORD flags, vbscode_t **ret) { function_decl_t *func_decl; class_decl_t *class_decl; @@ -1913,7 +1917,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli vbscode_t *code; HRESULT hres; - code = ctx.code = alloc_vbscode(&ctx, src); + code = ctx.code = alloc_vbscode(&ctx, src, cookie, start_line); if(!ctx.code) return E_OUTOFMEMORY; @@ -1978,13 +1982,14 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli return S_OK; } -HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD flags, class_desc_t **ret) +HRESULT compile_procedure(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD_PTR cookie, + unsigned start_line, DWORD flags, class_desc_t **ret) { class_desc_t *desc; vbscode_t *code; HRESULT hres; - hres = compile_script(script, src, delimiter, flags & ~SCRIPTTEXT_ISPERSISTENT, &code); + hres = compile_script(script, src, delimiter, cookie, start_line, flags & ~SCRIPTTEXT_ISPERSISTENT, &code); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index e068d19161..12681672ca 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -875,7 +875,7 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, } } - hres = compile_script(This->ctx, pstrCode, pstrDelimiter, dwFlags, &code); + hres = compile_script(This->ctx, pstrCode, pstrDelimiter, dwSourceContextCookie, ulStartingLine, dwFlags, &code); if(FAILED(hres)) return hres; @@ -939,7 +939,8 @@ static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptPar if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_procedure(This->ctx, pstrCode, pstrDelimiter, dwFlags, &desc); + hres = compile_procedure(This->ctx, pstrCode, pstrDelimiter, dwSourceContextCookie, ulStartingLineNumber, + dwFlags, &desc); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index d8b571b7d1..51797fbdfc 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -335,9 +335,12 @@ struct _function_t { struct _vbscode_t { instr_t *instrs; - WCHAR *source; unsigned ref; + WCHAR *source; + DWORD_PTR cookie; + unsigned start_line; + BOOL option_explicit; BOOL pending_exec; @@ -363,8 +366,8 @@ static inline void grab_vbscode(vbscode_t *code) } void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; -HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,vbscode_t**) DECLSPEC_HIDDEN; -HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,class_desc_t**) DECLSPEC_HIDDEN; +HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,vbscode_t**) DECLSPEC_HIDDEN; +HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD_PTR,unsigned,DWORD,class_desc_t**) DECLSPEC_HIDDEN; HRESULT exec_script(script_ctx_t*,BOOL,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_var(dynamic_var_t*) DECLSPEC_HIDDEN; IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN;

1 0

Jacek Caban : vbscript: Use parser_error to set unhandled parser error.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: b2de64eeedbc5ed2cf76b4aa079745dad60b8dbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2de64eeedbc5ed2cf76b4aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 22 23:27:35 2020 +0100 vbscript: Use parser_error to set unhandled parser error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 2 +- dlls/vbscript/parse.h | 1 - dlls/vbscript/parser.y | 25 ++++++++++--------------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 986693e3e1..db104fd892 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -351,7 +351,7 @@ static int parse_next_token(void *lval, unsigned *loc, parser_ctx_t *ctx) skip_spaces(ctx); *loc = ctx->ptr - ctx->code; if(ctx->ptr == ctx->end) - return ctx->last_token == tNL ? tEOF : tNL; + return ctx->last_token == tNL ? 0 : tNL; c = *ctx->ptr; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 37ddd7a11c..8d68e781fb 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -284,7 +284,6 @@ typedef struct { const WCHAR *end; BOOL option_explicit; - BOOL parse_complete; BOOL is_html; HRESULT hres; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 7a09d0c074..b54d4af32f 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -110,7 +110,7 @@ static statement_t *link_statements(statement_t*,statement_t*); double dbl; } -%token tEXPRESSION tEOF tNL tEMPTYBRACKETS tEXPRLBRACKET +%token tEXPRESSION tNL tEMPTYBRACKETS tEXPRLBRACKET %token tLTEQ tGTEQ tNEQ %token tSTOP tME tREM tDOT %token <string> tTRUE tFALSE @@ -153,8 +153,8 @@ static statement_t *link_statements(statement_t*,statement_t*); %% Program - : OptionExplicit_opt SourceElements tEOF { parse_complete(ctx, $1); } - | tEXPRESSION ExpressionNl_opt tEOF { handle_isexpression_script(ctx, $2); } + : OptionExplicit_opt SourceElements { parse_complete(ctx, $1); } + | tEXPRESSION ExpressionNl_opt { handle_isexpression_script(ctx, $2); } OptionExplicit_opt : /* empty */ { $$ = FALSE; } @@ -506,6 +506,12 @@ StSep static int parser_error(unsigned *loc, parser_ctx_t *ctx, const char *str) { + if(ctx->hres == S_OK) { + FIXME("%s: %s\n", debugstr_w(ctx->code + *loc), debugstr_a(str)); + ctx->hres = E_FAIL; + }else { + WARN("%s: %08x\n", debugstr_w(ctx->code + *loc), ctx->hres); + } return 0; } @@ -530,7 +536,6 @@ static void source_add_class(parser_ctx_t *ctx, class_decl_t *class_decl) static void parse_complete(parser_ctx_t *ctx, BOOL option_explicit) { - ctx->parse_complete = TRUE; ctx->option_explicit = option_explicit; } @@ -538,7 +543,6 @@ static void handle_isexpression_script(parser_ctx_t *ctx, expression_t *expr) { retval_statement_t *stat; - ctx->parse_complete = TRUE; if(!expr) return; @@ -1143,9 +1147,7 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite heap_pool_init(&ctx->heap); - ctx->parse_complete = FALSE; ctx->hres = S_OK; - ctx->last_token = tNL; ctx->last_nl = 0; ctx->stats = ctx->stats_tail = NULL; @@ -1158,14 +1160,7 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite parser_parse(ctx); - if(FAILED(ctx->hres)) - return ctx->hres; - if(!ctx->parse_complete) { - FIXME("parser failed around %s\n", debugstr_w(ctx->code+20 > ctx->ptr ? ctx->code : ctx->ptr-20)); - return E_FAIL; - } - - return S_OK; + return ctx->hres; } void parser_release(parser_ctx_t *ctx)

1 0

Jacek Caban : vbscript: Simplify option explicit parsing.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: 12b1bcdb950b0ef5b9e849e7165a653880300909 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12b1bcdb950b0ef5b9e849e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 22 23:27:45 2020 +0100 vbscript: Simplify option explicit parsing. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index b54d4af32f..16a673fac7 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -27,7 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static int parser_error(unsigned*,parser_ctx_t*,const char*); -static void parse_complete(parser_ctx_t*,BOOL); static void handle_isexpression_script(parser_ctx_t *ctx, expression_t *expr); static void source_add_statement(parser_ctx_t*,statement_t*); @@ -138,7 +137,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %type <expression> ConstExpression NumericLiteralExpression %type <member> MemberExpression %type <expression> Arguments Arguments_opt ArgumentList ArgumentList_opt Step_opt ExpressionList -%type <boolean> OptionExplicit_opt DoType Preserve_opt +%type <boolean> DoType Preserve_opt %type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl %type <func_decl> FunctionDecl PropertyDecl %type <elseif> ElseIfs_opt ElseIfs ElseIf @@ -153,12 +152,12 @@ static statement_t *link_statements(statement_t*,statement_t*); %% Program - : OptionExplicit_opt SourceElements { parse_complete(ctx, $1); } + : OptionExplicit_opt SourceElements | tEXPRESSION ExpressionNl_opt { handle_isexpression_script(ctx, $2); } OptionExplicit_opt - : /* empty */ { $$ = FALSE; } - | tOPTION tEXPLICIT StSep { $$ = TRUE; } + : /* empty */ + | tOPTION tEXPLICIT StSep { ctx->option_explicit = TRUE; } SourceElements : /* empty */ @@ -534,11 +533,6 @@ static void source_add_class(parser_ctx_t *ctx, class_decl_t *class_decl) ctx->class_decls = class_decl; } -static void parse_complete(parser_ctx_t *ctx, BOOL option_explicit) -{ - ctx->option_explicit = option_explicit; -} - static void handle_isexpression_script(parser_ctx_t *ctx, expression_t *expr) { retval_statement_t *stat;

1 0

Jacek Caban : vbscript: Pass parser error location to compiler.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: eb73571fe987344c0caca9ada621a129d1883c2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb73571fe987344c0caca9ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 22 23:27:54 2020 +0100 vbscript: Pass parser error location to compiler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 15 +++++++-------- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 3 +++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 769bbf15ba..1f9462aee8 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1917,27 +1917,25 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli vbscode_t *code; HRESULT hres; + memset(&ctx, 0, sizeof(ctx)); code = ctx.code = alloc_vbscode(&ctx, src, cookie, start_line); if(!ctx.code) return E_OUTOFMEMORY; hres = parse_script(&ctx.parser, code->source, delimiter, flags); if(FAILED(hres)) { + if(ctx.parser.error_loc != -1) + ctx.loc = ctx.parser.error_loc; hres = compile_error(script, hres); release_vbscode(code); return hres; } - ctx.func_decls = NULL; - ctx.labels = NULL; - ctx.global_consts = NULL; - ctx.stat_ctx = NULL; - ctx.labels_cnt = ctx.labels_size = 0; - hres = compile_func(&ctx, ctx.parser.stats, &ctx.code->main_code); if(FAILED(hres)) { + hres = compile_error(script, hres); release_compiler(&ctx); - return compile_error(script, hres); + return hres; } ctx.global_consts = ctx.const_decls; @@ -1947,8 +1945,9 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli for(func_decl = ctx.func_decls; func_decl; func_decl = func_decl->next) { hres = create_function(&ctx, func_decl, &new_func); if(FAILED(hres)) { + hres = compile_error(script, hres); release_compiler(&ctx); - return compile_error(script, hres); + return hres; } new_func->next = ctx.code->funcs; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 8d68e781fb..568d8b9a42 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -286,6 +286,7 @@ typedef struct { BOOL option_explicit; BOOL is_html; HRESULT hres; + int error_loc; int last_token; unsigned last_nl; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 16a673fac7..8ebfc82f00 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -505,6 +505,8 @@ StSep static int parser_error(unsigned *loc, parser_ctx_t *ctx, const char *str) { + if(ctx->error_loc == -1) + ctx->error_loc = *loc; if(ctx->hres == S_OK) { FIXME("%s: %s\n", debugstr_w(ctx->code + *loc), debugstr_a(str)); ctx->hres = E_FAIL; @@ -1142,6 +1144,7 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite heap_pool_init(&ctx->heap); ctx->hres = S_OK; + ctx->error_loc = -1; ctx->last_token = tNL; ctx->last_nl = 0; ctx->stats = ctx->stats_tail = NULL;

1 0

Jacek Caban : vbscript: Support reporting error location to script host.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: e35564b36df5a0f1c5a141f28fb86e8b4c2495b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e35564b36df5a0f1c5a141f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 22 23:28:01 2020 +0100 vbscript: Support reporting error location to script host. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 17 ++++++++++------- dlls/vbscript/interp.c | 20 +++++++++++++++++--- dlls/vbscript/tests/run.c | 3 +-- dlls/vbscript/vbscript.c | 24 +++++++++++++++++++----- dlls/vbscript/vbscript.h | 4 +++- 5 files changed, 50 insertions(+), 18 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 1f9462aee8..e52d8b1a24 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -374,7 +374,7 @@ static inline BOOL emit_catch(compile_ctx_t *ctx, unsigned off) return emit_catch_jmp(ctx, off, ctx->instr_cnt); } -static HRESULT compile_error(script_ctx_t *ctx, HRESULT error) +static HRESULT compile_error(script_ctx_t *ctx, compile_ctx_t *compiler, HRESULT error) { if(error == SCRIPT_E_REPORTED) return error; @@ -383,7 +383,7 @@ static HRESULT compile_error(script_ctx_t *ctx, HRESULT error) ctx->ei.scode = error = map_hres(error); ctx->ei.bstrSource = get_vbscript_string(VBS_COMPILE_ERROR); ctx->ei.bstrDescription = get_vbscript_error_string(error); - return report_script_error(ctx); + return report_script_error(ctx, compiler->code, compiler->loc); } static expression_t *lookup_const_decls(compile_ctx_t *ctx, const WCHAR *name, BOOL lookup_global) @@ -1926,18 +1926,19 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli if(FAILED(hres)) { if(ctx.parser.error_loc != -1) ctx.loc = ctx.parser.error_loc; - hres = compile_error(script, hres); + hres = compile_error(script, &ctx, hres); release_vbscode(code); return hres; } hres = compile_func(&ctx, ctx.parser.stats, &ctx.code->main_code); if(FAILED(hres)) { - hres = compile_error(script, hres); + hres = compile_error(script, &ctx, hres); release_compiler(&ctx); return hres; } + code->option_explicit = ctx.parser.option_explicit; ctx.global_consts = ctx.const_decls; code->option_explicit = ctx.parser.option_explicit; @@ -1945,7 +1946,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli for(func_decl = ctx.func_decls; func_decl; func_decl = func_decl->next) { hres = create_function(&ctx, func_decl, &new_func); if(FAILED(hres)) { - hres = compile_error(script, hres); + hres = compile_error(script, &ctx, hres); release_compiler(&ctx); return hres; } @@ -1957,15 +1958,17 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli for(class_decl = ctx.parser.class_decls; class_decl; class_decl = class_decl->next) { hres = compile_class(&ctx, class_decl); if(FAILED(hres)) { + hres = compile_error(script, &ctx, hres); release_compiler(&ctx); - return compile_error(script, hres); + return hres; } } hres = check_script_collisions(&ctx, script); if(FAILED(hres)) { + hres = compile_error(script, &ctx, hres); release_compiler(&ctx); - return compile_error(script, hres); + return hres; } code->is_persistent = (flags & SCRIPTTEXT_ISPERSISTENT) != 0; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 66ad206837..9c07535517 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -275,6 +275,14 @@ void clear_ei(EXCEPINFO *ei) memset(ei, 0, sizeof(*ei)); } +static void clear_error_loc(script_ctx_t *ctx) +{ + if(ctx->error_loc_code) { + release_vbscode(ctx->error_loc_code); + ctx->error_loc_code = NULL; + } +} + static inline VARIANT *stack_pop(exec_ctx_t *ctx) { assert(ctx->top); @@ -2396,6 +2404,7 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd TRACE("unwind jmp %d stack_off %d\n", exec.instr->arg1.uint, exec.instr->arg2.uint); + clear_error_loc(ctx); stack_off = exec.instr->arg2.uint; instr_jmp(&exec, exec.instr->arg1.uint); @@ -2414,7 +2423,11 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd continue; }else { - WARN("Failed %08x\n", hres); + if(!ctx->error_loc_code) { + grab_vbscode(exec.code); + ctx->error_loc_code = exec.code; + ctx->error_loc_offset = exec.instr->loc; + } stack_popn(&exec, exec.top); break; } @@ -2426,12 +2439,13 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd assert(!exec.top); if(extern_caller) { - IActiveScriptSite_OnLeaveScript(ctx->site); if(FAILED(hres)) { if(!ctx->ei.scode) ctx->ei.scode = hres; - hres = report_script_error(ctx); + hres = report_script_error(ctx, ctx->error_loc_code, ctx->error_loc_offset); + clear_error_loc(ctx); } + IActiveScriptSite_OnLeaveScript(ctx->site); } if(SUCCEEDED(hres) && res) { diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 696c3f530b..015f2b816a 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2530,10 +2530,9 @@ static void test_parse_errors(void) ok(hres == SCRIPT_E_REPORTED, "[%u] script returned: %08x\n", i, hres); CHECK_CALLED(OnScriptError); - todo_wine_if(invalid_scripts[i].error_line) ok(error_line == invalid_scripts[i].error_line, "[%u] error line %u expected %u\n", i, error_line, invalid_scripts[i].error_line); - todo_wine_if(invalid_scripts[i].error_char) + todo_wine_if(invalid_scripts[i].error_char < 0) ok(error_char == abs(invalid_scripts[i].error_char), "[%u] error char %d expected %d\n", i, error_char, invalid_scripts[i].error_char); } diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 12681672ca..2b691af583 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -61,6 +61,9 @@ typedef struct { IActiveScriptError IActiveScriptError_iface; LONG ref; EXCEPINFO ei; + DWORD_PTR cookie; + unsigned line; + unsigned character; } VBScriptError; static inline WCHAR *heap_pool_strdup(heap_pool_t *heap, const WCHAR *str) @@ -377,14 +380,14 @@ static HRESULT WINAPI VBScriptError_GetSourcePosition(IActiveScriptError *iface, { VBScriptError *This = impl_from_IActiveScriptError(iface); - FIXME("(%p)->(%p %p %p)\n", This, source_context, line, character); + TRACE("(%p)->(%p %p %p)\n", This, source_context, line, character); if(source_context) - *source_context = 0; + *source_context = This->cookie; if(line) - *line = 0; + *line = This->line; if(character) - *character = 0; + *character = This->character; return S_OK; } @@ -404,9 +407,10 @@ static const IActiveScriptErrorVtbl VBScriptErrorVtbl = { VBScriptError_GetSourceLineText }; -HRESULT report_script_error(script_ctx_t *ctx) +HRESULT report_script_error(script_ctx_t *ctx, const vbscode_t *code, unsigned loc) { VBScriptError *error; + const WCHAR *p, *nl; HRESULT hres, result; if(!(error = heap_alloc(sizeof(*error)))) @@ -418,6 +422,16 @@ HRESULT report_script_error(script_ctx_t *ctx) memset(&ctx->ei, 0, sizeof(ctx->ei)); result = error->ei.scode; + p = code->source; + error->cookie = code->cookie; + error->line = code->start_line; + for(nl = p = code->source; p < code->source + loc; p++) { + if(*p != '\n') continue; + error->line++; + nl = p + 1; + } + error->character = code->source + loc - nl; + hres = IActiveScriptSite_OnScriptError(ctx->site, &error->IActiveScriptError_iface); IActiveScriptError_Release(&error->IActiveScriptError_iface); return hres == S_OK ? SCRIPT_E_REPORTED : result; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 51797fbdfc..33ecb45bf4 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -192,6 +192,8 @@ struct _script_ctx_t { BuiltinDisp *err_obj; EXCEPINFO ei; + vbscode_t *error_loc_code; + unsigned error_loc_offset; struct list objects; struct list code_list; @@ -372,7 +374,7 @@ HRESULT exec_script(script_ctx_t*,BOOL,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT void release_dynamic_var(dynamic_var_t*) DECLSPEC_HIDDEN; IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN; -HRESULT report_script_error(script_ctx_t*) DECLSPEC_HIDDEN; +HRESULT report_script_error(script_ctx_t*,const vbscode_t*,unsigned) DECLSPEC_HIDDEN; void detach_global_objects(script_ctx_t*) DECLSPEC_HIDDEN; HRESULT get_builtin_id(BuiltinDisp*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : quartz: Simplify FilterMapper_RegisterPin().
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: wine Branch: master Commit: 48976108665a9c1f4af99e9e85f3c8fcf82daa7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=48976108665a9c1f4af99e9e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 22 16:30:49 2020 -0600 quartz: Simplify FilterMapper_RegisterPin(). Avoid some unnecessary allocations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 127 +++++++++++++++------------------------------ 1 file changed, 42 insertions(+), 85 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index bb718ed1ce..f7259a1650 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -87,10 +87,6 @@ static const WCHAR wszFilterDataName[] = {'F','i','l','t','e','r','D','a','t','a static const WCHAR wszFilter[] = {'F','i','l','t','e','r',0}; /* For pins registered with IFilterMapper */ static const WCHAR wszPins[] = {'P','i','n','s',0}; -static const WCHAR wszAllowedMany[] = {'A','l','l','o','w','e','d','M','a','n','y',0}; -static const WCHAR wszAllowedZero[] = {'A','l','l','o','w','e','d','Z','e','r','o',0}; -static const WCHAR wszDirection[] = {'D','i','r','e','c','t','i','o','n',0}; -static const WCHAR wszIsRendered[] = {'I','s','R','e','n','d','e','r','e','d',0}; /* For types registered with IFilterMapper */ static const WCHAR wszTypes[] = {'T','y','p','e','s',0}; @@ -1162,98 +1158,59 @@ static HRESULT WINAPI FilterMapper_RegisterFilterInstance(IFilterMapper * iface, return E_NOTIMPL; } -static HRESULT WINAPI FilterMapper_RegisterPin( - IFilterMapper * iface, - CLSID Filter, - LPCWSTR szName, - BOOL bRendered, - BOOL bOutput, - BOOL bZero, - BOOL bMany, - CLSID ConnectsToFilter, - LPCWSTR ConnectsToPin) +static HRESULT WINAPI FilterMapper_RegisterPin(IFilterMapper *iface, CLSID clsid, + const WCHAR *name, BOOL rendered, BOOL output, BOOL zero, BOOL many, + CLSID external_filter, const WCHAR *external_pin) { - HRESULT hr; - LONG lRet; - LPWSTR wszClsid = NULL; - HKEY hKey = NULL; - HKEY hPinsKey = NULL; - WCHAR * wszPinsKeyName; - WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; - - TRACE("(%p)->(%s, %s, %d, %d, %d, %d, %s, %s)\n", iface, debugstr_guid(&Filter), debugstr_w(szName), bRendered, - bOutput, bZero, bMany, debugstr_guid(&ConnectsToFilter), debugstr_w(ConnectsToPin)); - - hr = StringFromCLSID(&Filter, &wszClsid); - - if (SUCCEEDED(hr)) - { - lstrcpyW(wszKeyName, wszClsidSlash); - lstrcatW(wszKeyName, wszClsid); - - lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, KEY_WRITE, &hKey); - hr = HRESULT_FROM_WIN32(lRet); - } - - if (SUCCEEDED(hr)) - { - wszPinsKeyName = CoTaskMemAlloc((lstrlenW(wszPins) + 1 + lstrlenW(szName) + 1) * 2); - if (!wszPinsKeyName) - hr = E_OUTOFMEMORY; - } - - if (SUCCEEDED(hr)) - { - lstrcpyW(wszPinsKeyName, wszPins); - lstrcatW(wszPinsKeyName, wszSlash); - lstrcatW(wszPinsKeyName, szName); - - lRet = RegCreateKeyExW(hKey, wszPinsKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hPinsKey, NULL); - hr = HRESULT_FROM_WIN32(lRet); - CoTaskMemFree(wszPinsKeyName); - } - - if (SUCCEEDED(hr)) - { - lRet = RegSetValueExW(hPinsKey, wszAllowedMany, 0, REG_DWORD, (LPBYTE)&bMany, sizeof(bMany)); - hr = HRESULT_FROM_WIN32(lRet); - } + WCHAR keypath[6 + 38 + 1], *pin_keypath; + HKEY key, pin_key, type_key; + LONG ret; - if (SUCCEEDED(hr)) - { - lRet = RegSetValueExW(hPinsKey, wszAllowedZero, 0, REG_DWORD, (LPBYTE)&bZero, sizeof(bZero)); - hr = HRESULT_FROM_WIN32(lRet); - } + TRACE("iface %p, clsid %s, name %s, rendered %d, output %d, zero %d, " + "many %d, external_filter %s, external_pin %s.\n", + iface, debugstr_guid(&clsid), debugstr_w(name), rendered, output, + zero, many, debugstr_guid(&external_filter), debugstr_w(external_pin)); - if (SUCCEEDED(hr)) - { - lRet = RegSetValueExW(hPinsKey, wszDirection, 0, REG_DWORD, (LPBYTE)&bOutput, sizeof(bOutput)); - hr = HRESULT_FROM_WIN32(lRet); - } + wcscpy(keypath, L"CLSID\\"); + StringFromGUID2(&clsid, keypath + wcslen(keypath), ARRAY_SIZE(keypath) - wcslen(keypath)); + if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, keypath, 0, KEY_WRITE, &key))) + return HRESULT_FROM_WIN32(ret); - if (SUCCEEDED(hr)) + if (!(pin_keypath = malloc((5 + wcslen(name) + 1) * sizeof(WCHAR)))) { - lRet = RegSetValueExW(hPinsKey, wszIsRendered, 0, REG_DWORD, (LPBYTE)&bRendered, sizeof(bRendered)); - hr = HRESULT_FROM_WIN32(lRet); + RegCloseKey(key); + return E_OUTOFMEMORY; } + wcscpy(pin_keypath, L"Pins\\"); + wcscat(pin_keypath, name); - if (SUCCEEDED(hr)) + if ((ret = RegCreateKeyExW(key, pin_keypath, 0, NULL, 0, KEY_WRITE, NULL, &pin_key, NULL))) { - HKEY hkeyDummy = NULL; - - lRet = RegCreateKeyExW(hPinsKey, wszTypes, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkeyDummy, NULL); - hr = HRESULT_FROM_WIN32(lRet); - - if (hkeyDummy) RegCloseKey(hkeyDummy); + ERR("Failed to open pin key, error %u.\n", ret); + free(pin_keypath); + RegCloseKey(key); + return HRESULT_FROM_WIN32(ret); } + free(pin_keypath); + + if ((ret = RegSetValueExW(pin_key, L"AllowedMany", 0, REG_DWORD, (const BYTE *)&many, sizeof(DWORD)))) + ERR("Failed to set AllowedMany value, error %u.\n", ret); + if ((ret = RegSetValueExW(pin_key, L"AllowedZero", 0, REG_DWORD, (const BYTE *)&zero, sizeof(DWORD)))) + ERR("Failed to set AllowedZero value, error %u.\n", ret); + if ((ret = RegSetValueExW(pin_key, L"Direction", 0, REG_DWORD, (const BYTE *)&output, sizeof(DWORD)))) + ERR("Failed to set Direction value, error %u.\n", ret); + if ((ret = RegSetValueExW(pin_key, L"IsRendered", 0, REG_DWORD, (const BYTE *)&rendered, sizeof(DWORD)))) + ERR("Failed to set IsRendered value, error %u.\n", ret); + + if (!(ret = RegCreateKeyExW(pin_key, L"Types", 0, NULL, 0, 0, NULL, &type_key, NULL))) + RegCloseKey(type_key); + else + ERR("Failed to create Types subkey, error %u.\n", ret); - CoTaskMemFree(wszClsid); - if (hKey) - RegCloseKey(hKey); - if (hPinsKey) - RegCloseKey(hPinsKey); + RegCloseKey(pin_key); + RegCloseKey(key); - return hr; + return S_OK; }

1 0

Francois Gouget : testbot: Rename the staging files for the mailing list patches.
by Alexandre Julliard 23 Jan '20

23 Jan '20

Module: tools Branch: master Commit: 17fe807807c3106fa226447c61de4c77fe7570fe URL: https://source.winehq.org/git/tools.git/?a=commit;h=17fe807807c3106fa226447… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 23 10:41:02 2020 +0100 testbot: Rename the staging files for the mailing list patches. There is no need to use the mailing list name for those files. Also make it clear that these files contain the email, not just the patch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 4 ++-- testbot/bin/Janitor.pl | 2 +- testbot/bin/WinePatchesMLSubmit.pl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index ca35233..a8fc2f0 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -420,13 +420,13 @@ sub HandleWinePatchMLSubmission() foreach my $Entry (@Entries) { # Validate file name - next if ($Entry !~ m/^([0-9a-fA-F]{32}_wine-patches)$/); + next if ($Entry !~ m/^([0-9a-fA-F]{32}_email)$/); my $FullMessageFileName = "$DataDir/staging/$1"; # Create a work directory my $WorkDir = CreateNewDir("$DataDir/staging", "_work"); - # Process the patch + # Process the email my $Parser = new MIME::Parser; $Parser->output_dir($WorkDir); my $Entity = $Parser->parse_open($FullMessageFileName); diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 115b7d5..bf3989a 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -276,7 +276,7 @@ if (opendir(my $dh, "$DataDir/staging")) # These files always expire after one day $TTL = 1 - $Age; } - elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|wine-patches|winetest(?:64)?-latest\.exe)$/) + elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|email|winetest(?:64)?-latest\.exe)$/) { my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; Error "Found a suspicious file$Deletion: staging/$Entry\n"; diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index bddd42c..4797e98 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -45,7 +45,7 @@ use WineTestBot::Engine::Notify; use WineTestBot::Log; # Store the message in the staging dir -my ($fh, $FileName) = OpenNewFile("$DataDir/staging", "_wine-patches"); +my ($fh, $FileName) = OpenNewFile("$DataDir/staging", "_email"); if (!$fh) { LogMsg "Could not create a staging file: $!\n";

1 0