September 2011 - Wine-commits

Jacek Caban : vbscript: Added variable value expression support.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 07b542cc08d85144db1a6baa9f913a825d096982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07b542cc08d85144db1a6baa9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:37:08 2011 +0200 vbscript: Added variable value expression support. --- dlls/vbscript/interp.c | 42 ++++++++++++++++++++++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 45a7504..9dd74be 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -40,7 +40,8 @@ typedef HRESULT (*instr_func_t)(exec_ctx_t*); typedef enum { REF_NONE, - REF_DISP + REF_DISP, + REF_VAR } ref_type_t; typedef struct { @@ -50,6 +51,7 @@ typedef struct { IDispatch *disp; DISPID id; } d; + VARIANT *v; } u; } ref_t; @@ -59,12 +61,30 @@ typedef struct { BOOL owned; } variant_val_t; +static BOOL lookup_dynamic_vars(dynamic_var_t *var, const WCHAR *name, ref_t *ref) +{ + while(var) { + if(!strcmpiW(var->name, name)) { + ref->type = REF_VAR; + ref->u.v = &var->v; + return TRUE; + } + + var = var->next; + } + + return FALSE; +} + static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, ref_t *ref) { named_item_t *item; DISPID id; HRESULT hres; + if(lookup_dynamic_vars(ctx->script->global_vars, name, ref)) + 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); @@ -210,12 +230,26 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) vbstack_to_dp(ctx, arg_cnt, &dp); switch(ref.type) { + case REF_VAR: + if(!res) { + FIXME("REF_VAR no res\n"); + return E_NOTIMPL; + } + + if(arg_cnt) { + FIXME("arguments not implemented\n"); + return E_NOTIMPL; + } + + V_VT(res) = VT_BYREF|VT_VARIANT; + V_BYREF(res) = V_VT(ref.u.v) == (VT_VARIANT|VT_BYREF) ? V_VARIANTREF(ref.u.v) : ref.u.v; + break; case REF_DISP: hres = disp_call(ctx->script, ref.u.d.disp, ref.u.d.id, &dp, res); if(FAILED(hres)) return hres; break; - default: + case REF_NONE: FIXME("%s not found\n", debugstr_w(identifier)); return DISP_E_UNKNOWNNAME; } @@ -254,6 +288,10 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_v return hres; switch(ref.type) { + case REF_VAR: + FIXME("REF_VAR not implemented\n"); + hres = E_NOTIMPL; + break; case REF_DISP: hres = disp_propput(ctx->script, ref.u.d.disp, ref.u.d.id, val); if(own_val) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 94dc3eb..61a59d0 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -66,6 +66,7 @@ Call ok(getVT(&hffFFffFF&) = "VT_I2", "getVT(&hffFFffFF&) is not VT_I2") Call ok(getVT(1 & 100000) = "VT_BSTR", "getVT(1 & 100000) is not VT_BSTR") Call ok(getVT(-empty) = "VT_I2", "getVT(-empty) = " & getVT(-empty)) Call ok(getVT(-null) = "VT_NULL", "getVT(-null) = " & getVT(-null)) +Call ok(getVT(y) = "VT_EMPTY*", "getVT(y) = " & getVT(y)) Call ok("ab" & "cd" = "abcd", """ab"" & ""cd"" <> ""abcd""") Call ok("ab " & null = "ab ", """ab"" & null = " & ("ab " & null))

1 0

Jacek Caban : vbscript: Added support for variable assignment statements.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 79c88ea6c03c6e759a625208d0f0fd8d78736204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c88ea6c03c6e759a625208d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:37:24 2011 +0200 vbscript: Added support for variable assignment statements. --- dlls/vbscript/interp.c | 17 ++++++++++++++--- dlls/vbscript/tests/lang.vbs | 11 +++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 9dd74be..4877dcb 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -288,10 +288,21 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_v return hres; switch(ref.type) { - case REF_VAR: - FIXME("REF_VAR not implemented\n"); - hres = E_NOTIMPL; + case REF_VAR: { + VARIANT *v = ref.u.v; + + if(V_VT(v) == (VT_VARIANT|VT_BYREF)) + v = V_VARIANTREF(v); + + if(own_val) { + VariantClear(v); + *v = *val; + hres = S_OK; + }else { + hres = VariantCopy(v, val); + } break; + } case REF_DISP: hres = disp_propput(ctx->script, ref.u.d.disp, ref.u.d.id, val); if(own_val) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 61a59d0..6335069 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -42,10 +42,14 @@ Call ok(&hffFFffFF& = -1, "&hffFFffFF& <> -1") Call ok(--1 = 1, "--1 = " & --1) Call ok(-empty = 0, "-empty = " & (-empty)) +x = "xx" +Call ok(x = "xx", "x = " & x & " expected ""xx""") + 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(x <> "x", "x = ""x""") Call ok(getVT(false) = "VT_BOOL", "getVT(false) is not VT_BOOL") Call ok(getVT(true) = "VT_BOOL", "getVT(true) is not VT_BOOL") @@ -67,25 +71,32 @@ Call ok(getVT(1 & 100000) = "VT_BSTR", "getVT(1 & 100000) is not VT_BSTR") Call ok(getVT(-empty) = "VT_I2", "getVT(-empty) = " & getVT(-empty)) Call ok(getVT(-null) = "VT_NULL", "getVT(-null) = " & getVT(-null)) Call ok(getVT(y) = "VT_EMPTY*", "getVT(y) = " & getVT(y)) +x = true +Call ok(getVT(x) = "VT_BOOL*", "getVT(x) = " & getVT(x)) +x = "xx" Call ok("ab" & "cd" = "abcd", """ab"" & ""cd"" <> ""abcd""") Call ok("ab " & null = "ab ", """ab"" & null = " & ("ab " & null)) Call ok("ab " & empty = "ab ", """ab"" & empty = " & ("ab " & empty)) Call ok(1 & 100000 = "1100000", "1 & 100000 = " & (1 & 100000)) +Call ok("ab" & x = "abxx", """ab"" & x = " & ("ab"&x)) 'if(isEnglishLocale) then ' Call ok("" & true = "True", """"" & true = " & true) ' Call ok(true & false = "TrueFalse", "true & false = " & (true & false)) 'end if +x = 3 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)) +Call ok(x+x = 6, "x+x = " & (x+x)) 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)) +Call ok(2-x = -1, "2-x = " & (2-x)) reportSuccess()

1 0

Jacek Caban : vbscript: Added if statement parser implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: df3adde1868f5ac1a753af6c82c51772854f2407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3adde1868f5ac1a753af6c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:38:04 2011 +0200 vbscript: Added if statement parser implementation. --- dlls/vbscript/parse.h | 15 +++++++++++ dlls/vbscript/parser.y | 62 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index d50889d..c8ed7f0 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -80,6 +80,7 @@ typedef struct { typedef enum { STAT_ASSIGN, STAT_CALL, + STAT_IF, STAT_DIM } statement_type_t; @@ -109,6 +110,20 @@ typedef struct _dim_statement_t { dim_decl_t *dim_decls; } dim_statement_t; +typedef struct _elseif_decl_t { + expression_t *expr; + statement_t *stat; + struct _elseif_decl_t *next; +} elseif_decl_t; + +typedef struct { + statement_t stat; + expression_t *expr; + statement_t *if_stat; + elseif_decl_t *elseifs; + statement_t *else_stat; +} if_statement_t; + typedef struct { const WCHAR *code; const WCHAR *ptr; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index b5e740e..8efcc5a 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -48,8 +48,10 @@ 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 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*); #define CHECK_ERROR if(((parser_ctx_t*)ctx)->hres != S_OK) YYABORT @@ -63,6 +65,7 @@ static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*); statement_t *statement; expression_t *expression; member_expression_t *member; + elseif_decl_t *elseif; dim_decl_t *dim_decl; LONG lng; BOOL bool; @@ -86,13 +89,14 @@ static dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*); %token <lng> tLong tShort %token <dbl> tDouble -%type <statement> Statement StatementNl +%type <statement> Statement StatementNl StatementsNl IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression %type <expression> ConcatExpression AdditiveExpression ModExpression %type <expression> NotExpression UnaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt +%type <elseif> ElseIfs_opt ElseIfs ElseIf %type <dim_decl> DimDeclList %% @@ -108,6 +112,10 @@ SourceElements : /* empty */ | SourceElements StatementNl { source_add_statement(ctx, $2); } +StatementsNl + : StatementNl { $$ = $1; } + | StatementNl StatementsNl { $1->next = $2; $$ = $1; } + StatementNl : Statement tNL { $$ = $1; } @@ -117,6 +125,7 @@ Statement | MemberExpression Arguments_opt '=' Expression { $1->args = $2; $$ = new_assign_statement(ctx, $1, $4); CHECK_ERROR; } | tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; } + | IfStatement { $$ = $1; } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } @@ -126,6 +135,27 @@ DimDeclList /* FIXME: Support arrays */ : tIdentifier { $$ = new_dim_decl(ctx, $1, NULL); CHECK_ERROR; } | tIdentifier ',' DimDeclList { $$ = new_dim_decl(ctx, $1, $3); CHECK_ERROR; } +IfStatement + : tIF Expression tTHEN tNL StatementsNl ElseIfs_opt Else_opt tEND tIF + { $$ = new_if_statement(ctx, $2, $5, $6, $7); CHECK_ERROR; } + /* FIXME: short if statement */ + +ElseIfs_opt + : /* empty */ { $$ = NULL; } + | ElseIfs { $$ = $1; } + +ElseIfs + : ElseIf { $$ = $1; } + | ElseIf ElseIfs { $1->next = $2; $$ = $1; } + +ElseIf + : tELSEIF Expression tTHEN tNL StatementsNl + { $$ = new_elseif_decl(ctx, $2, $5); } + +Else_opt + : /* empty */ { $$ = NULL; } + | tELSE tNL StatementsNl { $$ = $3; } + Arguments_opt : EmptyBrackets_opt { $$ = NULL; } | '(' ArgumentList ')' { $$ = $2; } @@ -376,6 +406,36 @@ static statement_t *new_dim_statement(parser_ctx_t *ctx, dim_decl_t *decls) return &stat->stat; } +static elseif_decl_t *new_elseif_decl(parser_ctx_t *ctx, expression_t *expr, statement_t *stat) +{ + elseif_decl_t *decl; + + decl = parser_alloc(ctx, sizeof(*decl)); + if(!decl) + return NULL; + + decl->expr = expr; + decl->stat = stat; + decl->next = NULL; + return decl; +} + +static statement_t *new_if_statement(parser_ctx_t *ctx, expression_t *expr, statement_t *if_stat, elseif_decl_t *elseif_decl, + statement_t *else_stat) +{ + if_statement_t *stat; + + stat = new_statement(ctx, STAT_IF, sizeof(*stat)); + if(!stat) + return NULL; + + stat->expr = expr; + stat->if_stat = if_stat; + stat->elseifs = elseif_decl; + stat->else_stat = else_stat; + return &stat->stat; +} + void *parser_alloc(parser_ctx_t *ctx, size_t size) { void *ret;

1 0

Jacek Caban : vbscript: Added if statement compiler implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 58bd62e76d3592d57cf26e17cfec12b37353702a URL: http://source.winehq.org/git/wine.git/?a=commit;h=58bd62e76d3592d57cf26e17c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:38:38 2011 +0200 vbscript: Added if statement compiler implementation. --- dlls/vbscript/compile.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/interp.c | 12 ++++ dlls/vbscript/vbscript.h | 3 + 3 files changed, 153 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 9bdc31d..c50452a 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -33,11 +33,25 @@ typedef struct { unsigned instr_size; vbscode_t *code; + unsigned *labels; + unsigned labels_size; + unsigned labels_cnt; + dim_decl_t *dim_decls; dynamic_var_t *global_vars; } compile_ctx_t; static HRESULT compile_expression(compile_ctx_t*,expression_t*); +static HRESULT compile_statement(compile_ctx_t*,statement_t*); + +static const struct { + instr_arg_type_t arg1_type; + instr_arg_type_t arg2_type; +} instr_info[] = { +#define X(n,a,b,c) {b,c}, +OP_LIST +#undef X +}; static inline void *compiler_alloc(vbscode_t *vbscode, size_t size) { @@ -93,6 +107,18 @@ static HRESULT push_instr_int(compile_ctx_t *ctx, vbsop_t op, LONG arg) return S_OK; } +static HRESULT push_instr_addr(compile_ctx_t *ctx, vbsop_t op, unsigned arg) +{ + unsigned ret; + + ret = push_instr(ctx, op); + if(ret == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, ret)->arg1.uint = arg; + return S_OK; +} + static HRESULT push_instr_str(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) { unsigned instr; @@ -188,6 +214,35 @@ static HRESULT push_instr_bstr_uint(compile_ctx_t *ctx, vbsop_t op, const WCHAR return S_OK; } +#define LABEL_FLAG 0x80000000 + +static unsigned alloc_label(compile_ctx_t *ctx) +{ + if(!ctx->labels_size) { + ctx->labels = heap_alloc(8 * sizeof(*ctx->labels)); + if(!ctx->labels) + return -1; + ctx->labels_size = 8; + }else if(ctx->labels_size == ctx->labels_cnt) { + unsigned *new_labels; + + new_labels = heap_realloc(ctx->labels, 2*ctx->labels_size*sizeof(*ctx->labels)); + if(!new_labels) + return -1; + + ctx->labels = new_labels; + ctx->labels_size *= 2; + } + + return ctx->labels_cnt++ | LABEL_FLAG; +} + +static inline void label_set_addr(compile_ctx_t *ctx, unsigned label) +{ + assert(label & LABEL_FLAG); + ctx->labels[label & ~LABEL_FLAG] = ctx->instr_cnt; +} + static HRESULT compile_args(compile_ctx_t *ctx, expression_t *args, unsigned *ret) { unsigned arg_cnt = 0; @@ -292,6 +347,67 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return S_OK; } +static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) +{ + unsigned cnd_jmp, endif_label = -1; + elseif_decl_t *elseif_decl; + HRESULT hres; + + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + cnd_jmp = push_instr(ctx, OP_jmp_false); + if(cnd_jmp == -1) + return E_OUTOFMEMORY; + + hres = compile_statement(ctx, stat->if_stat); + if(FAILED(hres)) + return hres; + + if(stat->else_stat || stat->elseifs) { + endif_label = alloc_label(ctx); + if(endif_label == -1) + return E_OUTOFMEMORY; + + hres = push_instr_addr(ctx, OP_jmp, endif_label); + if(FAILED(hres)) + return hres; + } + + for(elseif_decl = stat->elseifs; elseif_decl; elseif_decl = elseif_decl->next) { + instr_ptr(ctx, cnd_jmp)->arg1.uint = ctx->instr_cnt; + + hres = compile_expression(ctx, elseif_decl->expr); + if(FAILED(hres)) + return hres; + + cnd_jmp = push_instr(ctx, OP_jmp_false); + if(cnd_jmp == -1) + return E_OUTOFMEMORY; + + hres = compile_statement(ctx, elseif_decl->stat); + if(FAILED(hres)) + return hres; + + hres = push_instr_addr(ctx, OP_jmp, endif_label); + if(FAILED(hres)) + return hres; + } + + instr_ptr(ctx, cnd_jmp)->arg1.uint = ctx->instr_cnt; + + if(stat->else_stat) { + hres = compile_statement(ctx, stat->else_stat); + if(FAILED(hres)) + return hres; + } + + if(endif_label != -1) + label_set_addr(ctx, endif_label); + return S_OK; +} + static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t *stat) { HRESULT hres; @@ -365,6 +481,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_IF: + hres = compile_if_statement(ctx, (if_statement_t*)stat); + break; default: FIXME("Unimplemented statement type %d\n", stat->type); hres = E_NOTIMPL; @@ -378,6 +497,21 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) return S_OK; } +static void resolve_labels(compile_ctx_t *ctx) +{ + instr_t *instr; + + for(instr = ctx->code->instrs; instr < ctx->code->instrs+ctx->instr_cnt; instr++) { + if(instr_info[instr->op].arg1_type == ARG_ADDR && (instr->arg1.uint & LABEL_FLAG)) { + assert((instr->arg1.uint & ~LABEL_FLAG) < ctx->labels_cnt); + instr->arg1.uint = ctx->labels[instr->arg1.uint & ~LABEL_FLAG]; + } + assert(instr_info[instr->op].arg2_type != ARG_ADDR); + } + + ctx->labels_cnt = 0; +} + static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *func) { HRESULT hres; @@ -391,6 +525,8 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(push_instr(ctx, OP_ret) == -1) return E_OUTOFMEMORY; + resolve_labels(ctx); + if(ctx->dim_decls) { dim_decl_t *dim_decl; dynamic_var_t *new_var; @@ -508,6 +644,8 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) ctx.global_vars = NULL; ctx.dim_decls = NULL; + ctx.labels = NULL; + ctx.labels_cnt = ctx.labels_size = 0; hres = compile_func(&ctx, ctx.parser.stats, &ctx.code->global_code); if(FAILED(hres)) { diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4877dcb..e9569fa 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -367,6 +367,18 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) return hres; } +static HRESULT interp_jmp(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_jmp_false(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 734ce8a..cf32705 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -93,6 +93,7 @@ typedef enum { ARG_BSTR, ARG_INT, ARG_UINT, + ARG_ADDR, ARG_DOUBLE } instr_arg_type_t; @@ -107,6 +108,8 @@ typedef enum { X(equal, 1, 0, 0) \ X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ + X(jmp, 0, ARG_ADDR, 0) \ + X(jmp_false, 0, ARG_ADDR, 0) \ X(long, 1, ARG_INT, 0) \ X(neg, 1, 0, 0) \ X(nequal, 1, 0, 0) \

1 0

Jacek Caban : vbscript: Added interp_jmp implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 8689884c194120339ee5853babc7ab4578e5e0f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8689884c194120339ee5853ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:38:58 2011 +0200 vbscript: Added interp_jmp implementation. --- dlls/vbscript/interp.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index e9569fa..e444016 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -191,6 +191,11 @@ static HRESULT stack_pop_disp(exec_ctx_t *ctx, IDispatch **ret) return S_OK; } +static inline void instr_jmp(exec_ctx_t *ctx, unsigned addr) +{ + ctx->instr = ctx->code->instrs + addr; +} + static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) { dp->cArgs = arg_cnt; @@ -369,8 +374,12 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) static HRESULT interp_jmp(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const unsigned arg = ctx->instr->arg1.uint; + + TRACE("%u\n", arg); + + instr_jmp(ctx, arg); + return S_OK; } static HRESULT interp_jmp_false(exec_ctx_t *ctx)

1 0

Jacek Caban : vbscript: Added interp_jmp_false implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 0722695cc089ec4d8d13eb377514132d0e23d86c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0722695cc089ec4d8d13eb377… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:39:13 2011 +0200 vbscript: Added interp_jmp_false implementation. --- dlls/vbscript/interp.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index e444016..d768aab 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -384,8 +384,24 @@ static HRESULT interp_jmp(exec_ctx_t *ctx) static HRESULT interp_jmp_false(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const unsigned arg = ctx->instr->arg1.uint; + variant_val_t val; + HRESULT hres; + + TRACE("%u\n", arg); + + hres = stack_pop_val(ctx, &val); + if(V_VT(val.v) != VT_BOOL) { + FIXME("unsupported for %s\n", debugstr_variant(val.v)); + release_val(&val); + return E_NOTIMPL; + } + + if(V_BOOL(val.v)) + ctx->instr++; + else + instr_jmp(ctx, ctx->instr->arg1.uint); + return S_OK; } static HRESULT interp_ret(exec_ctx_t *ctx)

1 0

Jacek Caban : vbscript: Added if statement tests.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: d028453f58bf86439795432e106c09ab46ad4271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d028453f58bf86439795432e1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:39:26 2011 +0200 vbscript: Added if statement tests. --- dlls/vbscript/tests/lang.vbs | 56 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 6335069..3b428f1 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -81,10 +81,10 @@ Call ok("ab " & empty = "ab ", """ab"" & empty = " & ("ab " & empty)) Call ok(1 & 100000 = "1100000", "1 & 100000 = " & (1 & 100000)) Call ok("ab" & x = "abxx", """ab"" & x = " & ("ab"&x)) -'if(isEnglishLocale) then -' Call ok("" & true = "True", """"" & true = " & true) -' Call ok(true & false = "TrueFalse", "true & false = " & (true & false)) -'end if +if(isEnglishLocale) then + Call ok("" & true = "True", """"" & true = " & true) + Call ok(true & false = "TrueFalse", "true & false = " & (true & false)) +end if x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) @@ -99,4 +99,52 @@ Call ok(getVT(2-null) = "VT_NULL", "getVT(2-null) = " & getVT(2-null)) Call ok(2-empty = 2, "2-empty = " & (2-empty)) Call ok(2-x = -1, "2-x = " & (2-x)) +if false then + ok false, "if false called" +end if + +x = true +if x then + x = false +end if +Call ok(not x, "x is false, if not evaluated?") + +x = false +If false Then + Call ok(false, "inside if false") +Else + x = true +End If +Call ok(x, "else not called?") + +x = false +If false Then + Call ok(false, "inside if false") +ElseIf not True Then + Call ok(false, "inside elseif not true") +Else + x = true +End If +Call ok(x, "else not called?") + +x = false +If false Then + Call ok(false, "inside if false") + x = 1 + y = 10+x +ElseIf not False Then + x = true +Else + Call ok(false, "inside else not true") +End If +Call ok(x, "elseif not called?") + +x = false +If false Then + Call ok(false, "inside if false") +ElseIf not False Then + x = true +End If +Call ok(x, "elseif not called?") + reportSuccess()

1 0

Jacek Caban : vbscript: Added bytecode decompiler implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: d44940cc6a52d0ec9d53cd49dc17f502260916e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d44940cc6a52d0ec9d53cd49d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:39:41 2011 +0200 vbscript: Added bytecode decompiler implementation. --- dlls/vbscript/compile.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index c50452a..71af0f3 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -25,6 +25,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +WINE_DECLARE_DEBUG_CHANNEL(vbscript_disas); typedef struct { parser_ctx_t parser; @@ -45,14 +46,51 @@ static HRESULT compile_expression(compile_ctx_t*,expression_t*); static HRESULT compile_statement(compile_ctx_t*,statement_t*); static const struct { + const char *op_str; instr_arg_type_t arg1_type; instr_arg_type_t arg2_type; } instr_info[] = { -#define X(n,a,b,c) {b,c}, +#define X(n,a,b,c) {#n,b,c}, OP_LIST #undef X }; +static void dump_instr_arg(instr_arg_type_t type, instr_arg_t *arg) +{ + switch(type) { + case ARG_STR: + case ARG_BSTR: + TRACE_(vbscript_disas)("\t%s", debugstr_w(arg->str)); + break; + case ARG_INT: + TRACE_(vbscript_disas)("\t%d", arg->uint); + break; + case ARG_UINT: + case ARG_ADDR: + TRACE_(vbscript_disas)("\t%u", arg->uint); + break; + case ARG_DOUBLE: + TRACE_(vbscript_disas)("\t%lf", *arg->dbl); + break; + case ARG_NONE: + break; + default: + assert(0); + } +} + +static void dump_code(compile_ctx_t *ctx) +{ + instr_t *instr; + + for(instr = ctx->code->instrs; instr < ctx->code->instrs+ctx->instr_cnt; instr++) { + TRACE_(vbscript_disas)("%d:\t%s", instr-ctx->code->instrs, instr_info[instr->op].op_str); + dump_instr_arg(instr_info[instr->op].arg1_type, &instr->arg1); + dump_instr_arg(instr_info[instr->op].arg2_type, &instr->arg2); + TRACE_(vbscript_disas)("\n"); + } +} + static inline void *compiler_alloc(vbscode_t *vbscode, size_t size) { return vbsheap_alloc(&vbscode->heap, size); @@ -670,6 +708,9 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) parser_release(&ctx.parser); + if(TRACE_ON(vbscript_disas)) + dump_code(&ctx); + list_add_tail(&script->code_list, &ctx.code->entry); *ret = ctx.code; return S_OK;

1 0

Jacek Caban : vbscript: Added mod expression parser/compiler implementation .
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 1c2ec6d44febc5117893f9cb94029824832744fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2ec6d44febc5117893f9cb9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:39:53 2011 +0200 vbscript: Added mod expression parser/compiler implementation. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 6 +++++- dlls/vbscript/vbscript.h | 1 + 5 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 71af0f3..99505f6 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -361,6 +361,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_equal); case EXPR_MEMBER: return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); + case EXPR_MOD: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_mod); case EXPR_NEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_NEQUAL: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d768aab..4858b0b 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -642,6 +642,12 @@ static HRESULT interp_sub(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_mod(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_neg(exec_ctx_t *ctx) { variant_val_t val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index c8ed7f0..fde8512 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -24,6 +24,7 @@ typedef enum { EXPR_EMPTY, EXPR_EQUAL, EXPR_MEMBER, + EXPR_MOD, EXPR_NEG, EXPR_NEQUAL, EXPR_NOT, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 8efcc5a..4f8aa23 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -91,7 +91,7 @@ static elseif_decl_t *new_elseif_decl(parser_ctx_t*,expression_t*,statement_t*); %type <statement> Statement StatementNl StatementsNl IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression -%type <expression> ConcatExpression AdditiveExpression ModExpression +%type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression %type <expression> NotExpression UnaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList @@ -194,6 +194,10 @@ AdditiveExpression | AdditiveExpression '-' ModExpression { $$ = new_binary_expression(ctx, EXPR_SUB, $1, $3); CHECK_ERROR; } ModExpression + : IntdivExpression { $$ = $1; } + | ModExpression tMOD IntdivExpression { $$ = new_binary_expression(ctx, EXPR_MOD, $1, $3); CHECK_ERROR; } + +IntdivExpression : UnaryExpression /* FIXME */ { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index cf32705..a33b570 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -111,6 +111,7 @@ typedef enum { X(jmp, 0, ARG_ADDR, 0) \ X(jmp_false, 0, ARG_ADDR, 0) \ X(long, 1, ARG_INT, 0) \ + X(mod, 1, 0, 0) \ X(neg, 1, 0, 0) \ X(nequal, 1, 0, 0) \ X(not, 1, 0, 0) \

1 0

Jacek Caban : vbscript: Added interp_mod implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: bb62059cc99388b2ed42e6db2585b66664a0e26d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb62059cc99388b2ed42e6db2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:40:02 2011 +0200 vbscript: Added interp_mod implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 7 +++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4858b0b..49b4621 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -644,8 +644,26 @@ static HRESULT interp_sub(exec_ctx_t *ctx) static HRESULT interp_mod(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 = VarMod(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 3b428f1..d5565bd 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -99,6 +99,13 @@ Call ok(getVT(2-null) = "VT_NULL", "getVT(2-null) = " & getVT(2-null)) Call ok(2-empty = 2, "2-empty = " & (2-empty)) Call ok(2-x = -1, "2-x = " & (2-x)) +Call ok(9 Mod 6 = 3, "9 Mod 6 = " & (9 Mod 6)) +Call ok(11.6 Mod 5.5 = False, "11.6 Mod 5.5 = " & (11.6 Mod 5.5 = 0.6)) +Call ok(7 Mod 4+2 = 5, "7 Mod 4+2 <> 5") +Call ok(getVT(2 mod null) = "VT_NULL", "getVT(2 mod null) = " & getVT(2 mod null)) +Call ok(getVT(null mod 2) = "VT_NULL", "getVT(null mod 2) = " & getVT(null mod 2)) +'FIXME: Call ok(empty mod 2 = 0, "empty mod 2 = " & (empty mod 2)) + if false then ok false, "if false called" end if

1 0