wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

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 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 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 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 dim statement compiler implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: d1c152756c3fd6461f4cab9d29cb993c2d0a30ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c152756c3fd6461f4cab9d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:36:47 2011 +0200 vbscript: Added dim statement compiler implementation. --- dlls/vbscript/compile.c | 104 ++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/lang.vbs | 2 + dlls/vbscript/vbscript.h | 8 +++ 3 files changed, 114 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 877780d..9bdc31d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -32,6 +32,9 @@ typedef struct { unsigned instr_cnt; unsigned instr_size; vbscode_t *code; + + dim_decl_t *dim_decls; + dynamic_var_t *global_vars; } compile_ctx_t; static HRESULT compile_expression(compile_ctx_t*,expression_t*); @@ -315,6 +318,38 @@ static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t * return hres; } +static BOOL lookup_dim_decls(compile_ctx_t *ctx, const WCHAR *name) +{ + dim_decl_t *dim_decl; + + for(dim_decl = ctx->dim_decls; dim_decl; dim_decl = dim_decl->next) { + if(!strcmpiW(dim_decl->name, name)) + return TRUE; + } + + return FALSE; +} + +static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) +{ + dim_decl_t *dim_decl = stat->dim_decls; + + while(1) { + if(lookup_dim_decls(ctx, dim_decl->name)) { + FIXME("dim %s name redefined\n", debugstr_w(dim_decl->name)); + return E_FAIL; + } + + if(!dim_decl->next) + break; + dim_decl = dim_decl->next; + } + + dim_decl->next = ctx->dim_decls; + ctx->dim_decls = stat->dim_decls; + return S_OK; +} + static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) { HRESULT hres; @@ -327,6 +362,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_CALL: hres = compile_member_expression(ctx, ((call_statement_t*)stat)->expr, FALSE); break; + case STAT_DIM: + hres = compile_dim_statement(ctx, (dim_statement_t*)stat); + break; default: FIXME("Unimplemented statement type %d\n", stat->type); hres = E_NOTIMPL; @@ -353,6 +391,52 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(push_instr(ctx, OP_ret) == -1) return E_OUTOFMEMORY; + if(ctx->dim_decls) { + dim_decl_t *dim_decl; + dynamic_var_t *new_var; + + for(dim_decl = ctx->dim_decls; dim_decl; dim_decl = dim_decl->next) { + new_var = compiler_alloc(ctx->code, sizeof(*new_var)); + if(!new_var) + return E_OUTOFMEMORY; + + new_var->name = compiler_alloc_string(ctx->code, dim_decl->name); + if(!new_var->name) + return E_OUTOFMEMORY; + + V_VT(&new_var->v) = VT_EMPTY; + + new_var->next = ctx->global_vars; + ctx->global_vars = new_var; + } + } + + return S_OK; +} + +static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifier) +{ + dynamic_var_t *var; + + for(var = script->global_vars; var; var = var->next) { + if(!strcmpiW(var->name, identifier)) + return TRUE; + } + + return FALSE; +} + +static HRESULT check_script_collisions(compile_ctx_t *ctx, script_ctx_t *script) +{ + dynamic_var_t *var; + + for(var = ctx->global_vars; var; var = var->next) { + if(lookup_script_identifier(script, var->name)) { + FIXME("%s: redefined\n", debugstr_w(var->name)); + return E_FAIL; + } + } + return S_OK; } @@ -422,12 +506,32 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) if(!ctx.code) return E_OUTOFMEMORY; + ctx.global_vars = NULL; + ctx.dim_decls = NULL; + hres = compile_func(&ctx, ctx.parser.stats, &ctx.code->global_code); if(FAILED(hres)) { release_vbscode(ctx.code); return hres; } + hres = check_script_collisions(&ctx, script); + if(FAILED(hres)) { + release_vbscode(ctx.code); + return hres; + } + + if(ctx.global_vars) { + dynamic_var_t *var; + + for(var = ctx.global_vars; var->next; var = var->next); + + var->next = script->global_vars; + script->global_vars = ctx.global_vars; + } + + parser_release(&ctx.parser); + list_add_tail(&script->code_list, &ctx.code->entry); *ret = ctx.code; return S_OK; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 2e81643..94dc3eb 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -18,6 +18,8 @@ Option Explicit +dim x, y + call ok(true, "true is not true?") ok true, "true is not true?" call ok((true), "true is not true?") diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 226f0d2..734ce8a 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -65,6 +65,12 @@ 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*); +typedef struct _dynamic_var_t { + struct _dynamic_var_t *next; + VARIANT v; + const WCHAR *name; +} dynamic_var_t; + struct _script_ctx_t { IActiveScriptSite *site; LCID lcid; @@ -73,6 +79,8 @@ struct _script_ctx_t { vbdisp_t *script_obj; + dynamic_var_t *global_vars; + struct list code_list; struct list named_items; };

1 0

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

13 Sep '11

Module: wine Branch: master Commit: 924da4056bf7a83712c85705f911721666858077 URL: http://source.winehq.org/git/wine.git/?a=commit;h=924da4056bf7a83712c85705f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:36:26 2011 +0200 vbscript: Added dim statement parser implementation. --- dlls/vbscript/parse.h | 13 ++++++++++++- dlls/vbscript/parser.y | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index f7b9436..d50889d 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -79,7 +79,8 @@ typedef struct { typedef enum { STAT_ASSIGN, - STAT_CALL + STAT_CALL, + STAT_DIM } statement_type_t; typedef struct _statement_t { @@ -98,6 +99,16 @@ typedef struct { expression_t *value_expr; } assign_statement_t; +typedef struct _dim_decl_t { + const WCHAR *name; + struct _dim_decl_t *next; +} dim_decl_t; + +typedef struct _dim_statement_t { + statement_t stat; + dim_decl_t *dim_decls; +} dim_statement_t; + typedef struct { const WCHAR *code; const WCHAR *ptr; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 5d9ae7d..b5e740e 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -46,7 +46,10 @@ 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*); +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 dim_decl_t *new_dim_decl(parser_ctx_t*,const WCHAR*,dim_decl_t*); #define CHECK_ERROR if(((parser_ctx_t*)ctx)->hres != S_OK) YYABORT @@ -60,6 +63,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); statement_t *statement; expression_t *expression; member_expression_t *member; + dim_decl_t *dim_decl; LONG lng; BOOL bool; double dbl; @@ -89,6 +93,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt +%type <dim_decl> DimDeclList %% @@ -111,11 +116,16 @@ Statement | 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; } + | tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } | CallExpression '.' tIdentifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } +DimDeclList /* FIXME: Support arrays */ + : tIdentifier { $$ = new_dim_decl(ctx, $1, NULL); CHECK_ERROR; } + | tIdentifier ',' DimDeclList { $$ = new_dim_decl(ctx, $1, $3); CHECK_ERROR; } + Arguments_opt : EmptyBrackets_opt { $$ = NULL; } | '(' ArgumentList ')' { $$ = $2; } @@ -341,6 +351,31 @@ static statement_t *new_assign_statement(parser_ctx_t *ctx, member_expression_t return &stat->stat; } +static dim_decl_t *new_dim_decl(parser_ctx_t *ctx, const WCHAR *name, dim_decl_t *next) +{ + dim_decl_t *decl; + + decl = parser_alloc(ctx, sizeof(*decl)); + if(!decl) + return NULL; + + decl->name = name; + decl->next = next; + return decl; +} + +static statement_t *new_dim_statement(parser_ctx_t *ctx, dim_decl_t *decls) +{ + dim_statement_t *stat; + + stat = new_statement(ctx, STAT_DIM, sizeof(*stat)); + if(!stat) + return NULL; + + stat->dim_decls = decls; + return &stat->stat; +} + void *parser_alloc(parser_ctx_t *ctx, size_t size) { void *ret;

1 0

Jacek Caban : vbscript: Added object member assignment tests.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 29ccac7966d41e84cc93eaab592b04cc368393b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ccac7966d41e84cc93eaab5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:36:07 2011 +0200 vbscript: Added object member assignment tests. --- dlls/vbscript/tests/run.c | 113 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 101 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index e9beab9..aa2e3f1 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -60,6 +60,8 @@ DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_vbvar_d); DEFINE_EXPECT(global_vbvar_i); +DEFINE_EXPECT(testobj_propput_d); +DEFINE_EXPECT(testobj_propput_i); #define DISPID_GLOBAL_REPORTSUCCESS 1000 #define DISPID_GLOBAL_TRACE 1001 @@ -67,6 +69,9 @@ DEFINE_EXPECT(global_vbvar_i); #define DISPID_GLOBAL_GETVT 1003 #define DISPID_GLOBAL_ISENGLOC 1004 #define DISPID_GLOBAL_VBVAR 1005 +#define DISPID_GLOBAL_TESTOBJ 1006 + +#define DISPID_TESTOBJ_PROPPUT 2001 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -226,6 +231,64 @@ static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown return E_NOTIMPL; } +static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) +{ + if(!strcmp_wa(bstrName, "propput")) { + CHECK_EXPECT(testobj_propput_d); + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_TESTOBJ_PROPPUT; + return S_OK; + } + + ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); + return DISP_E_UNKNOWNNAME; +} + +static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + switch(id) { + case DISPID_TESTOBJ_PROPPUT: + CHECK_EXPECT(testobj_propput_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) == 1, "V_I2(psp->rgvargs) = %d\n", V_I2(pdp->rgvarg)); + return S_OK; + } + + ok(0, "unexpected call %d\n", id); + return E_FAIL; +} + +static IDispatchExVtbl testObjVtbl = { + DispatchEx_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + testObj_GetDispID, + testObj_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx testObj = { &testObjVtbl }; static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { @@ -255,6 +318,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_ISENGLOC; return S_OK; } + if(!strcmp_wa(bstrName, "testObj")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_TESTOBJ; + return S_OK; + } if(!strcmp_wa(bstrName, "vbvar")) { CHECK_EXPECT(global_vbvar_d); test_grfdex(grfdex, fdexNameCaseInsensitive); @@ -328,18 +396,18 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; case DISPID_GLOBAL_GETVT: - ok(pdp != NULL, "pdp == NULL\n"); - ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); - ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); - ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); - ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); - ok(pvarRes != NULL, "pvarRes == NULL\n"); - ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); - ok(pei != NULL, "pei == NULL\n"); - - V_VT(pvarRes) = VT_BSTR; - V_BSTR(pvarRes) = a2bstr(vt2a(pdp->rgvarg)); - return S_OK; + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_BSTR; + V_BSTR(pvarRes) = a2bstr(vt2a(pdp->rgvarg)); + return S_OK; case DISPID_GLOBAL_ISENGLOC: ok(wFlags == (INVOKE_FUNC|INVOKE_PROPERTYGET), "wFlags = %x\n", wFlags); @@ -376,6 +444,21 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(V_I2(pdp->rgvarg) == 3, "V_I2(psp->rgvargs) = %d\n", V_I2(pdp->rgvarg)); return S_OK; + + case DISPID_GLOBAL_TESTOBJ: + ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); + + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgvarg, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch*)&testObj; + return S_OK; } ok(0, "unexpected call %d\n", id); @@ -690,6 +773,12 @@ static void run_tests(void) CHECK_CALLED(global_vbvar_d); CHECK_CALLED(global_vbvar_i); + SET_EXPECT(testobj_propput_d); + SET_EXPECT(testobj_propput_i); + parse_script_a("testObj.propput = 1"); + CHECK_CALLED(testobj_propput_d); + CHECK_CALLED(testobj_propput_i); + run_from_res("lang.vbs"); }

1 0

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

13 Sep '11

Module: wine Branch: master Commit: 151056bde2848c20505914c67627ea8c1fbe3300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=151056bde2848c20505914c67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:35:50 2011 +0200 vbscript: Added interp_assign_member implementation. --- dlls/vbscript/interp.c | 59 +++++++++++++++++++++++++++++++++++++++- dlls/vbscript/vbscript.h | 2 + dlls/vbscript/vbscript_main.c | 32 ++++++++++++++++++++++ 3 files changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 3212935..45a7504 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -144,6 +144,33 @@ static inline void release_val(variant_val_t *v) VariantClear(v->v); } +static HRESULT stack_pop_disp(exec_ctx_t *ctx, IDispatch **ret) +{ + VARIANT *v = stack_pop(ctx); + + if(V_VT(v) == VT_DISPATCH) { + *ret = V_DISPATCH(v); + return S_OK; + } + + if(V_VT(v) != (VT_VARIANT|VT_BYREF)) { + FIXME("not supported type: %s\n", debugstr_variant(v)); + VariantClear(v); + return E_FAIL; + } + + v = V_BYREF(v); + if(V_VT(v) != VT_DISPATCH) { + FIXME("not disp %s\n", debugstr_variant(v)); + return E_FAIL; + } + + if(V_DISPATCH(v)) + IDispatch_AddRef(V_DISPATCH(v)); + *ret = V_DISPATCH(v); + return S_OK; +} + static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) { dp->cArgs = arg_cnt; @@ -259,8 +286,36 @@ static HRESULT interp_assign_ident(exec_ctx_t *ctx) static HRESULT interp_assign_member(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + BSTR identifier = ctx->instr->arg1.bstr; + variant_val_t val; + IDispatch *obj; + DISPID id; + HRESULT hres; + + TRACE("%s\n", debugstr_w(identifier)); + + hres = stack_pop_disp(ctx, &obj); + if(FAILED(hres)) + return hres; + + if(!obj) { + FIXME("NULL obj\n"); + return E_FAIL; + } + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) { + IDispatch_Release(obj); + return hres; + } + + hres = disp_get_id(obj, identifier, &id); + if(SUCCEEDED(hres)) + hres = disp_propput(ctx->script, obj, id, val.v); + + release_val(&val); + IDispatch_Release(obj); + return hres; } static HRESULT interp_ret(exec_ctx_t *ctx) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 6367c12..226f0d2 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -158,6 +158,8 @@ HRESULT exec_script(script_ctx_t*,function_t*) DECLSPEC_HIDDEN; HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); +const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 1527281..43ab484 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -31,6 +31,38 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static HINSTANCE vbscript_hinstance; +const char *debugstr_variant(const VARIANT *v) +{ + if(!v) + return "(null)"; + + if(V_ISBYREF(v)) + return wine_dbg_sprintf("{V_BYREF -> %s}", debugstr_variant(V_BYREF(v))); + + switch(V_VT(v)) { + case VT_EMPTY: + return "{VT_EMPTY}"; + case VT_NULL: + return "{VT_NULL}"; + case VT_I2: + return wine_dbg_sprintf("{VT_I2: %d}", V_I2(v)); + case VT_I4: + return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); + case VT_UI4: + return wine_dbg_sprintf("{VT_UI4: %u}", V_UI4(v)); + case VT_R8: + return wine_dbg_sprintf("{VT_R8: %lf}", V_R8(v)); + case VT_BSTR: + return wine_dbg_sprintf("{VT_BSTR: %s}", debugstr_w(V_BSTR(v))); + case VT_DISPATCH: + return wine_dbg_sprintf("{VT_DISPATCH: %p}", V_DISPATCH(v)); + case VT_BOOL: + return wine_dbg_sprintf("{VT_BOOL: %x}", V_BOOL(v)); + default: + return wine_dbg_sprintf("{vt %d}", V_VT(v)); + } +} + #define MIN_BLOCK_SIZE 128 static inline DWORD block_size(DWORD block)

1 0

Jacek Caban : vbscipt: Added object member assign parser/ compiler implementation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: a822569db2ec0fab893af53d97a1331720cc3211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a822569db2ec0fab893af53d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 13 11:35:33 2011 +0200 vbscipt: Added object member assign parser/compiler implementation. --- dlls/vbscript/compile.c | 7 +++++-- dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parser.y | 4 ++-- dlls/vbscript/vbscript.h | 1 + 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 8cc55c7..877780d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -303,8 +303,11 @@ static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t * } if(stat->member_expr->obj_expr) { - FIXME("obj_expr not implemented\n"); - hres = E_NOTIMPL; + hres = compile_expression(ctx, stat->member_expr->obj_expr); + if(FAILED(hres)) + return hres; + + hres = push_instr_bstr(ctx, OP_assign_member, stat->member_expr->identifier); }else { hres = push_instr_bstr(ctx, OP_assign_ident, stat->member_expr->identifier); } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4099642..3212935 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -257,6 +257,12 @@ static HRESULT interp_assign_ident(exec_ctx_t *ctx) return assign_ident(ctx, arg, v.v, v.owned); } +static HRESULT interp_assign_member(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_ret(exec_ctx_t *ctx) { TRACE("\n"); diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 0d56acd..5d9ae7d 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -113,8 +113,8 @@ Statement { $1->args = $2; $$ = new_assign_statement(ctx, $1, $4); CHECK_ERROR; } MemberExpression - : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } - /* FIXME: MemberExpressionArgs '.' tIdentifier */ + : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } + | CallExpression '.' tIdentifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } Arguments_opt : EmptyBrackets_opt { $$ = NULL; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 49b2cfa..6367c12 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -91,6 +91,7 @@ typedef enum { #define OP_LIST \ X(add, 1, 0, 0) \ X(assign_ident, 1, ARG_BSTR, 0) \ + X(assign_member, 1, ARG_BSTR, 0) \ X(bool, 1, ARG_INT, 0) \ X(concat, 1, 0, 0) \ X(double, 1, ARG_DOUBLE, 0) \

1 0

Andrew Talbot : winspool.drv: Const-correctness fix.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 4c7f394b74f07aebb4793b88e79dd979e7e61ebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7f394b74f07aebb4793b88e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Sep 12 23:18:01 2011 +0100 winspool.drv: Const-correctness fix. --- dlls/winspool.drv/info.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index cb74482..abc8478 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -516,6 +516,8 @@ static BOOL CUPS_LoadPrinters(void) static BOOL PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { PRINTER_INFO_2A pinfo2a; + const char *r; + size_t name_len; char *e,*s,*name,*prettyname,*devname; BOOL ret = FALSE, set_default = FALSE; char *port = NULL, *env_default; @@ -523,14 +525,17 @@ PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { WCHAR devnameW[MAX_PATH]; while (isspace(*pent)) pent++; - s = strchr(pent,':'); - if(s) *s='\0'; - name = HeapAlloc(GetProcessHeap(), 0, strlen(pent) + 1); - strcpy(name,pent); - if(s) { - *s=':'; - pent = s; - } else + r = strchr(pent,':'); + if (r) + name_len = r - pent; + else + name_len = strlen(pent); + name = HeapAlloc(GetProcessHeap(), 0, name_len + 1); + memcpy(name, pent, name_len); + name[name_len] = '\0'; + if (r) + pent = r; + else pent = ""; TRACE("name=%s entry=%s\n",name, pent);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011