September 2011 - Wine-Commits

Jacek Caban : vbscript: Added sub argument tests.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

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 function compiler implementation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 413bc99044e75a9cd9aafcfd14f259627aaca3a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=413bc99044e75a9cd9aafcfd1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:55:07 2011 +0200 vbscript: Added function compiler implementation. --- dlls/vbscript/compile.c | 142 +++++++++++++++++++++++++++++++++++------ dlls/vbscript/tests/lang.vbs | 6 ++ dlls/vbscript/vbscript.h | 3 + 3 files changed, 130 insertions(+), 21 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index d39b94e..4e8cd06 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -40,6 +40,10 @@ typedef struct { dim_decl_t *dim_decls; dynamic_var_t *global_vars; + + function_t *func; + function_t *funcs; + function_decl_t *func_decls; } compile_ctx_t; static HRESULT compile_expression(compile_ctx_t*,expression_t*); @@ -514,6 +518,18 @@ static HRESULT compile_dim_statement(compile_ctx_t *ctx, dim_statement_t *stat) return S_OK; } +static HRESULT compile_function_statement(compile_ctx_t *ctx, function_statement_t *stat) +{ + if(ctx->func != &ctx->code->global_code) { + FIXME("Function is not in the global code\n"); + return E_FAIL; + } + + stat->func_decl->next = ctx->func_decls; + ctx->func_decls = stat->func_decl; + return S_OK; +} + static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) { HRESULT hres; @@ -529,6 +545,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_FUNC: + hres = compile_function_statement(ctx, (function_statement_t*)stat); + break; case STAT_IF: hres = compile_if_statement(ctx, (if_statement_t*)stat); break; @@ -545,11 +564,11 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) return S_OK; } -static void resolve_labels(compile_ctx_t *ctx) +static void resolve_labels(compile_ctx_t *ctx, unsigned off) { instr_t *instr; - for(instr = ctx->code->instrs; instr < ctx->code->instrs+ctx->instr_cnt; instr++) { + for(instr = ctx->code->instrs+off; 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]; @@ -566,38 +585,92 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f func->code_off = ctx->instr_cnt; + ctx->func = func; + ctx->dim_decls = NULL; hres = compile_statement(ctx, stat); + ctx->func = NULL; if(FAILED(hres)) return hres; if(push_instr(ctx, OP_ret) == -1) return E_OUTOFMEMORY; - resolve_labels(ctx); + resolve_labels(ctx, func->code_off); 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; + if(func->type == FUNC_GLOBAL) { + dynamic_var_t *new_var; - new_var->name = compiler_alloc_string(ctx->code, dim_decl->name); - if(!new_var->name) - return E_OUTOFMEMORY; + 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; - V_VT(&new_var->v) = VT_EMPTY; + new_var->name = compiler_alloc_string(ctx->code, dim_decl->name); + if(!new_var->name) + return E_OUTOFMEMORY; - new_var->next = ctx->global_vars; - ctx->global_vars = new_var; + V_VT(&new_var->v) = VT_EMPTY; + + new_var->next = ctx->global_vars; + ctx->global_vars = new_var; + } + }else { + FIXME("var not implemented for functions\n"); } } return S_OK; } +static BOOL lookup_funcs_name(compile_ctx_t *ctx, const WCHAR *name) +{ + function_t *iter; + + for(iter = ctx->funcs; iter; iter = iter->next) { + if(!strcmpiW(iter->name, name)) + return TRUE; + } + + return FALSE; +} + +static HRESULT create_function(compile_ctx_t *ctx, function_decl_t *decl, function_t **ret) +{ + function_t *func; + HRESULT hres; + + if(lookup_dim_decls(ctx, decl->name) || lookup_funcs_name(ctx, decl->name)) { + FIXME("%s: redefinition\n", debugstr_w(decl->name)); + return E_FAIL; + } + + func = compiler_alloc(ctx->code, sizeof(*func)); + if(!func) + return E_OUTOFMEMORY; + + func->name = compiler_alloc_string(ctx->code, decl->name); + if(!func->name) + return E_OUTOFMEMORY; + + func->code_ctx = ctx->code; + func->type = decl->type; + + if(decl->args) { + FIXME("arguments not implemented\n"); + return E_NOTIMPL; + } + + hres = compile_func(ctx, decl->body, func); + if(FAILED(hres)) + return hres; + + *ret = func; + return S_OK; +} + static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifier) { dynamic_var_t *var; @@ -671,25 +744,40 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ret->bstr_pool_size = 0; ret->bstr_cnt = 0; + ret->global_code.type = FUNC_GLOBAL; + ret->global_code.name = NULL; ret->global_code.code_ctx = ret; list_init(&ret->entry); return ret; } +static void release_compiler(compile_ctx_t *ctx) +{ + parser_release(&ctx->parser); + heap_free(ctx->labels); + if(ctx->code) + release_vbscode(ctx->code); +} + HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) { + function_t *new_func; + function_decl_t *func_decl; compile_ctx_t ctx; + vbscode_t *code; HRESULT hres; hres = parse_script(&ctx.parser, src); if(FAILED(hres)) return hres; - ctx.code = alloc_vbscode(&ctx, src); + code = ctx.code = alloc_vbscode(&ctx, src); if(!ctx.code) return E_OUTOFMEMORY; + ctx.funcs = NULL; + ctx.func_decls = NULL; ctx.global_vars = NULL; ctx.dim_decls = NULL; ctx.labels = NULL; @@ -697,13 +785,24 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) hres = compile_func(&ctx, ctx.parser.stats, &ctx.code->global_code); if(FAILED(hres)) { - release_vbscode(ctx.code); + release_compiler(&ctx); return hres; } + for(func_decl = ctx.func_decls; func_decl; func_decl = func_decl->next) { + hres = create_function(&ctx, func_decl, &new_func); + if(FAILED(hres)) { + release_compiler(&ctx); + return hres; + } + + new_func->next = ctx.funcs; + ctx.funcs = new_func; + } + hres = check_script_collisions(&ctx, script); if(FAILED(hres)) { - release_vbscode(ctx.code); + release_compiler(&ctx); return hres; } @@ -716,12 +815,13 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) script->global_vars = ctx.global_vars; } - parser_release(&ctx.parser); - if(TRACE_ON(vbscript_disas)) dump_code(&ctx); - list_add_tail(&script->code_list, &ctx.code->entry); - *ret = ctx.code; + ctx.code = NULL; + release_compiler(&ctx); + + list_add_tail(&script->code_list, &code->entry); + *ret = code; return S_OK; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 12bdaf5..60ca988 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -169,4 +169,10 @@ ElseIf not False Then End If Call ok(x, "elseif not called?") +if false then +Sub testsub + x = true +End Sub +end if + reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index b52aa09..41dea38 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -152,8 +152,11 @@ typedef enum { } function_type_t; struct _function_t { + function_type_t type; + const WCHAR *name; unsigned code_off; vbscode_t *code_ctx; + function_t *next; }; struct _vbscode_t {

1 0

Jacek Caban : vbscript: Store global functions in script_ctx_t.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

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 interpreter support for sub arguments.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

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 function invocation supprot to do_icall.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

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

Hans Leidekker : msi: Ignore files if their path cannot be resolved in the RemoveFiles action.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: f13cafad4ac92836a7db3283cc2707983dfc0151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13cafad4ac92836a7db3283c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 14 12:04:15 2011 +0200 msi: Ignore files if their path cannot be resolved in the RemoveFiles action. --- dlls/msi/files.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 1f12fe2..9aa2098 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -1164,8 +1164,10 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) dir = msi_dup_property(package->db, dirprop); if (!dir) - return ERROR_OUTOFMEMORY; - + { + WARN("directory property has no value\n"); + return ERROR_SUCCESS; + } size = 0; if ((filename = strdupW( MSI_RecordGetString(row, 3) ))) {

1 0

Jacek Caban : vbscript: Added function arguments compiler implementation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

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 support for sub local variables.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

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

Alexandre Julliard : winex11: Use the DIB engine for client-side DIB copy optimizations.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 0f9dfb932e51efa844283d28d7aa9be22c6f28db URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f9dfb932e51efa844283d28d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 13:26:29 2011 +0200 winex11: Use the DIB engine for client-side DIB copy optimizations. --- dlls/winex11.drv/bitblt.c | 144 ++------------------------------------------- dlls/winex11.drv/dib.c | 71 ---------------------- dlls/winex11.drv/x11drv.h | 3 - 3 files changed, 6 insertions(+), 212 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f9dfb932e51efa844283…

1 0

Hans Leidekker : msi: Free the message string in ACTION_ResolveSource.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: eede401d038598a09c068fb588b05ea5d3f9357d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eede401d038598a09c068fb58… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 14 12:03:54 2011 +0200 msi: Free the message string in ACTION_ResolveSource. --- dlls/msi/action.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 62d857a..478addd 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5128,8 +5128,7 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) attrib = GetFileAttributesW(package->db->path); if (attrib == INVALID_FILE_ATTRIBUTES) { - LPWSTR prompt; - LPWSTR msg; + LPWSTR prompt, msg; DWORD size = 0; rc = MsiSourceListGetInfoW(package->ProductCode, NULL, @@ -5146,17 +5145,18 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) prompt = strdupW(package->db->path); msg = msi_build_error_string(package, 1302, 1, prompt); + msi_free(prompt); while(attrib == INVALID_FILE_ATTRIBUTES) { rc = MessageBoxW(NULL, msg, NULL, MB_OKCANCEL); if (rc == IDCANCEL) { - msi_free(prompt); + msi_free(msg); return ERROR_INSTALL_USEREXIT; } attrib = GetFileAttributesW(package->db->path); } - msi_free(prompt); + msi_free(msg); rc = ERROR_SUCCESS; } else

1 0