September 2011 - Wine-Commits

Alexandre Julliard : make_specfiles: Support a magic comment to prevent forwarding an entry point.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: c0ac16403ff0b10f68ff34f7e9ffd3b6a38839a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ac16403ff0b10f68ff34f7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 16:29:35 2011 +0200 make_specfiles: Support a magic comment to prevent forwarding an entry point. --- tools/make_specfiles | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index ff21ca8..89af185 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -202,6 +202,7 @@ sub update_spec_file($) my %parent = %{$funcs{$func}}; goto done if $parent{spec} eq $descr{spec}; # the definition is in this spec file + goto done if $descr{comment} && $descr{comment} =~ /don't forward/; if ($descr{callconv} ne "stub" && $descr{target} !~ /\./ && !$commented_out) { printf "%s:%u: note: %s already defined in %s\n", $file, $., $func, $parent{spec} if $show_duplicates;

1 0

Frédéric Delanoy : cmd/tests: Add tests for SHIFT builtin.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: ad064b44ed7a773e4fdf6dab9cda240ae6172c5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad064b44ed7a773e4fdf6dab9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 13 12:06:45 2011 +0200 cmd/tests: Add tests for SHIFT builtin. --- programs/cmd/tests/test_builtins.cmd | 20 ++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 7 +++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 7551e57..cd30e4f 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1256,6 +1256,26 @@ echo echo non-builtin dir> dir.cmd call dir /b cd .. & rd /s/q foobar +echo ------------ Testing SHIFT ------------ + +call :shiftFun p1 p2 p3 p4 p5 +goto :endShiftFun + +:shiftFun +echo '%1' '%2' '%3' '%4' '%5' +shift +echo '%1' '%2' '%3' '%4' '%5' +shift(a)tab@ /1 +echo '%1' '%2' '%3' '%4' '%5' +shift /2 +echo '%1' '%2' '%3' '%4' '%5' +shift /-1 +echo '%1' '%2' '%3' '%4' '%5' +shift /0 +echo '%1' '%2' '%3' '%4' '%5' +goto :eof +:endShiftFun + echo ------------ Testing cmd invocation ------------ rem FIXME: only a stub ATM echo ... a batch file can delete itself ... diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 733e1d5..19536fe 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -729,6 +729,13 @@ foo '' @todo_wine(a)1 @todo_wine(a)1 non-builtin dir +------------ Testing SHIFT ------------ +'p1' 'p2' 'p3' 'p4' 'p5' +'p2' 'p3' 'p4' 'p5' '' +'p3' 'p4' 'p5' '' '' +'p3' 'p5' '' '' '' +'p3' 'p5' '' '' '' +'p5' '' '' '' '' ------------ Testing cmd invocation ------------ ... a batch file can delete itself ... file correctly deleted

1 0

Jacek Caban : vbscript: Added 'and' expression parser/ compiler implementation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 69de07981a14cd74d44f98bc08034e5a4534a849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69de07981a14cd74d44f98bc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:59:02 2011 +0200 vbscript: Added 'and' expression parser/compiler implementation. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 8 ++++++-- dlls/vbscript/vbscript.h | 1 + 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 21b50bd..9b74bb7 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -356,6 +356,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) switch(expr->type) { case EXPR_ADD: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add); + case EXPR_AND: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_and); case EXPR_BOOL: return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); case EXPR_CONCAT: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 5c75a14..5b57306 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -564,6 +564,12 @@ static HRESULT interp_not(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_and(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT cmp_oper(exec_ctx_t *ctx) { variant_val_t l, r; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 6406fc2..d61a5f0 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -18,6 +18,7 @@ typedef enum { EXPR_ADD, + EXPR_AND, EXPR_BOOL, EXPR_CONCAT, EXPR_DIV, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 870a665..5c04681 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -98,7 +98,7 @@ static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL); %type <statement> Statement StatementNl StatementsNl StatementsNl_opt IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression -%type <expression> NotExpression UnaryExpression +%type <expression> NotExpression UnaryExpression AndExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt @@ -188,7 +188,11 @@ EmptyBrackets_opt | tEMPTYBRACKETS Expression - : NotExpression { $$ = $1; } + : AndExpression { $$ = $1; } + +AndExpression + : NotExpression { $$ = $1; } + | AndExpression tAND NotExpression { $$ = new_binary_expression(ctx, EXPR_AND, $1, $3); CHECK_ERROR; } NotExpression : EqualityExpression { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 3fb57e4..1d2f95d 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -117,6 +117,7 @@ typedef enum { #define OP_LIST \ X(add, 1, 0, 0) \ + X(and, 1, 0, 0) \ X(assign_ident, 1, ARG_BSTR, 0) \ X(assign_member, 1, ARG_BSTR, 0) \ X(bool, 1, ARG_INT, 0) \

1 0

Piotr Caban : msvcp60: Remove incorrect forwards from spec file.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 565ece5ecc067d62171a66195ef9321432187d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=565ece5ecc067d62171a66195… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 14 15:57:43 2011 +0200 msvcp60: Remove incorrect forwards from spec file. --- dlls/msvcp60/msvcp60.spec | 916 ++++++++++++++++++++++---------------------- 1 files changed, 458 insertions(+), 458 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=565ece5ecc067d62171a6…

1 0

Jacek Caban : vbscript: Added support for returning value from function.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: f9edb683d260b2175da90e58119aa22ce98a7cd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9edb683d260b2175da90e581… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:58:30 2011 +0200 vbscript: Added support for returning value from function. --- dlls/vbscript/interp.c | 29 +++++++++++++++++++++-------- dlls/vbscript/tests/lang.vbs | 17 +++++++++++++++++ dlls/vbscript/vbscript.h | 7 +++++++ 3 files changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index bb2c282..5c75a14 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -37,6 +37,8 @@ typedef struct { unsigned stack_size; unsigned top; VARIANT *stack; + + VARIANT ret_val; } exec_ctx_t; typedef HRESULT (*instr_func_t)(exec_ctx_t*); @@ -81,7 +83,7 @@ static BOOL lookup_dynamic_vars(dynamic_var_t *var, const WCHAR *name, ref_t *re return FALSE; } -static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, ref_t *ref) +static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_t invoke_type, ref_t *ref) { named_item_t *item; function_t *func; @@ -89,6 +91,12 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, ref_t *ref) DISPID id; HRESULT hres; + if(invoke_type == VBDISP_LET && ctx->func->type == FUNC_FUNCTION && !strcmpiW(name, ctx->func->name)) { + ref->type = REF_VAR; + ref->u.v = &ctx->ret_val; + return S_OK; + } + for(i=0; i < ctx->func->var_cnt; i++) { if(!strcmpiW(ctx->func->vars[i].name, name)) { ref->type = REF_VAR; @@ -259,7 +267,7 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) DISPPARAMS dp; HRESULT hres; - hres = lookup_identifier(ctx, identifier, &ref); + hres = lookup_identifier(ctx, identifier, VBDISP_CALLGET, &ref); if(FAILED(hres)) return hres; @@ -324,7 +332,7 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_v ref_t ref; HRESULT hres; - hres = lookup_identifier(ctx, name, &ref); + hres = lookup_identifier(ctx, name, VBDISP_LET, &ref); if(FAILED(hres)) return hres; @@ -838,6 +846,8 @@ static void release_exec(exec_ctx_t *ctx) { unsigned i; + VariantClear(&ctx->ret_val); + if(ctx->args) { for(i=0; i < ctx->func->arg_cnt; i++) VariantClear(ctx->args+i); @@ -859,11 +869,6 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, DISPPARAMS *dp, VARIANT vbsop_t op; HRESULT hres = S_OK; - if(res) { - FIXME("returning value is not implemented\n"); - return E_NOTIMPL; - } - exec.code = func->code_ctx; if(dp ? func->arg_cnt != arg_cnt(dp) : func->arg_cnt) { @@ -935,6 +940,14 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, DISPPARAMS *dp, VARIANT } assert(!exec.top); + if(func->type != FUNC_FUNCTION) + assert(V_VT(&exec.ret_val) == VT_EMPTY); + + if(SUCCEEDED(hres) && res) { + *res = exec.ret_val; + V_VT(&exec.ret_val) = VT_EMPTY; + } + release_exec(&exec); return hres; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 93af6b6..10f03f0 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -313,4 +313,21 @@ End Function Call TestFuncExit(true) +Function ReturnTrue + ReturnTrue = false + ReturnTrue = true +End Function + +Call ok(ReturnTrue(), "ReturnTrue returned false?") + +Function SetVal(ByRef x, ByVal v) + x = v + SetVal = x + Exit Function +End Function + +x = false +ok SetVal(x, true), "SetVal returned false?" +Call ok(x, "x is not set to true by SetVal?") + reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 5e86176..3fb57e4 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -61,6 +61,13 @@ typedef struct { LONG ref; } vbdisp_t; +typedef enum { + VBDISP_CALLGET, + VBDISP_LET, + VBDISP_SET, + VBDISP_ANY +} vbdisp_invoke_type_t; + HRESULT disp_get_id(IDispatch*,BSTR,DISPID*); HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*); HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*);

1 0

Jacek Caban : vbscript: Added interp_xor implementation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: f17b35fdebf34a0c271d9b8f5f49e4b25d1012b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f17b35fdebf34a0c271d9b8f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 13:00:02 2011 +0200 vbscript: Added interp_xor implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 5 +++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index e166b21..8a875ee 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -614,8 +614,26 @@ static HRESULT interp_or(exec_ctx_t *ctx) static HRESULT interp_xor(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarXor(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT interp_eqv(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index c6a336d..329df36 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -97,6 +97,11 @@ call ok(false and false or true, "false and false or true is false?") call ok(true or false and false, "true or false and false is false?") call ok(null or true, "null or true is false") +call ok(true xor false, "true xor false is false?") +call ok(not (false xor false), "false xor false is true?") +call ok(not (true or false xor true), "true or false xor true is true?") +call ok(not (true xor false or true), "true xor false or true is true?") + x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) Call ok(false + 6 + true = 5, "false + 6 + true <> 5")

1 0

Jacek Caban : vbscript: Added functions lookup implementation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: f00a8ec04dd5f3e30a6527390875aa73d8379f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f00a8ec04dd5f3e30a6527390… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:55:42 2011 +0200 vbscript: Added functions lookup implementation. --- dlls/vbscript/interp.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 66c2cf1..adec28f 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -41,7 +41,8 @@ typedef HRESULT (*instr_func_t)(exec_ctx_t*); typedef enum { REF_NONE, REF_DISP, - REF_VAR + REF_VAR, + REF_FUNC } ref_type_t; typedef struct { @@ -52,6 +53,7 @@ typedef struct { DISPID id; } d; VARIANT *v; + function_t *f; } u; } ref_t; @@ -79,12 +81,21 @@ static BOOL lookup_dynamic_vars(dynamic_var_t *var, const WCHAR *name, ref_t *re static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, ref_t *ref) { named_item_t *item; + function_t *func; DISPID id; HRESULT hres; if(lookup_dynamic_vars(ctx->script->global_vars, name, ref)) return S_OK; + for(func = ctx->script->global_funcs; func; func = func->next) { + if(!strcmpiW(func->name, name)) { + ref->type = REF_FUNC; + ref->u.f = func; + return S_OK; + } + } + LIST_FOR_EACH_ENTRY(item, &ctx->script->named_items, named_item_t, entry) { if(item->flags & SCRIPTITEM_GLOBALMEMBERS) { hres = disp_get_id(item->disp, name, &id); @@ -254,6 +265,9 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) if(FAILED(hres)) return hres; break; + case REF_FUNC: + FIXME("functions not implemented\n"); + return E_NOTIMPL; case REF_NONE: FIXME("%s not found\n", debugstr_w(identifier)); return DISP_E_UNKNOWNNAME; @@ -313,6 +327,9 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_v if(own_val) VariantClear(val); break; + case REF_FUNC: + FIXME("functions not implemented\n"); + return E_NOTIMPL; case REF_NONE: FIXME("%s not found\n", debugstr_w(name)); if(own_val)

1 0

Jacek Caban : vbscript: Added exit sub statement implementation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: d04ba41aa97f5e00ca4b1e05ecbc520a6491343e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04ba41aa97f5e00ca4b1e05e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:57:27 2011 +0200 vbscript: Added exit sub statement implementation. --- dlls/vbscript/compile.c | 30 ++++++++++++++++++++++++++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 6 ++++-- dlls/vbscript/tests/lang.vbs | 9 +++++++++ 4 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 386caf7..84a97a7 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -38,6 +38,8 @@ typedef struct { unsigned labels_size; unsigned labels_cnt; + unsigned sub_end_label; + dim_decl_t *dim_decls; dynamic_var_t *global_vars; @@ -530,6 +532,16 @@ static HRESULT compile_function_statement(compile_ctx_t *ctx, function_statement return S_OK; } +static HRESULT compile_exitsub_statement(compile_ctx_t *ctx) +{ + if(ctx->sub_end_label == -1) { + FIXME("Exit Sub outside Sub?\n"); + return E_FAIL; + } + + return push_instr_addr(ctx, OP_jmp, ctx->sub_end_label); +} + static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) { HRESULT hres; @@ -545,6 +557,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_DIM: hres = compile_dim_statement(ctx, (dim_statement_t*)stat); break; + case STAT_EXITSUB: + hres = compile_exitsub_statement(ctx); + break; case STAT_FUNC: hres = compile_function_statement(ctx, (function_statement_t*)stat); break; @@ -585,6 +600,18 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f func->code_off = ctx->instr_cnt; + ctx->sub_end_label = -1; + + switch(func->type) { + case FUNC_SUB: + ctx->sub_end_label = alloc_label(ctx); + if(ctx->sub_end_label == -1) + return E_OUTOFMEMORY; + break; + case FUNC_GLOBAL: + break; + } + ctx->func = func; ctx->dim_decls = NULL; hres = compile_statement(ctx, stat); @@ -592,6 +619,9 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(FAILED(hres)) return hres; + if(ctx->sub_end_label != -1) + label_set_addr(ctx, ctx->sub_end_label); + if(push_instr(ctx, OP_ret) == -1) return E_OUTOFMEMORY; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 9b837c2..69eca61 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -86,6 +86,7 @@ typedef enum { STAT_ASSIGN, STAT_CALL, STAT_DIM, + STAT_EXITSUB, STAT_FUNC, STAT_IF } statement_type_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 4964d71..f406f8e 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -45,6 +45,7 @@ static expression_t *new_binary_expression(parser_ctx_t*,expression_type_t,expre static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*); +static void *new_statement(parser_ctx_t*,statement_type_t,size_t); static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); static statement_t *new_assign_statement(parser_ctx_t*,member_expression_t*,expression_t*); static statement_t *new_dim_statement(parser_ctx_t*,dim_decl_t*); @@ -138,6 +139,7 @@ Statement | tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; } | IfStatement { $$ = $1; } | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } + | tEXIT tSUB { $$ = new_statement(ctx, STAT_EXITSUB, 0); CHECK_ERROR; } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } @@ -388,11 +390,11 @@ static member_expression_t *new_member_expression(parser_ctx_t *ctx, expression_ return expr; } -static void *new_statement(parser_ctx_t *ctx, statement_type_t type, unsigned size) +static void *new_statement(parser_ctx_t *ctx, statement_type_t type, size_t size) { statement_t *stat; - stat = parser_alloc(ctx, size); + stat = parser_alloc(ctx, size ? size : sizeof(*stat)); if(stat) { stat->type = type; stat->next = NULL; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 100f93b..1140326 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -218,6 +218,15 @@ Sub TestSubMultiArgs(a,b,c,d,e) Call ok(e=5, "e = " & e) End Sub +Sub TestSubExit(ByRef a) + If a Then + Exit Sub + End If + Call ok(false, "Exit Sub not called?") +End Sub + +Call TestSubExit(true) + TestSubMultiArgs 1, 2, 3, 4, 5 Call TestSubMultiArgs(1, 2, 3, 4, 5)

1 0

Hans Leidekker : ws2_32: Avoid a crash in WS2_recv_base.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 94f431e3eebe44a88752be72a795baf33e55a213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94f431e3eebe44a88752be72a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 14 12:04:39 2011 +0200 ws2_32: Avoid a crash in WS2_recv_base. --- dlls/ws2_32/socket.c | 3 +- dlls/ws2_32/tests/sock.c | 65 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b6d17ff..f0313fc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5720,8 +5720,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, goto error; } } - else - *lpNumberOfBytesRecvd = n; + else if (lpNumberOfBytesRecvd) *lpNumberOfBytesRecvd = n; if ((lpOverlapped || lpCompletionRoutine) && !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 326b77d..b358250 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4031,18 +4031,37 @@ static void test_WSASendTo(void) "a successful call to WSASendTo()\n"); } +static DWORD WINAPI recv_thread(LPVOID arg) +{ + SOCKET sock = *(SOCKET *)arg; + char buffer[32]; + WSABUF wsa; + WSAOVERLAPPED ov; + DWORD flags = 0; + + wsa.buf = buffer; + wsa.len = sizeof(buffer); + ov.hEvent = WSACreateEvent(); + WSARecv(sock, &wsa, 1, NULL, &flags, &ov, NULL); + + WaitForSingleObject(ov.hEvent, 1000); + WSACloseEvent(ov.hEvent); + return 0; +} + static void test_WSARecv(void) { - SOCKET src, dest; + SOCKET src, dest, server = INVALID_SOCKET; char buf[20]; WSABUF bufs; WSAOVERLAPPED ov; - DWORD bytesReturned; - DWORD flags; + DWORD bytesReturned, flags, id; struct linger ling; - int iret; + struct sockaddr_in addr; + int iret, len; DWORD dwret; BOOL bret; + HANDLE thread; memset(&ov, 0, sizeof(ov)); @@ -4067,6 +4086,9 @@ static void test_WSARecv(void) iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); ok(!iret, "Failed to set linger %d\n", GetLastError()); + iret = WSARecv(dest, &bufs, 1, NULL, &flags, &ov, NULL); + ok(iret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, "WSARecv failed - %d error %d\n", iret, GetLastError()); + iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, &ov, NULL); ok(iret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, "WSARecv failed - %d error %d\n", iret, GetLastError()); @@ -4081,7 +4103,42 @@ static void test_WSARecv(void) "Did not get disconnect event: %d, error %d\n", bret, GetLastError()); ok(bytesReturned == 0, "Bytes received is %d\n", bytesReturned); + src = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, 0); + ok(src != INVALID_SOCKET, "failed to create socket %d\n", WSAGetLastError()); + if (src == INVALID_SOCKET) goto end; + + server = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(server != INVALID_SOCKET, "failed to create socket %d\n", WSAGetLastError()); + if (server == INVALID_SOCKET) goto end; + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + iret = bind(server, (struct sockaddr *)&addr, sizeof(addr)); + if (iret) goto end; + + len = sizeof(addr); + iret = getsockname(server, (struct sockaddr *)&addr, &len); + if (iret) goto end; + + iret = listen(server, 1); + if (iret) goto end; + + iret = connect(src, (struct sockaddr *)&addr, sizeof(addr)); + if (iret) goto end; + + len = sizeof(addr); + dest = accept(server, (struct sockaddr *)&addr, &len); + ok(dest != INVALID_SOCKET, "failed to create socket %d\n", WSAGetLastError()); + if (dest == INVALID_SOCKET) goto end; + + send(src, "test message", sizeof("test message"), 0); + thread = CreateThread(NULL, 0, recv_thread, &dest, 0, &id); + CloseHandle(thread); + end: + if (server != INVALID_SOCKET) + closesocket(server); if (dest != INVALID_SOCKET) closesocket(dest); if (src != INVALID_SOCKET)

1 0

Jacek Caban : vbscript: Added sub statement parser implementation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: d220dd291e4488649a05ca25afd8545b5f6b7fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d220dd291e4488649a05ca25a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:54:50 2011 +0200 vbscript: Added sub statement parser implementation. --- dlls/vbscript/parse.h | 24 +++++++++++++- dlls/vbscript/parser.y | 75 ++++++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/vbscript.h | 5 +++ 3 files changed, 100 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index cfeb8c0..9b837c2 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -85,8 +85,9 @@ typedef struct { typedef enum { STAT_ASSIGN, STAT_CALL, - STAT_IF, - STAT_DIM + STAT_DIM, + STAT_FUNC, + STAT_IF } statement_type_t; typedef struct _statement_t { @@ -115,6 +116,25 @@ typedef struct _dim_statement_t { dim_decl_t *dim_decls; } dim_statement_t; +typedef struct _arg_decl_t { + const WCHAR *name; + BOOL by_ref; + struct _arg_decl_t *next; +} arg_decl_t; + +typedef struct _function_decl_t { + const WCHAR *name; + function_type_t type; + arg_decl_t *args; + statement_t *body; + struct _function_decl_t *next; +} function_decl_t; + +typedef struct _function_statement_t { + statement_t stat; + function_decl_t *func_decl; +} function_statement_t; + typedef struct _elseif_decl_t { expression_t *expr; statement_t *stat; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index c9f9c76..4964d71 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -48,10 +48,13 @@ static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,co static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); static statement_t *new_assign_statement(parser_ctx_t*,member_expression_t*,expression_t*); static statement_t *new_dim_statement(parser_ctx_t*,dim_decl_t*); - static statement_t *new_if_statement(parser_ctx_t*,expression_t*,statement_t*,elseif_decl_t*,statement_t*); +static statement_t *new_if_statement(parser_ctx_t*,expression_t*,statement_t*,elseif_decl_t*,statement_t*); +static statement_t *new_function_statement(parser_ctx_t*,function_decl_t*); static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*); static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); +static function_decl_t *new_function_decl(parser_ctx_t*,const WCHAR*,function_type_t,arg_decl_t*,statement_t*); +static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL); #define CHECK_ERROR if(((parser_ctx_t*)ctx)->hres != S_OK) YYABORT @@ -67,6 +70,8 @@ static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); member_expression_t *member; elseif_decl_t *elseif; dim_decl_t *dim_decl; + function_decl_t *func_decl; + arg_decl_t *arg_decl; LONG lng; BOOL bool; double dbl; @@ -89,13 +94,15 @@ static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); %token <lng> tLong tShort %token <dbl> tDouble -%type <statement> Statement StatementNl StatementsNl IfStatement Else_opt +%type <statement> Statement StatementNl StatementsNl StatementsNl_opt IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression %type <expression> NotExpression UnaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt +%type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl +%type <func_decl> FunctionDecl %type <elseif> ElseIfs_opt ElseIfs ElseIf %type <dim_decl> DimDeclList @@ -112,6 +119,10 @@ SourceElements : /* empty */ | SourceElements StatementNl { source_add_statement(ctx, $2); } +StatementsNl_opt + : /* empty */ { $$ = NULL; } + | StatementsNl { $$ = $1; } + StatementsNl : StatementNl { $$ = $1; } | StatementNl StatementsNl { $1->next = $2; $$ = $1; } @@ -126,6 +137,7 @@ Statement { $1->args = $2; $$ = new_assign_statement(ctx, $1, $4); CHECK_ERROR; } | tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; } | IfStatement { $$ = $1; } + | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } @@ -236,6 +248,23 @@ LiteralExpression PrimaryExpression : '(' Expression ')' { $$ = $2; } +FunctionDecl + : /* Storage_opt */ tSUB tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tSUB + { $$ = new_function_decl(ctx, $2, FUNC_SUB, $3, $5); CHECK_ERROR; } + +ArgumentsDecl_opt + : EmptyBrackets_opt { $$ = NULL; } + | '(' ArgumentDeclList ')' { $$ = $2; } + +ArgumentDeclList + : ArgumentDecl { $$ = $1; } + | ArgumentDecl ',' ArgumentDeclList { $1->next = $3; $$ = $1; } + +ArgumentDecl + : tIdentifier { $$ = new_argument_decl(ctx, $1, TRUE); } + | tBYREF tIdentifier { $$ = new_argument_decl(ctx, $2, TRUE); } + | tBYVAL tIdentifier { $$ = new_argument_decl(ctx, $2, FALSE); } + %% static int parser_error(const char *str) @@ -452,6 +481,48 @@ static statement_t *new_if_statement(parser_ctx_t *ctx, expression_t *expr, stat return &stat->stat; } +static arg_decl_t *new_argument_decl(parser_ctx_t *ctx, const WCHAR *name, BOOL by_ref) +{ + arg_decl_t *arg_decl; + + arg_decl = parser_alloc(ctx, sizeof(*arg_decl)); + if(!arg_decl) + return NULL; + + arg_decl->name = name; + arg_decl->by_ref = by_ref; + arg_decl->next = NULL; + return arg_decl; +} + +static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, function_type_t type, + arg_decl_t *arg_decl, statement_t *body) +{ + function_decl_t *decl; + + decl = parser_alloc(ctx, sizeof(*decl)); + if(!decl) + return NULL; + + decl->name = name; + decl->type = type; + decl->args = arg_decl; + decl->body = body; + return decl; +} + +static statement_t *new_function_statement(parser_ctx_t *ctx, function_decl_t *decl) +{ + function_statement_t *stat; + + stat = new_statement(ctx, STAT_FUNC, sizeof(*stat)); + if(!stat) + return NULL; + + stat->func_decl = decl; + return &stat->stat; +} + void *parser_alloc(parser_ctx_t *ctx, size_t size) { void *ret; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index afa9d83..b52aa09 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -146,6 +146,11 @@ typedef struct { instr_arg_t arg2; } instr_t; +typedef enum { + FUNC_GLOBAL, + FUNC_SUB +} function_type_t; + struct _function_t { unsigned code_off; vbscode_t *code_ctx;

1 0