September 2011 - Wine-commits

Jacek Caban : vbscript: Store global functions in script_ctx_t.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 190ea000104758726de93f91419e183fa8f10039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=190ea000104758726de93f914… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:55:32 2011 +0200 vbscript: Store global functions in script_ctx_t. --- dlls/vbscript/compile.c | 21 +++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 4e8cd06..651bf7c 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -674,18 +674,25 @@ static HRESULT create_function(compile_ctx_t *ctx, function_decl_t *decl, functi static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifier) { dynamic_var_t *var; + function_t *func; for(var = script->global_vars; var; var = var->next) { if(!strcmpiW(var->name, identifier)) return TRUE; } + for(func = script->global_funcs; func; func = func->next) { + if(!strcmpiW(func->name, identifier)) + return TRUE; + } + return FALSE; } static HRESULT check_script_collisions(compile_ctx_t *ctx, script_ctx_t *script) { dynamic_var_t *var; + function_t *func; for(var = ctx->global_vars; var; var = var->next) { if(lookup_script_identifier(script, var->name)) { @@ -694,6 +701,13 @@ static HRESULT check_script_collisions(compile_ctx_t *ctx, script_ctx_t *script) } } + for(func = ctx->funcs; func; func = func->next) { + if(lookup_script_identifier(script, func->name)) { + FIXME("%s: redefined\n", debugstr_w(func->name)); + return E_FAIL; + } + } + return S_OK; } @@ -815,6 +829,13 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) script->global_vars = ctx.global_vars; } + if(ctx.funcs) { + for(new_func = ctx.funcs; new_func->next; new_func = new_func->next); + + new_func->next = script->global_funcs; + script->global_funcs = ctx.funcs; + } + if(TRACE_ON(vbscript_disas)) dump_code(&ctx); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 41dea38..32b19ab 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -80,6 +80,7 @@ struct _script_ctx_t { vbdisp_t *script_obj; dynamic_var_t *global_vars; + function_t *global_funcs; struct list code_list; struct list named_items;

1 0

Jacek Caban : vbscript: Added functions lookup implementation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

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

1 0

Jacek Caban : vbscript: Added function invocation supprot to do_icall.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 48d04b220b0e150f796dc47c3812cc72863574b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d04b220b0e150f796dc47c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:56:01 2011 +0200 vbscript: Added function invocation supprot to do_icall. --- dlls/vbscript/interp.c | 18 +++++++++++++++--- dlls/vbscript/tests/lang.vbs | 4 ++++ dlls/vbscript/vbscript.c | 2 +- dlls/vbscript/vbscript.h | 7 ++++++- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index adec28f..b697988 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -266,8 +266,10 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) return hres; break; case REF_FUNC: - FIXME("functions not implemented\n"); - return E_NOTIMPL; + hres = exec_script(ctx->script, ref.u.f, &dp, res); + if(FAILED(hres)) + return hres; + break; case REF_NONE: FIXME("%s not found\n", debugstr_w(identifier)); return DISP_E_UNKNOWNNAME; @@ -812,12 +814,22 @@ OP_LIST #undef X }; -HRESULT exec_script(script_ctx_t *ctx, function_t *func) +HRESULT exec_script(script_ctx_t *ctx, function_t *func, DISPPARAMS *dp, VARIANT *res) { exec_ctx_t exec; vbsop_t op; HRESULT hres = S_OK; + if(res) { + FIXME("returning value is not implemented\n"); + return E_NOTIMPL; + } + + if(dp && arg_cnt(dp)) { + FIXME("arguments not implemented\n"); + return E_NOTIMPL; + } + exec.stack_size = 16; exec.top = 0; exec.stack = heap_alloc(exec.stack_size * sizeof(VARIANT)); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 60ca988..0c4c10f 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -175,4 +175,8 @@ Sub testsub End Sub end if +x = false +Call testsub +Call ok(x, "x is false, testsub not called?") + reportSuccess() diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index f6891c7..cb28a9a 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -77,7 +77,7 @@ static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code) code->global_executed = TRUE; IActiveScriptSite_OnEnterScript(ctx->site); - hres = exec_script(ctx, &code->global_code); + hres = exec_script(ctx, &code->global_code, NULL, NULL); IActiveScriptSite_OnLeaveScript(ctx->site); return hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 32b19ab..d541e9d 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -65,6 +65,11 @@ 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*); +static inline unsigned arg_cnt(const DISPPARAMS *dp) +{ + return dp->cArgs - dp->cNamedArgs; +} + typedef struct _dynamic_var_t { struct _dynamic_var_t *next; VARIANT v; @@ -179,7 +184,7 @@ struct _vbscode_t { void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; HRESULT compile_script(script_ctx_t*,const WCHAR*,vbscode_t**) DECLSPEC_HIDDEN; -HRESULT exec_script(script_ctx_t*,function_t*) DECLSPEC_HIDDEN; +HRESULT exec_script(script_ctx_t*,function_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**);

1 0

Jacek Caban : vbscript: Added function arguments compiler implementation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 0c0b252c247e022673bfba7afa39e389947a62ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0b252c247e022673bfba7af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 13:55:57 2011 +0200 vbscript: Added function arguments compiler implementation. --- dlls/vbscript/compile.c | 23 +++++++++++++++++++++-- dlls/vbscript/vbscript.h | 7 +++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 651bf7c..386caf7 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -658,9 +658,26 @@ static HRESULT create_function(compile_ctx_t *ctx, function_decl_t *decl, functi func->code_ctx = ctx->code; func->type = decl->type; + func->arg_cnt = 0; if(decl->args) { - FIXME("arguments not implemented\n"); - return E_NOTIMPL; + arg_decl_t *arg; + unsigned i; + + for(arg = decl->args; arg; arg = arg->next) + func->arg_cnt++; + + func->args = compiler_alloc(ctx->code, func->arg_cnt * sizeof(arg_desc_t)); + if(!func->args) + return E_OUTOFMEMORY; + + for(i = 0, arg = decl->args; arg; arg = arg->next, i++) { + func->args[i].name = compiler_alloc_string(ctx->code, arg->name); + if(!func->args[i].name) + return E_OUTOFMEMORY; + func->args[i].by_ref = arg->by_ref; + } + }else { + func->args = NULL; } hres = compile_func(ctx, decl->body, func); @@ -761,6 +778,8 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ret->global_code.type = FUNC_GLOBAL; ret->global_code.name = NULL; ret->global_code.code_ctx = ret; + ret->global_code.arg_cnt = 0; + ret->global_code.args = NULL; list_init(&ret->entry); return ret; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index d541e9d..0e6d57e 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -152,6 +152,11 @@ typedef struct { instr_arg_t arg2; } instr_t; +typedef struct { + const WCHAR *name; + BOOL by_ref; +} arg_desc_t; + typedef enum { FUNC_GLOBAL, FUNC_SUB @@ -160,6 +165,8 @@ typedef enum { struct _function_t { function_type_t type; const WCHAR *name; + arg_desc_t *args; + unsigned arg_cnt; unsigned code_off; vbscode_t *code_ctx; function_t *next;

1 0

Jacek Caban : vbscript: Added interpreter support for sub arguments.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: c846a5925b7571a6a8ba1db4d651884c779ab813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c846a5925b7571a6a8ba1db4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:56:45 2011 +0200 vbscript: Added interpreter support for sub arguments. --- dlls/vbscript/interp.c | 70 +++++++++++++++++++++++++++++++++++++++++---- dlls/vbscript/vbscript.h | 5 +++ 2 files changed, 68 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index b697988..9dbce68 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -31,6 +31,8 @@ typedef struct { script_ctx_t *script; function_t *func; + VARIANT *args; + unsigned stack_size; unsigned top; VARIANT *stack; @@ -82,9 +84,18 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, ref_t *ref) { named_item_t *item; function_t *func; + unsigned i; DISPID id; HRESULT hres; + for(i=0; i < ctx->func->arg_cnt; i++) { + if(!strcmpiW(ctx->func->args[i].name, name)) { + ref->type = REF_VAR; + ref->u.v = ctx->args+i; + return S_OK; + } + } + if(lookup_dynamic_vars(ctx->script->global_vars, name, ref)) return S_OK; @@ -814,9 +825,22 @@ OP_LIST #undef X }; +static void release_exec(exec_ctx_t *ctx) +{ + if(ctx->args) { + unsigned i; + + for(i=0; i < ctx->func->arg_cnt; i++) + VariantClear(ctx->args+i); + } + + heap_free(ctx->args); + heap_free(ctx->stack); +} + HRESULT exec_script(script_ctx_t *ctx, function_t *func, DISPPARAMS *dp, VARIANT *res) { - exec_ctx_t exec; + exec_ctx_t exec = {func->code_ctx}; vbsop_t op; HRESULT hres = S_OK; @@ -825,18 +849,50 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, DISPPARAMS *dp, VARIANT return E_NOTIMPL; } - if(dp && arg_cnt(dp)) { - FIXME("arguments not implemented\n"); - return E_NOTIMPL; + exec.code = func->code_ctx; + + if(dp ? func->arg_cnt != arg_cnt(dp) : func->arg_cnt) { + FIXME("wrong arg_cnt %d, expected %d\n", dp ? arg_cnt(dp) : 0, func->arg_cnt); + return E_FAIL; + } + + if(func->arg_cnt) { + VARIANT *v; + unsigned i; + + exec.args = heap_alloc_zero(func->arg_cnt * sizeof(VARIANT)); + if(!exec.args) { + release_exec(&exec); + return E_OUTOFMEMORY; + } + + for(i=0; i < func->arg_cnt; i++) { + v = get_arg(dp, i); + if(V_VT(v) == (VT_VARIANT|VT_BYREF)) { + if(func->args[i].by_ref) + exec.args[i] = *v; + else + hres = VariantCopy(exec.args+i, V_VARIANTREF(v)); + }else { + hres = VariantCopy(exec.args+i, v); + } + if(FAILED(hres)) { + release_exec(&exec); + return hres; + } + } + }else { + exec.args = NULL; } exec.stack_size = 16; exec.top = 0; exec.stack = heap_alloc(exec.stack_size * sizeof(VARIANT)); - if(!exec.stack) + if(!exec.stack) { + release_exec(&exec); return E_OUTOFMEMORY; + } - exec.code = func->code_ctx; exec.instr = exec.code->instrs + func->code_off; exec.script = ctx; exec.func = func; @@ -854,7 +910,7 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, DISPPARAMS *dp, VARIANT } assert(!exec.top); - heap_free(exec.stack); + release_exec(&exec); return hres; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 0e6d57e..1362d9e 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -70,6 +70,11 @@ static inline unsigned arg_cnt(const DISPPARAMS *dp) return dp->cArgs - dp->cNamedArgs; } +static inline VARIANT *get_arg(DISPPARAMS *dp, DWORD i) +{ + return dp->rgvarg + dp->cArgs-i-1; +} + typedef struct _dynamic_var_t { struct _dynamic_var_t *next; VARIANT v;

1 0

Jacek Caban : vbscript: Added sub argument tests.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 1936dd7ee79a5f3a38c38e528f467883e0770aeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1936dd7ee79a5f3a38c38e528… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:57:14 2011 +0200 vbscript: Added sub argument tests. --- dlls/vbscript/tests/lang.vbs | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 0c4c10f..100f93b 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -179,4 +179,46 @@ x = false Call testsub Call ok(x, "x is false, testsub not called?") +Sub SubSetTrue(v) + Call ok(not v, "v is not true") + v = true +End Sub + +x = false +SubSetTrue x +Call ok(x, "x was not set by SubSetTrue") + +SubSetTrue false +Call ok(not false, "false is no longer false?") + +Sub SubSetTrue2(ByRef v) + Call ok(not v, "v is not true") + v = true +End Sub + +x = false +SubSetTrue2 x +Call ok(x, "x was not set by SubSetTrue") + +Sub TestSubArgVal(ByVal v) + Call ok(not v, "v is not false") + v = true + Call ok(v, "v is not true?") +End Sub + +x = false +Call TestSubArgVal(x) +Call ok(not x, "x is true after TestSubArgVal call?") + +Sub TestSubMultiArgs(a,b,c,d,e) + Call ok(a=1, "a = " & a) + Call ok(b=2, "b = " & b) + Call ok(c=3, "c = " & c) + Call ok(d=4, "d = " & d) + Call ok(e=5, "e = " & e) +End Sub + +TestSubMultiArgs 1, 2, 3, 4, 5 +Call TestSubMultiArgs(1, 2, 3, 4, 5) + reportSuccess()

1 0

Jacek Caban : vbscript: Added exit sub statement implementation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

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

1 0

Jacek Caban : vbscript: Added support for sub local variables.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 0b9b021aa3f3a9412f588d8a25f72bb9a7f524d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b9b021aa3f3a9412f588d8a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:57:37 2011 +0200 vbscript: Added support for sub local variables. --- dlls/vbscript/compile.c | 37 ++++++++++++++++++++++++++++++++++--- dlls/vbscript/interp.c | 29 +++++++++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 11 +++++++++++ dlls/vbscript/vbscript.h | 6 ++++++ 4 files changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 84a97a7..dd756b3 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -500,12 +500,24 @@ static BOOL lookup_dim_decls(compile_ctx_t *ctx, const WCHAR *name) return FALSE; } +static BOOL lookup_args_name(compile_ctx_t *ctx, const WCHAR *name) +{ + unsigned i; + + for(i = 0; i < ctx->func->arg_cnt; i++) { + if(!strcmpiW(ctx->func->args[i].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)) { + if(lookup_dim_decls(ctx, dim_decl->name) || lookup_args_name(ctx, dim_decl->name)) { FIXME("dim %s name redefined\n", debugstr_w(dim_decl->name)); return E_FAIL; } @@ -517,6 +529,7 @@ static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) dim_decl->next = ctx->dim_decls; ctx->dim_decls = stat->dim_decls; + ctx->func->var_cnt++; return S_OK; } @@ -627,12 +640,14 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f resolve_labels(ctx, func->code_off); - if(ctx->dim_decls) { + if(func->var_cnt) { dim_decl_t *dim_decl; if(func->type == FUNC_GLOBAL) { dynamic_var_t *new_var; + func->var_cnt = 0; + 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) @@ -648,7 +663,19 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f ctx->global_vars = new_var; } }else { - FIXME("var not implemented for functions\n"); + unsigned i; + + func->vars = compiler_alloc(ctx->code, func->var_cnt * sizeof(var_desc_t)); + if(!func->vars) + return E_OUTOFMEMORY; + + for(dim_decl = ctx->dim_decls, i=0; dim_decl; dim_decl = dim_decl->next, i++) { + func->vars[i].name = compiler_alloc_string(ctx->code, dim_decl->name); + if(!func->vars[i].name) + return E_OUTOFMEMORY; + } + + assert(i == func->var_cnt); } } @@ -685,6 +712,8 @@ static HRESULT create_function(compile_ctx_t *ctx, function_decl_t *decl, functi if(!func->name) return E_OUTOFMEMORY; + func->vars = NULL; + func->var_cnt = 0; func->code_ctx = ctx->code; func->type = decl->type; @@ -808,6 +837,8 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ret->global_code.type = FUNC_GLOBAL; ret->global_code.name = NULL; ret->global_code.code_ctx = ret; + ret->global_code.vars = NULL; + ret->global_code.var_cnt = 0; ret->global_code.arg_cnt = 0; ret->global_code.args = NULL; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 9dbce68..bb2c282 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -32,6 +32,7 @@ typedef struct { function_t *func; VARIANT *args; + VARIANT *vars; unsigned stack_size; unsigned top; @@ -88,6 +89,14 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, ref_t *ref) DISPID id; HRESULT hres; + for(i=0; i < ctx->func->var_cnt; i++) { + if(!strcmpiW(ctx->func->vars[i].name, name)) { + ref->type = REF_VAR; + ref->u.v = ctx->vars+i; + return TRUE; + } + } + for(i=0; i < ctx->func->arg_cnt; i++) { if(!strcmpiW(ctx->func->args[i].name, name)) { ref->type = REF_VAR; @@ -827,14 +836,20 @@ OP_LIST static void release_exec(exec_ctx_t *ctx) { - if(ctx->args) { - unsigned i; + unsigned i; + if(ctx->args) { for(i=0; i < ctx->func->arg_cnt; i++) VariantClear(ctx->args+i); } + if(ctx->vars) { + for(i=0; i < ctx->func->var_cnt; i++) + VariantClear(ctx->vars+i); + } + heap_free(ctx->args); + heap_free(ctx->vars); heap_free(ctx->stack); } @@ -885,6 +900,16 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, DISPPARAMS *dp, VARIANT exec.args = NULL; } + if(func->var_cnt) { + exec.vars = heap_alloc_zero(func->var_cnt * sizeof(VARIANT)); + if(!exec.vars) { + release_exec(&exec); + return E_OUTOFMEMORY; + } + }else { + exec.vars = NULL; + } + exec.stack_size = 16; exec.top = 0; exec.stack = heap_alloc(exec.stack_size * sizeof(VARIANT)); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 1140326..a46394b 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -230,4 +230,15 @@ Call TestSubExit(true) TestSubMultiArgs 1, 2, 3, 4, 5 Call TestSubMultiArgs(1, 2, 3, 4, 5) +Sub TestSubLocalVal + x = false + Call ok(not x, "local x is not false?") + Dim x +End Sub + +x = true +y = true +Call TestSubLocalVal +Call ok(x, "global x is not true?") + reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 1362d9e..cf625cc 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -167,11 +167,17 @@ typedef enum { FUNC_SUB } function_type_t; +typedef struct { + const WCHAR *name; +} var_desc_t; + struct _function_t { function_type_t type; const WCHAR *name; arg_desc_t *args; unsigned arg_cnt; + var_desc_t *vars; + unsigned var_cnt; unsigned code_off; vbscode_t *code_ctx; function_t *next;

1 0

Francois Gouget : wineconsole: Use a more standard syntax for multi-line RC file strings.
by Alexandre Julliard 14 Sep '11

14 Sep '11

1 0

Francois Gouget : po: Remove English strings from the Romanian translation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: fe6cfb25c0cd99bb3d892fafed4dac6d4b7261a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe6cfb25c0cd99bb3d892fafe… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 14 00:31:14 2011 +0200 po: Remove English strings from the Romanian translation. --- po/ro.po | 61 ++++++++----------------------------------------------------- 1 files changed, 8 insertions(+), 53 deletions(-) diff --git a/po/ro.po b/po/ro.po index 67977c7..8b36e9a 100644 --- a/po/ro.po +++ b/po/ro.po @@ -563,7 +563,7 @@ msgstr "Fără toner; " #: comdlg32.rc:113 msgid "Page punt; " -msgstr "Page punt; " +msgstr "" #: comdlg32.rc:114 msgid "Interrupted by user; " @@ -4492,9 +4492,8 @@ msgid "Security DB commit failure\n" msgstr "" #: winerror.mc:2256 -#, fuzzy msgid "Account is built-in\n" -msgstr "native, builtin" +msgstr "" #: winerror.mc:2261 msgid "Group is built-in\n" @@ -5868,7 +5867,6 @@ msgid "insert disk %s" msgstr "inserați discul %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -5900,35 +5898,6 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" -"\n" -"Usage:\n" -"msiexec command {required parameter} [optional parammeter]\n" -"\n" -"Install a product:\n" -"\t/i {package|productcode} [property]\n" -"\t/package {package|productcode} [property]\n" -"\t/a package [property]\n" -"Repair an installation:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" -"Uninstall a product:\n" -"\t/uninstall {package|productcode} [property]\n" -"\t/x {package|productcode} [property]\n" -"Advertise a product:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" -"Apply a patch:\n" -"\t/p patchpackage [property]\n" -"\t/p patchpackage /a package [property]\n" -"Log and UI Modifiers for above commands:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -"\t/q{|n|b|r|f|n+|b+|b-}\n" -"Register MSI Service:\n" -"\t/y\n" -"Unregister MSI Service:\n" -"\t/z\n" -"Display this help:\n" -"\t/help\n" -"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s" @@ -6829,9 +6798,8 @@ msgid "E&xit" msgstr "Înc&hide" #: shell32.rc:127 -#, fuzzy msgid "&About Control Panel" -msgstr "&About Control Panel..." +msgstr "" #: shell32.rc:135 shell32.rc:139 winefile.rc:111 #, fuzzy @@ -7271,19 +7239,6 @@ msgid "" "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" -"Wine is free software; you can redistribute it and/or modify it under the " -"terms of the GNU Lesser General Public License as published by the Free " -"Software Foundation; either version 2.1 of the License, or (at your option) " -"any later version.\n" -"\n" -"Wine is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for " -"more details.\n" -"\n" -"You should have received a copy of the GNU Lesser General Public License " -"along with this library; if not, write to the Free Software Foundation, " -"Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." #: shell32.rc:266 msgid "Wine License" @@ -11041,19 +10996,19 @@ msgstr "Avertizare: librărie de sistem" #: winecfg.rc:53 msgid "native" -msgstr "native" +msgstr "" #: winecfg.rc:54 msgid "builtin" -msgstr "builtin" +msgstr "" #: winecfg.rc:55 msgid "native, builtin" -msgstr "native, builtin" +msgstr "" #: winecfg.rc:56 msgid "builtin, native" -msgstr "builtin, native" +msgstr "" #: winecfg.rc:57 msgid "disabled" @@ -11822,7 +11777,7 @@ msgstr "&Despre Wine Wordpad" #: wordpad.rc:130 msgid "Automatic" -msgstr "Automatic" +msgstr "" #: wordpad.rc:136 msgid "All documents (*.*)"

1 0