September 2011 - Wine-commits

Jacek Caban : vbscript: Added interp_add implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 03c8284843cf4184e0646bde74c63d9d967b55f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c8284843cf4184e0646bde7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:32:07 2011 +0200 vbscript: Added interp_add 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 fb3adfe..f3e3f56 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -393,8 +393,26 @@ static HRESULT interp_concat(exec_ctx_t *ctx) static HRESULT interp_add(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 = VarAdd(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT interp_sub(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 9b1d771..06a3d07 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -70,4 +70,9 @@ Call ok(1 & 100000 = "1100000", "1 & 100000 = " & (1 & 100000)) ' Call ok(true & false = "TrueFalse", "true & false = " & (true & false)) 'end if +Call ok(2+2 = 4, "2+2 = " & (2+2)) +Call ok(false + 6 + true = 5, "false + 6 + true <> 5") +Call ok(getVT(2+null) = "VT_NULL", "getVT(2+null) = " & getVT(2+null)) +Call ok(2+empty = 2, "2+empty = " & (2+empty)) + reportSuccess()

1 0

Jacek Caban : vbscript: Added interp_sub implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 324aadd2a95fa4766b0e47caf7d38c5eb68dcb61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=324aadd2a95fa4766b0e47caf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:32:18 2011 +0200 vbscript: Added interp_sub 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 f3e3f56..4585f88 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -417,8 +417,26 @@ static HRESULT interp_add(exec_ctx_t *ctx) static HRESULT interp_sub(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 = VarSub(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT interp_neg(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 06a3d07..9c37bb2 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -75,4 +75,9 @@ Call ok(false + 6 + true = 5, "false + 6 + true <> 5") Call ok(getVT(2+null) = "VT_NULL", "getVT(2+null) = " & getVT(2+null)) Call ok(2+empty = 2, "2+empty = " & (2+empty)) +Call ok(5-1 = 4, "5-1 = " & (5-1)) +Call ok(3+5-true = 9, "3+5-true <> 9") +Call ok(getVT(2-null) = "VT_NULL", "getVT(2-null) = " & getVT(2-null)) +Call ok(2-empty = 2, "2-empty = " & (2-empty)) + reportSuccess()

1 0

Jacek Caban : vbscript: Added '<>' expression implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 43f6a6842acd0b1374a5b200427768f8f631502d URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f6a6842acd0b1374a5b2004… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:32:27 2011 +0200 vbscript: Added '<>' expression implementation. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 16 ++++++++++++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 5 +++++ dlls/vbscript/vbscript.h | 1 + 6 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 9e34c35..a91cb5d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -250,6 +250,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); case EXPR_NEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); + case EXPR_NEQUAL: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_nequal); case EXPR_NOT: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); case EXPR_NULL: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4585f88..51ec8e7 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -367,6 +367,22 @@ static HRESULT interp_equal(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_nequal(exec_ctx_t *ctx) +{ + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = cmp_oper(ctx); + if(FAILED(hres)) + return hres; + + V_VT(&v) = VT_BOOL; + V_BOOL(&v) = hres != VARCMP_EQ ? VARIANT_TRUE : VARIANT_FALSE; + return stack_push(ctx, &v); +} + static HRESULT interp_concat(exec_ctx_t *ctx) { variant_val_t r, l; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 3d6d604..188b673 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -25,6 +25,7 @@ typedef enum { EXPR_EQUAL, EXPR_MEMBER, EXPR_NEG, + EXPR_NEQUAL, EXPR_NOT, EXPR_NULL, EXPR_STRING, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 2f42ab6..ebfbbbc 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -139,6 +139,7 @@ NotExpression EqualityExpression : ConcatExpression { $$ = $1; } | EqualityExpression '=' ConcatExpression { $$ = new_binary_expression(ctx, EXPR_EQUAL, $1, $3); CHECK_ERROR; } + | EqualityExpression tNEQ ConcatExpression { $$ = new_binary_expression(ctx, EXPR_NEQUAL, $1, $3); CHECK_ERROR; } ConcatExpression : AdditiveExpression { $$ = $1; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 9c37bb2..2e81643 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -40,6 +40,11 @@ Call ok(&hffFFffFF& = -1, "&hffFFffFF& <> -1") Call ok(--1 = 1, "--1 = " & --1) Call ok(-empty = 0, "-empty = " & (-empty)) +Call ok(true <> false, "true <> false is false") +Call ok(not (true <> true), "true <> true is true") +Call ok(not ("x" <> "x"), """x"" <> ""x"" is true") +Call ok(not (empty <> empty), "empty <> empty is true") + Call ok(getVT(false) = "VT_BOOL", "getVT(false) is not VT_BOOL") Call ok(getVT(true) = "VT_BOOL", "getVT(true) is not VT_BOOL") Call ok(getVT("") = "VT_BSTR", "getVT("""") is not VT_BSTR") diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index cf90b38..e2cfdea 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -98,6 +98,7 @@ typedef enum { X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(long, 1, ARG_INT, 0) \ X(neg, 1, 0, 0) \ + X(nequal, 1, 0, 0) \ X(not, 1, 0, 0) \ X(null, 1, 0, 0) \ X(ret, 0, 0, 0) \

1 0

Jacek Caban : vbscript: Added assign statement parser implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: e63c4472281872c363cc17205f4264477b360298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e63c4472281872c363cc17205… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:32:38 2011 +0200 vbscript: Added assign statement parser implementation. --- dlls/vbscript/parse.h | 7 +++++++ dlls/vbscript/parser.y | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 188b673..f7b9436 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -78,6 +78,7 @@ typedef struct { } member_expression_t; typedef enum { + STAT_ASSIGN, STAT_CALL } statement_type_t; @@ -92,6 +93,12 @@ typedef struct { } call_statement_t; typedef struct { + statement_t stat; + member_expression_t *member_expr; + expression_t *value_expr; +} assign_statement_t; + +typedef struct { const WCHAR *code; const WCHAR *ptr; const WCHAR *end; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index ebfbbbc..0d56acd 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -46,6 +46,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 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*); #define CHECK_ERROR if(((parser_ctx_t*)ctx)->hres != S_OK) YYABORT @@ -108,6 +109,8 @@ StatementNl Statement : MemberExpression ArgumentList_opt { $1->args = $2; $$ = new_call_statement(ctx, $1); CHECK_ERROR; } | tCALL MemberExpression Arguments_opt { $2->args = $3; $$ = new_call_statement(ctx, $2); CHECK_ERROR; } + | MemberExpression Arguments_opt '=' Expression + { $1->args = $2; $$ = new_assign_statement(ctx, $1, $4); CHECK_ERROR; } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } @@ -325,6 +328,19 @@ static statement_t *new_call_statement(parser_ctx_t *ctx, member_expression_t *e return &stat->stat; } +static statement_t *new_assign_statement(parser_ctx_t *ctx, member_expression_t *left, expression_t *right) +{ + assign_statement_t *stat; + + stat = new_statement(ctx, STAT_ASSIGN, sizeof(*stat)); + if(!stat) + return NULL; + + stat->member_expr = left; + stat->value_expr = right; + return &stat->stat; +} + void *parser_alloc(parser_ctx_t *ctx, size_t size) { void *ret;

1 0

Jacek Caban : vbscript: Added assign statement compiler implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 3c85122e05eb668a7faa63ba6003a9339f48c6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c85122e05eb668a7faa63ba6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:32:50 2011 +0200 vbscript: Added assign statement compiler implementation. --- dlls/vbscript/compile.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index a91cb5d..8cc55c7 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -150,6 +150,23 @@ static BSTR alloc_bstr_arg(compile_ctx_t *ctx, const WCHAR *str) return ctx->code->bstr_pool[ctx->code->bstr_cnt++]; } +static HRESULT push_instr_bstr(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) +{ + unsigned instr; + BSTR bstr; + + bstr = alloc_bstr_arg(ctx, arg); + if(!bstr) + return E_OUTOFMEMORY; + + instr = push_instr(ctx, op); + if(instr == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, instr)->arg1.bstr = bstr; + return S_OK; +} + static HRESULT push_instr_bstr_uint(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg1, unsigned arg2) { unsigned instr; @@ -272,12 +289,38 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return S_OK; } +static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t *stat) +{ + HRESULT hres; + + hres = compile_expression(ctx, stat->value_expr); + if(FAILED(hres)) + return hres; + + if(stat->member_expr->args) { + FIXME("arguments support not implemented\n"); + return E_NOTIMPL; + } + + if(stat->member_expr->obj_expr) { + FIXME("obj_expr not implemented\n"); + hres = E_NOTIMPL; + }else { + hres = push_instr_bstr(ctx, OP_assign_ident, stat->member_expr->identifier); + } + + return hres; +} + static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) { HRESULT hres; while(stat) { switch(stat->type) { + case STAT_ASSIGN: + hres = compile_assign_statement(ctx, (assign_statement_t*)stat); + break; case STAT_CALL: hres = compile_member_expression(ctx, ((call_statement_t*)stat)->expr, FALSE); break; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 51ec8e7..1e84afa 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -217,6 +217,12 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) return do_icall(ctx, NULL); } +static HRESULT interp_assign_ident(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_ret(exec_ctx_t *ctx) { TRACE("\n"); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index e2cfdea..070fdbb 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -89,6 +89,7 @@ typedef enum { #define OP_LIST \ X(add, 1, 0, 0) \ + X(assign_ident, 1, ARG_BSTR, 0) \ X(bool, 1, ARG_INT, 0) \ X(concat, 1, 0, 0) \ X(double, 1, ARG_DOUBLE, 0) \

1 0

Jacek Caban : vbscript: Added interp_assign_ident implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 2083935c649f38f5b881d907d5999ce923b5c1d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2083935c649f38f5b881d907d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:33:03 2011 +0200 vbscript: Added interp_assign_ident implementation. --- dlls/vbscript/interp.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/vbscript/vbdisp.c | 22 ++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 1e84afa..4099642 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -217,10 +217,44 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) return do_icall(ctx, NULL); } +static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_val) +{ + ref_t ref; + HRESULT hres; + + hres = lookup_identifier(ctx, name, &ref); + if(FAILED(hres)) + return hres; + + switch(ref.type) { + case REF_DISP: + hres = disp_propput(ctx->script, ref.u.d.disp, ref.u.d.id, val); + if(own_val) + VariantClear(val); + break; + case REF_NONE: + FIXME("%s not found\n", debugstr_w(name)); + if(own_val) + VariantClear(val); + return DISP_E_UNKNOWNNAME; + } + + return hres; +} + static HRESULT interp_assign_ident(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const BSTR arg = ctx->instr->arg1.bstr; + variant_val_t v; + HRESULT hres; + + TRACE("%s\n", debugstr_w(arg)); + + hres = stack_pop_val(ctx, &v); + if(FAILED(hres)) + return hres; + + return assign_ident(ctx, arg, v.v, v.owned); } static HRESULT interp_ret(exec_ctx_t *ctx) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index c115199..9cfdab2 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -246,3 +246,25 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp, IDispatchEx_Release(dispex); return hres; } + +HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val) +{ + DISPID propput_dispid = DISPID_PROPERTYPUT; + DISPPARAMS dp = {val, &propput_dispid, 1, 1}; + IDispatchEx *dispex; + EXCEPINFO ei = {0}; + HRESULT hres; + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, NULL /* FIXME! */); + IDispatchEx_Release(dispex); + }else { + ULONG err = 0; + + TRACE("using IDispatch\n"); + hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, &err); + } + + return hres; +} diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 070fdbb..49b2cfa 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -63,6 +63,7 @@ typedef struct { 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*); struct _script_ctx_t { IActiveScriptSite *site;

1 0

Jacek Caban : vbscript: Added assign statement tests.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: d9659a6502ac6ff7f5de6bc3cf7f0adc204d4496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9659a6502ac6ff7f5de6bc3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:33:14 2011 +0200 vbscript: Added assign statement tests. --- dlls/vbscript/tests/run.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index dac8bec..e9beab9 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -58,12 +58,15 @@ extern const CLSID CLSID_VBScript; DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); +DEFINE_EXPECT(global_vbvar_d); +DEFINE_EXPECT(global_vbvar_i); #define DISPID_GLOBAL_REPORTSUCCESS 1000 #define DISPID_GLOBAL_TRACE 1001 #define DISPID_GLOBAL_OK 1002 #define DISPID_GLOBAL_GETVT 1003 #define DISPID_GLOBAL_ISENGLOC 1004 +#define DISPID_GLOBAL_VBVAR 1005 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -252,6 +255,12 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_ISENGLOC; return S_OK; } + if(!strcmp_wa(bstrName, "vbvar")) { + CHECK_EXPECT(global_vbvar_d); + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_VBVAR; + return S_OK; + } if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -350,6 +359,23 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, } return S_OK; + case DISPID_GLOBAL_VBVAR: + CHECK_EXPECT(global_vbvar_i); + + ok(wFlags == DISPATCH_PROPERTYPUT, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(pdp->rgdispidNamedArgs != NULL, "rgdispidNamedArgs == NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_I2, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_I2(pdp->rgvarg) == 3, "V_I2(psp->rgvargs) = %d\n", V_I2(pdp->rgvarg)); + + return S_OK; } ok(0, "unexpected call %d\n", id); @@ -652,6 +678,18 @@ static void run_tests(void) CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + SET_EXPECT(global_vbvar_d); + SET_EXPECT(global_vbvar_i); + parse_script_a("Option Explicit\nvbvar = 3"); + CHECK_CALLED(global_vbvar_d); + CHECK_CALLED(global_vbvar_i); + + SET_EXPECT(global_vbvar_d); + SET_EXPECT(global_vbvar_i); + parse_script_a("Option Explicit\nvbvar() = 3"); + CHECK_CALLED(global_vbvar_d); + CHECK_CALLED(global_vbvar_i); + run_from_res("lang.vbs"); }

1 0

Frédéric Delanoy : cmd: Show that windows doesn' t lock/prevent access to batch file during execution.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: cb63445b5e0249b9bf31b9749b94cea76d78413e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb63445b5e0249b9bf31b9749… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 11 17:14:54 2011 +0200 cmd: Show that windows doesn't lock/prevent access to batch file during execution. --- programs/cmd/tests/test_builtins.cmd | 21 +++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 5 +++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index c5f4bd9..88265f7 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1256,6 +1256,27 @@ echo echo non-builtin dir> dir.cmd call dir /b cd .. & rd /s/q foobar +echo ------------ Testing cmd invocation ------------ +rem FIXME: only a stub ATM +echo ... a batch file can delete itself ... +echo del foo.cmd>foo.cmd +cmd /q /c foo.cmd +if not exist foo.cmd ( + echo file correctly deleted +) else ( + echo file should be deleted! + del foo.cmd +) +echo ... a batch file can alter itself ... +echo echo bar^>foo.cmd>foo.cmd +cmd /q /c foo.cmd > NUL 2>&1 +if exist foo.cmd ( + type foo.cmd + del foo.cmd +) else ( + echo file not created! +) + echo ------------ Testing setlocal/endlocal ------------ call :setError 0 rem Note: setlocal EnableDelayedExtension already tested in the variable delayed expansion test section diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7dd6207..5c022ff 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -723,6 +723,11 @@ foo '' @todo_wine(a)1 @todo_wine(a)1 non-builtin dir +------------ Testing cmd invocation ------------ +... a batch file can delete itself ... +(a)todo_wine@file correctly deleted +... a batch file can alter itself ... +(a)todo_wine@bar ------------ Testing setlocal/endlocal ------------ ...enable/disable extensions @todo_wine(a)ErrLev:@space@

1 0

Frédéric Delanoy : cmd: Allow a batch file to delete itself.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: a33bad1edd3c722810252d681a56e43391d3e1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33bad1edd3c722810252d681… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 11 17:14:55 2011 +0200 cmd: Allow a batch file to delete itself. --- programs/cmd/batch.c | 2 +- programs/cmd/tests/test_builtins.cmd.exp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 70886d1..881c7d1 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -51,7 +51,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN BATCH_CONTEXT *prev_context; if (startLabel == NULL) { - h = CreateFileW (file, GENERIC_READ, FILE_SHARE_READ, + h = CreateFileW (file, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { SetLastError (ERROR_FILE_NOT_FOUND); diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 5c022ff..b9285b1 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -725,7 +725,7 @@ foo '' non-builtin dir ------------ Testing cmd invocation ------------ ... a batch file can delete itself ... -(a)todo_wine@file correctly deleted +file correctly deleted ... a batch file can alter itself ... @todo_wine(a)bar ------------ Testing setlocal/endlocal ------------

1 0

Frédéric Delanoy : cmd/tests: Add tests for combined CALLs/GOTOs.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 195ee2f3776681d4e4fb4f8a2fd0cdfd708c5dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=195ee2f3776681d4e4fb4f8a2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 11 17:14:56 2011 +0200 cmd/tests: Add tests for combined CALLs/GOTOs. --- programs/cmd/tests/test_builtins.cmd | 47 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 10 ++++++- 2 files changed, 56 insertions(+), 1 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 88265f7..046e6e4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1353,6 +1353,53 @@ if d==d goto dest4 :dest4(a)space@ echo goto with a following space worked +echo ---------- Testing combined CALLs/GOTOs ----------- +echo @echo off>foo.cmd +echo goto :eof>>foot.cmd +echo :eof>>foot.cmd +echo echo world>>foo.cmd + +echo @echo off>foot.cmd +echo echo cheball>>foot.cmd +echo.>>foot.cmd +echo call :bar>>foot.cmd +echo if "%%1"=="deleteMe" (del foot.cmd)>>foot.cmd +echo goto :eof>>foot.cmd +echo.>>foot.cmd +echo :bar>>foot.cmd +echo echo barbare>>foot.cmd +echo goto :eof>>foot.cmd + +call foo.cmd +call foot +call :bar +del foo.cmd +rem Script execution stops after the following line +foot deleteMe +call :foo +call :foot +goto :endFuns + +:foot +echo foot + +:foo +echo foo +goto :eof + +:endFuns + +:bar +echo bar +call :foo + +:baz +echo baz +goto :eof + +echo Final message is not output since earlier 'foot' processing stops script execution +echo Do NOT add any tests below this line + echo -----------Done, jumping to EOF----------- goto :eof rem Subroutine to set errorlevel and return diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index b9285b1..1e2e3df 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -757,4 +757,12 @@ goto with no leading space worked goto with a leading space worked goto with a leading tab worked goto with a following space worked ------------Done, jumping to EOF----------- +---------- Testing combined CALLs/GOTOs ----------- +world +cheball +barbare +bar +foo +baz +cheball +barbare

1 0