September 2011 - Wine-Commits

Jacek Caban : vbscript: Added class functions parser implementation.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: ee67bc7a37dc8133ea5711e013825382730b9087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee67bc7a37dc8133ea5711e01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 19:04:43 2011 +0200 vbscript: Added class functions parser implementation. --- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 24 ++++++++++++++++++++++++ dlls/vbscript/tests/lang.vbs | 12 ++++++++++++ 3 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 3a4d03b..94ba0cf 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -148,6 +148,7 @@ typedef struct _function_statement_t { typedef struct _class_decl_t { const WCHAR *name; + function_decl_t *funcs; struct _class_decl_t *next; } class_decl_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index e310a70..3eacf2f 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -59,7 +59,9 @@ 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*); static function_decl_t *new_function_decl(parser_ctx_t*,const WCHAR*,function_type_t,unsigned,arg_decl_t*,statement_t*); static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL); + static class_decl_t *new_class_decl(parser_ctx_t*); +static class_decl_t *add_class_function(parser_ctx_t*,class_decl_t*,function_decl_t*); #define STORAGE_IS_PRIVATE 1 #define STORAGE_IS_DEFAULT 2 @@ -289,6 +291,7 @@ ClassDeclaration ClassBody : /* empty */ { $$ = new_class_decl(ctx); } + | FunctionDecl tNL ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } FunctionDecl : Storage_opt tSUB tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tSUB @@ -599,6 +602,7 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, decl->is_public = !(storage_flags & STORAGE_IS_PRIVATE); decl->args = arg_decl; decl->body = body; + decl->next = NULL; return decl; } @@ -622,10 +626,30 @@ static class_decl_t *new_class_decl(parser_ctx_t *ctx) if(!class_decl) return NULL; + class_decl->funcs = NULL; class_decl->next = NULL; return class_decl; } +static class_decl_t *add_class_function(parser_ctx_t *ctx, class_decl_t *class_decl, function_decl_t *decl) +{ + function_decl_t *iter; + + for(iter = class_decl->funcs; iter; iter = iter->next) { + if(!strcmpiW(iter->name, decl->name)) { + if(decl->type == FUNC_SUB || decl->type == FUNC_FUNCTION) { + FIXME("Redefinition of %s::%s\n", debugstr_w(class_decl->name), debugstr_w(decl->name)); + ctx->hres = E_FAIL; + return NULL; + } + } + } + + decl->next = class_decl->funcs; + class_decl->funcs = decl; + return class_decl; +} + void *parser_alloc(parser_ctx_t *ctx, size_t size) { void *ret; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index bc64f85..2f78403 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -386,4 +386,16 @@ Call ok(getVT(obj) = "VT_DISPATCH*", "getVT(obj) = " & getVT(obj)) Class EmptyClass End Class +Class TestClass + Public Function publicFunction() + publicFunction = 4 + End Function + + Public Sub publicSub + End Sub + + Public Sub privateSub + End Sub +End Class + reportSuccess()

1 0

Jacek Caban : vbscript: Added object member call implementation.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: a6ee830fd249ee96176e62c5261ed6cc70107b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6ee830fd249ee96176e62c52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:19:41 2011 +0200 vbscript: Added object member call implementation. --- dlls/vbscript/compile.c | 7 ++++- dlls/vbscript/interp.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 2 + 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 36bf04c..698ea8d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -318,8 +318,11 @@ static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t return hres; if(expr->obj_expr) { - FIXME("obj_expr not implemented\n"); - hres = E_NOTIMPL; + hres = compile_expression(ctx, expr->obj_expr); + if(FAILED(hres)) + return hres; + + hres = push_instr_bstr_uint(ctx, ret_val ? OP_mcall : OP_mcallv, expr->identifier, arg_cnt); }else { hres = push_instr_bstr_uint(ctx, ret_val ? OP_icall : OP_icallv, expr->identifier, arg_cnt); } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index f8e0011..beacfe9 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -327,6 +327,57 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) return do_icall(ctx, NULL); } +static HRESULT do_mcall(exec_ctx_t *ctx, VARIANT *res) +{ + const BSTR identifier = ctx->instr->arg1.bstr; + const unsigned arg_cnt = ctx->instr->arg2.uint; + IDispatch *obj; + DISPPARAMS dp; + DISPID id; + HRESULT hres; + + hres = stack_pop_disp(ctx, &obj); + if(FAILED(hres)) + return hres; + + if(!obj) { + FIXME("NULL obj\n"); + return E_FAIL; + } + + vbstack_to_dp(ctx, arg_cnt, &dp); + + hres = disp_get_id(obj, identifier, &id); + if(SUCCEEDED(hres)) + hres = disp_call(ctx->script, obj, id, &dp, res); + IDispatch_Release(obj); + if(FAILED(hres)) + return hres; + + stack_popn(ctx, arg_cnt); + return S_OK; +} + +static HRESULT interp_mcall(exec_ctx_t *ctx) +{ + VARIANT res; + HRESULT hres; + + TRACE("\n"); + + hres = do_mcall(ctx, &res); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &res); +} + +static HRESULT interp_mcallv(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_val) { ref_t ref; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 4c2d977..8defcd6 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -146,6 +146,8 @@ typedef enum { X(jmp, 0, ARG_ADDR, 0) \ X(jmp_false, 0, ARG_ADDR, 0) \ X(long, 1, ARG_INT, 0) \ + X(mcall, 1, ARG_BSTR, ARG_UINT) \ + X(mcallv, 1, ARG_BSTR, ARG_UINT) \ X(mod, 1, 0, 0) \ X(mul, 1, 0, 0) \ X(neg, 1, 0, 0) \

1 0

Jacek Caban : vbscript: Added stop statement semi-stub implementation.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: 8de5db6030c2bd229fba529842efb3d749d505f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de5db6030c2bd229fba52984… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:22:27 2011 +0200 vbscript: Added stop statement semi-stub implementation. --- dlls/vbscript/compile.c | 3 +++ dlls/vbscript/interp.c | 8 ++++++++ dlls/vbscript/parse.h | 3 ++- dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 3 +++ dlls/vbscript/vbscript.h | 1 + 6 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 32707dc..10b2a9d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -615,6 +615,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_SET: hres = compile_assign_statement(ctx, (assign_statement_t*)stat, TRUE); break; + case STAT_STOP: + hres = push_instr(ctx, OP_stop) == -1 ? E_OUTOFMEMORY : S_OK; + break; default: FIXME("Unimplemented statement type %d\n", stat->type); hres = E_NOTIMPL; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index a0e926d..27da9d3 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -576,6 +576,14 @@ static HRESULT interp_ret(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_stop(exec_ctx_t *ctx) +{ + WARN("\n"); + + /* NOTE: this should have effect in debugging mode (that we don't support yet) */ + return S_OK; +} + static HRESULT interp_bool(exec_ctx_t *ctx) { const VARIANT_BOOL arg = ctx->instr->arg1.lng; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 94ba0cf..918a6db 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -97,7 +97,8 @@ typedef enum { STAT_EXITSUB, STAT_FUNC, STAT_IF, - STAT_SET + STAT_SET, + STAT_STOP } statement_type_t; typedef struct _statement_t { diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 3eacf2f..63423d1 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -157,6 +157,7 @@ Statement | tEXIT tSUB { $$ = new_statement(ctx, STAT_EXITSUB, 0); CHECK_ERROR; } | tSET MemberExpression Arguments_opt '=' Expression { $2->args = $3; $$ = new_set_statement(ctx, $2, $5); CHECK_ERROR; } + | tSTOP { $$ = new_statement(ctx, STAT_STOP, 0); CHECK_ERROR; } MemberExpression : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 9e4bc44..3511707 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -376,6 +376,9 @@ Private Function TestPrivateFunc End Function Call TestPrivateFunc +' Stop has an effect only in debugging mode +Stop + set x = testObj Call ok(getVT(x) = "VT_DISPATCH*", "getVT(x=testObj) = " & getVT(x)) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 1dcbc15..26892db 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -169,6 +169,7 @@ typedef enum { X(set_ident, 1, ARG_BSTR, 0) \ X(set_member, 1, ARG_BSTR, 0) \ X(short, 1, ARG_INT, 0) \ + X(stop, 1, 0, 0) \ X(string, 1, ARG_STR, 0) \ X(sub, 1, 0, 0) \ X(xor, 1, 0, 0)

1 0

Jacek Caban : vbscript: Added this object to identifier lookup chanin.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: 1e01a176a38f4792ea7589d05f991fa93960b947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e01a176a38f4792ea7589d05… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:21:58 2011 +0200 vbscript: Added this object to identifier lookup chanin. --- dlls/vbscript/interp.c | 32 ++++++++++++++++++++++++++------ dlls/vbscript/tests/lang.vbs | 1 + dlls/vbscript/vbdisp.c | 32 +++++++++++++++++++++++--------- dlls/vbscript/vbscript.c | 2 +- dlls/vbscript/vbscript.h | 4 ++-- 5 files changed, 53 insertions(+), 18 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 2d0b7cb..a0e926d 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -30,6 +30,7 @@ typedef struct { instr_t *instr; script_ctx_t *script; function_t *func; + IDispatch *this_obj; VARIANT *args; VARIANT *vars; @@ -113,6 +114,14 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } + hres = disp_get_id(ctx->this_obj, name, TRUE, &id); + if(SUCCEEDED(hres)) { + ref->type = REF_DISP; + ref->u.d.disp = ctx->this_obj; + ref->u.d.id = id; + return S_OK; + } + if(lookup_dynamic_vars(ctx->script->global_vars, name, ref)) return S_OK; @@ -125,8 +134,8 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } 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); + if((item->flags & SCRIPTITEM_GLOBALMEMBERS) && item->disp != ctx->this_obj) { + hres = disp_get_id(item->disp, name, FALSE, &id); if(SUCCEEDED(hres)) { ref->type = REF_DISP; ref->u.d.disp = item->disp; @@ -294,7 +303,7 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) return hres; break; case REF_FUNC: - hres = exec_script(ctx->script, ref.u.f, &dp, res); + hres = exec_script(ctx->script, ref.u.f, NULL, &dp, res); if(FAILED(hres)) return hres; break; @@ -347,7 +356,7 @@ static HRESULT do_mcall(exec_ctx_t *ctx, VARIANT *res) vbstack_to_dp(ctx, arg_cnt, &dp); - hres = disp_get_id(obj, identifier, &id); + hres = disp_get_id(obj, identifier, FALSE, &id); if(SUCCEEDED(hres)) hres = disp_call(ctx->script, obj, id, &dp, res); IDispatch_Release(obj); @@ -480,7 +489,7 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) return hres; } - hres = disp_get_id(obj, identifier, &id); + hres = disp_get_id(obj, identifier, FALSE, &id); if(SUCCEEDED(hres)) hres = disp_propput(ctx->script, obj, id, val.v); @@ -1084,6 +1093,9 @@ static void release_exec(exec_ctx_t *ctx) VariantClear(&ctx->ret_val); + if(ctx->this_obj) + IDispatch_Release(ctx->this_obj); + if(ctx->args) { for(i=0; i < ctx->func->arg_cnt; i++) VariantClear(ctx->args+i); @@ -1099,7 +1111,7 @@ static void release_exec(exec_ctx_t *ctx) heap_free(ctx->stack); } -HRESULT exec_script(script_ctx_t *ctx, function_t *func, DISPPARAMS *dp, VARIANT *res) +HRESULT exec_script(script_ctx_t *ctx, function_t *func, IDispatch *this_obj, DISPPARAMS *dp, VARIANT *res) { exec_ctx_t exec = {func->code_ctx}; vbsop_t op; @@ -1159,6 +1171,14 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, DISPPARAMS *dp, VARIANT return E_OUTOFMEMORY; } + if(this_obj) + exec.this_obj = this_obj; + else if (ctx->host_global) + exec.this_obj = ctx->host_global; + else + exec.this_obj = (IDispatch*)&ctx->script_obj->IDispatchEx_iface; + IDispatch_AddRef(exec.this_obj); + exec.instr = exec.code->instrs + func->code_off; exec.script = ctx; exec.func = func; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 06542cd..9e4bc44 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -388,6 +388,7 @@ End Class Class TestClass Public Function publicFunction() + privateSub() publicFunction = 4 End Function diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 2b60926..666d04a 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -46,6 +46,15 @@ static BOOL get_func_id(vbdisp_t *This, const WCHAR *name, BOOL search_private, return FALSE; } +static HRESULT vbdisp_get_id(vbdisp_t *This, BSTR name, BOOL search_private, DISPID *id) +{ + if(get_func_id(This, name, search_private, id)) + return S_OK; + + *id = -1; + return DISP_E_UNKNOWNNAME; +} + static inline vbdisp_t *impl_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, vbdisp_t, IDispatchEx_iface); @@ -144,11 +153,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW return E_NOTIMPL; } - if(get_func_id(This, bstrName, FALSE, pid)) - return S_OK; - - *pid = -1; - return DISP_E_UNKNOWNNAME; + return vbdisp_get_id(This, bstrName, FALSE, pid); } static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, @@ -176,7 +181,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return DISP_E_MEMBERNOTFOUND; } - return exec_script(This->desc->ctx, func, pdp, pvarRes); + return exec_script(This->desc->ctx, func, (IDispatch*)&This->IDispatchEx_iface, pdp, pvarRes); default: FIXME("flags %x\n", wFlags); return DISP_E_MEMBERNOTFOUND; @@ -247,6 +252,13 @@ static IDispatchExVtbl DispatchExVtbl = { DispatchEx_GetNameSpaceParent }; +static inline vbdisp_t *unsafe_impl_from_IDispatch(IDispatch *iface) +{ + return iface->lpVtbl == (IDispatchVtbl*)&DispatchExVtbl + ? CONTAINING_RECORD(iface, vbdisp_t, IDispatchEx_iface) + : NULL; +} + HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) { vbdisp_t *vbdisp; @@ -269,13 +281,15 @@ HRESULT init_global(script_ctx_t *ctx) return create_vbdisp(&ctx->script_desc, &ctx->script_obj); } -HRESULT disp_get_id(IDispatch *disp, BSTR name, DISPID *id) +HRESULT disp_get_id(IDispatch *disp, BSTR name, BOOL search_private, DISPID *id) { IDispatchEx *dispex; + vbdisp_t *vbdisp; HRESULT hres; - if(disp->lpVtbl == (IDispatchVtbl*)&DispatchExVtbl) - FIXME("properly handle builtin objects\n"); + vbdisp = unsafe_impl_from_IDispatch(disp); + if(vbdisp) + return vbdisp_get_id(vbdisp, name, search_private, id); hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(FAILED(hres)) { diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index cb28a9a..e0598a9 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, NULL, NULL); + hres = exec_script(ctx, &code->global_code, NULL, NULL, NULL); IActiveScriptSite_OnLeaveScript(ctx->site); return hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 11a5862..1dcbc15 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -85,7 +85,7 @@ typedef struct { } vbdisp_t; HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**); -HRESULT disp_get_id(IDispatch*,BSTR,DISPID*); +HRESULT disp_get_id(IDispatch*,BSTR,BOOL,DISPID*); HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*); HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*); @@ -241,7 +241,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*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; +HRESULT exec_script(script_ctx_t*,function_t*,IDispatch*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**);

1 0

Jacek Caban : vbscript: Added interp_mcall implementation.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: 308b2641d929c88a80361d1077e4ab5c2d5fbea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=308b2641d929c88a80361d107… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:21:44 2011 +0200 vbscript: Added interp_mcall implementation. --- dlls/vbscript/interp.c | 5 +++-- dlls/vbscript/tests/lang.vbs | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index beacfe9..2d0b7cb 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -374,8 +374,9 @@ static HRESULT interp_mcall(exec_ctx_t *ctx) static HRESULT interp_mcallv(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + return do_mcall(ctx, NULL); } static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_val) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index ec85614..06542cd 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -405,4 +405,8 @@ Set obj = New TestClass Call ok(obj.publicFunction = 4, "obj.publicFunction = " & obj.publicFunction) Call ok(obj.publicFunction() = 4, "obj.publicFunction() = " & obj.publicFunction()) +obj.publicSub() +Call obj.publicSub +Call obj.publicFunction() + reportSuccess()

1 0

Jacek Caban : vbscript: Added nothing literal parser/ compiler implementation.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: 8864c8dbae7db66662e7f022a91d84d11a65dcf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8864c8dbae7db66662e7f022a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:18:56 2011 +0200 vbscript: Added nothing literal parser/compiler implementation. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 1 + dlls/vbscript/vbscript.h | 1 + 5 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index b9e05bd9..36bf04c 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -394,6 +394,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr_str(ctx, OP_new, ((string_expression_t*)expr)->value); case EXPR_NOT: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); + case EXPR_NOTHING: + return push_instr(ctx, OP_nothing) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_NULL: return push_instr(ctx, OP_null) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_OR: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index b413243..4094ac1 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -597,6 +597,12 @@ static HRESULT interp_null(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_nothing(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_not(exec_ctx_t *ctx) { variant_val_t val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 21f0d60..ac0f310 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -36,6 +36,7 @@ typedef enum { EXPR_NEQUAL, EXPR_NEW, EXPR_NOT, + EXPR_NOTHING, EXPR_NULL, EXPR_OR, EXPR_STRING, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 48a5ab4..50a4bf1 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -274,6 +274,7 @@ LiteralExpression | tDouble { $$ = new_double_expression(ctx, $1); CHECK_ERROR; } | tEMPTY { $$ = new_expression(ctx, EXPR_EMPTY, 0); CHECK_ERROR; } | tNULL { $$ = new_expression(ctx, EXPR_NULL, 0); CHECK_ERROR; } + | tNOTHING { $$ = new_expression(ctx, EXPR_NOTHING, 0); CHECK_ERROR; } PrimaryExpression : '(' Expression ')' { $$ = $2; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index dabf52b..4c2d977 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -152,6 +152,7 @@ typedef enum { X(nequal, 1, 0, 0) \ X(new, 1, ARG_STR, 0) \ X(not, 1, 0, 0) \ + X(nothing, 1, 0, 0) \ X(null, 1, 0, 0) \ X(or, 1, 0, 0) \ X(ret, 0, 0, 0) \

1 0

Alexandre Julliard : winex11: Remove a redundant field in the XRender format templates.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: 1525273bb83318d7cdb7ce86c3becceabbb92e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1525273bb83318d7cdb7ce86c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 15:33:59 2011 +0200 winex11: Remove a redundant field in the XRender format templates. --- dlls/winex11.drv/xrender.c | 64 ++++++++++++++++++------------------------- 1 files changed, 27 insertions(+), 37 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index e1139e2..db46eae 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -75,7 +75,6 @@ typedef enum wxr_format typedef struct wine_xrender_format_template { - WXRFormat wxr_format; unsigned int depth; unsigned int alpha; unsigned int alphaMask; @@ -90,18 +89,18 @@ typedef struct wine_xrender_format_template static const WineXRenderFormatTemplate wxr_formats_template[WXR_NB_FORMATS] = { /* Format depth alpha mask red mask green mask blue mask*/ - {WXR_FORMAT_MONO, 1, 0, 0x01, 0, 0, 0, 0, 0, 0 }, - {WXR_FORMAT_GRAY, 8, 0, 0xff, 0, 0, 0, 0, 0, 0 }, - {WXR_FORMAT_X1R5G5B5, 16, 0, 0, 10, 0x1f, 5, 0x1f, 0, 0x1f }, - {WXR_FORMAT_X1B5G5R5, 16, 0, 0, 0, 0x1f, 5, 0x1f, 10, 0x1f }, - {WXR_FORMAT_R5G6B5, 16, 0, 0, 11, 0x1f, 5, 0x3f, 0, 0x1f }, - {WXR_FORMAT_B5G6R5, 16, 0, 0, 0, 0x1f, 5, 0x3f, 11, 0x1f }, - {WXR_FORMAT_R8G8B8, 24, 0, 0, 16, 0xff, 8, 0xff, 0, 0xff }, - {WXR_FORMAT_B8G8R8, 24, 0, 0, 0, 0xff, 8, 0xff, 16, 0xff }, - {WXR_FORMAT_A8R8G8B8, 32, 24, 0xff, 16, 0xff, 8, 0xff, 0, 0xff }, - {WXR_FORMAT_B8G8R8A8, 32, 0, 0xff, 8, 0xff, 16, 0xff, 24, 0xff }, - {WXR_FORMAT_X8R8G8B8, 32, 0, 0, 16, 0xff, 8, 0xff, 0, 0xff }, - {WXR_FORMAT_B8G8R8X8, 32, 0, 0, 8, 0xff, 16, 0xff, 24, 0xff }, +/* WXR_FORMAT_MONO */ { 1, 0, 0x01, 0, 0, 0, 0, 0, 0 }, +/* WXR_FORMAT_GRAY */ { 8, 0, 0xff, 0, 0, 0, 0, 0, 0 }, +/* WXR_FORMAT_X1R5G5B5 */ { 16, 0, 0, 10, 0x1f, 5, 0x1f, 0, 0x1f }, +/* WXR_FORMAT_X1B5G5R5 */ { 16, 0, 0, 0, 0x1f, 5, 0x1f, 10, 0x1f }, +/* WXR_FORMAT_R5G6B5 */ { 16, 0, 0, 11, 0x1f, 5, 0x3f, 0, 0x1f }, +/* WXR_FORMAT_B5G6R5 */ { 16, 0, 0, 0, 0x1f, 5, 0x3f, 11, 0x1f }, +/* WXR_FORMAT_R8G8B8 */ { 24, 0, 0, 16, 0xff, 8, 0xff, 0, 0xff }, +/* WXR_FORMAT_B8G8R8 */ { 24, 0, 0, 0, 0xff, 8, 0xff, 16, 0xff }, +/* WXR_FORMAT_A8R8G8B8 */ { 32, 24, 0xff, 16, 0xff, 8, 0xff, 0, 0xff }, +/* WXR_FORMAT_B8G8R8A8 */ { 32, 0, 0xff, 8, 0xff, 16, 0xff, 24, 0xff }, +/* WXR_FORMAT_X8R8G8B8 */ { 32, 0, 0, 16, 0xff, 8, 0xff, 0, 0xff }, +/* WXR_FORMAT_B8G8R8X8 */ { 32, 0, 0, 8, 0xff, 16, 0xff, 24, 0xff }, }; static enum wxr_format default_format; @@ -287,15 +286,15 @@ static int load_xrender_formats(void) int count = 0; unsigned int i; - for(i = 0; i < (sizeof(wxr_formats_template) / sizeof(wxr_formats_template[0])); i++) + for (i = 0; i < WXR_NB_FORMATS; i++) { - XRenderPictFormat templ, *pict_format; + XRenderPictFormat templ; if(is_wxrformat_compatible_with_default_visual(&wxr_formats_template[i])) { wine_tsx11_lock(); - pict_format = pXRenderFindVisualFormat(gdi_display, visual); - if(!pict_format) + pict_formats[i] = pXRenderFindVisualFormat(gdi_display, visual); + if (!pict_formats[i]) { /* Xrender doesn't like DirectColor visuals, try to find a TrueColor one instead */ if (visual->class == DirectColor) @@ -304,20 +303,13 @@ static int load_xrender_formats(void) if (XMatchVisualInfo( gdi_display, DefaultScreen(gdi_display), screen_depth, TrueColor, &info )) { - pict_format = pXRenderFindVisualFormat(gdi_display, info.visual); - if (pict_format) visual = info.visual; + pict_formats[i] = pXRenderFindVisualFormat(gdi_display, info.visual); + if (pict_formats[i]) visual = info.visual; } } } wine_tsx11_unlock(); - - if(pict_format) - { - pict_formats[wxr_formats_template[i].wxr_format] = pict_format; - default_format = wxr_formats_template[i].wxr_format; - count++; - TRACE("Loaded pict_format with id=%#lx for wxr_format=%#x\n", pict_format->id, wxr_formats_template[i].wxr_format); - } + if (pict_formats[i]) default_format = i; } else { @@ -325,15 +317,13 @@ static int load_xrender_formats(void) get_xrender_template(&wxr_formats_template[i], &templ, &mask); wine_tsx11_lock(); - pict_format = pXRenderFindFormat(gdi_display, mask, &templ, 0); + pict_formats[i] = pXRenderFindFormat(gdi_display, mask, &templ, 0); wine_tsx11_unlock(); - - if(pict_format) - { - pict_formats[wxr_formats_template[i].wxr_format] = pict_format; - count++; - TRACE("Loaded pict_format with id=%#lx for wxr_format=%#x\n", pict_format->id, wxr_formats_template[i].wxr_format); - } + } + if (pict_formats[i]) + { + count++; + TRACE("Loaded pict_format with id=%#lx for wxr_format=%#x\n", pict_formats[i]->id, i); } } return count; @@ -485,13 +475,13 @@ static enum wxr_format get_xrender_format_from_color_shifts(int depth, ColorShif blueMask = shifts->physicalBlue.max << shifts->physicalBlue.shift; /* Try to locate a format which matches the specification of the dibsection. */ - for(i = 0; i < (sizeof(wxr_formats_template) / sizeof(wxr_formats_template[0])); i++) + for(i = 0; i < WXR_NB_FORMATS; i++) { if( depth == wxr_formats_template[i].depth && redMask == (wxr_formats_template[i].redMask << wxr_formats_template[i].red) && greenMask == (wxr_formats_template[i].greenMask << wxr_formats_template[i].green) && blueMask == (wxr_formats_template[i].blueMask << wxr_formats_template[i].blue) ) - return wxr_formats_template[i].wxr_format; + return i; } /* This should not happen because when we reach 'shifts' must have been set and we only allows shifts which are backed by X */

1 0

Francois Gouget : po: Remove an English string from the Serbian (Cyrillic) translation.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: bc58d3d143cd5c5be0b5e2da6b3894212cbad2c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc58d3d143cd5c5be0b5e2da6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 15 10:57:27 2011 +0200 po: Remove an English string from the Serbian (Cyrillic) translation. --- po/sr_RS(a)cyrillic.po | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/po/sr_RS(a)cyrillic.po b/po/sr_RS(a)cyrillic.po index edb71ac..17f43c4 100644 --- a/po/sr_RS(a)cyrillic.po +++ b/po/sr_RS(a)cyrillic.po @@ -6980,19 +6980,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"

1 0

Jacek Caban : vbscript: Store class_desc_t in vbdisp_t.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: efc59d1b19cff5b5e5ab184b7717defcf968c9a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc59d1b19cff5b5e5ab184b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:18:43 2011 +0200 vbscript: Store class_desc_t in vbdisp_t. --- dlls/vbscript/interp.c | 2 +- dlls/vbscript/vbdisp.c | 6 ++++-- dlls/vbscript/vbscript.h | 5 ++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 04ed81d..b413243 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -463,7 +463,7 @@ static HRESULT interp_new(exec_ctx_t *ctx) return E_FAIL; } - hres = create_vbdisp(&obj); + hres = create_vbdisp(class_desc, &obj); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 73006be..f1a323d 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -184,7 +184,7 @@ static IDispatchExVtbl DispatchExVtbl = { DispatchEx_GetNameSpaceParent }; -HRESULT create_vbdisp(vbdisp_t **ret) +HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) { vbdisp_t *vbdisp; @@ -194,6 +194,7 @@ HRESULT create_vbdisp(vbdisp_t **ret) vbdisp->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; vbdisp->ref = 1; + vbdisp->desc = desc; *ret = vbdisp; return S_OK; @@ -201,7 +202,8 @@ HRESULT create_vbdisp(vbdisp_t **ret) HRESULT init_global(script_ctx_t *ctx) { - return create_vbdisp(&ctx->script_obj); + ctx->script_desc.ctx = ctx; + return create_vbdisp(&ctx->script_desc, &ctx->script_obj); } HRESULT disp_get_id(IDispatch *disp, BSTR name, DISPID *id) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 9e77714..dabf52b 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -65,6 +65,8 @@ typedef struct { IDispatchEx IDispatchEx_iface; LONG ref; + + const class_desc_t *desc; } vbdisp_t; typedef enum { @@ -74,7 +76,7 @@ typedef enum { VBDISP_ANY } vbdisp_invoke_type_t; -HRESULT create_vbdisp(vbdisp_t**); +HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**); 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*); @@ -101,6 +103,7 @@ struct _script_ctx_t { IDispatch *host_global; + class_desc_t script_desc; vbdisp_t *script_obj; dynamic_var_t *global_vars;

1 0

Jacek Caban : vbscript: Added interp_set_ident implementation.
by Alexandre Julliard Sept. 15, 2011

Sept. 15, 2011

Module: wine Branch: master Commit: f683832ac1603aa904256f3eca730e45d35601fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f683832ac1603aa904256f3ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 15 14:17:51 2011 +0200 vbscript: Added interp_set_ident implementation. --- dlls/vbscript/interp.c | 15 +++++++++++++-- dlls/vbscript/tests/lang.vbs | 3 +++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index e61ed7a..705992c 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -388,8 +388,19 @@ static HRESULT interp_assign_ident(exec_ctx_t *ctx) static HRESULT interp_set_ident(exec_ctx_t *ctx) { const BSTR arg = ctx->instr->arg1.bstr; - FIXME("%s\n", debugstr_w(arg)); - return E_NOTIMPL; + IDispatch *disp; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_w(arg)); + + hres = stack_pop_disp(ctx, &disp); + if(FAILED(hres)) + return hres; + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = disp; + return assign_ident(ctx, ctx->instr->arg1.bstr, &v, TRUE); } static HRESULT interp_assign_member(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index a338e76..01c7072 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -355,6 +355,9 @@ x = false ok SetVal(x, true), "SetVal returned false?" Call ok(x, "x is not set to true by SetVal?") +set x = testObj +Call ok(getVT(x) = "VT_DISPATCH*", "getVT(x=testObj) = " & getVT(x)) + Class EmptyClass End Class

1 0