March 2015 - Wine-Commits - list.winehq.org

Jacek Caban : vbscript: Pass DISPATCH_PROPERTYPUTREF flag to InvokeEx when apropriate.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: 571b09ce42dbe43b3f1b2bb8b414d5896fbf8a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=571b09ce42dbe43b3f1b2bb8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:40:36 2015 +0100 vbscript: Pass DISPATCH_PROPERTYPUTREF flag to InvokeEx when apropriate. --- dlls/vbscript/interp.c | 14 +++++++------- dlls/vbscript/vbdisp.c | 6 +++--- dlls/vbscript/vbscript.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4b45006..d2152cd 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -709,7 +709,7 @@ static HRESULT interp_mcallv(exec_ctx_t *ctx) return do_mcall(ctx, NULL); } -static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, DISPPARAMS *dp) +static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, WORD flags, DISPPARAMS *dp) { ref_t ref; HRESULT hres; @@ -762,7 +762,7 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, DISPPARAMS *dp) break; } case REF_DISP: - hres = disp_propput(ctx->script, ref.u.d.disp, ref.u.d.id, dp); + hres = disp_propput(ctx->script, ref.u.d.disp, ref.u.d.id, flags, dp); break; case REF_FUNC: FIXME("functions not implemented\n"); @@ -805,7 +805,7 @@ static HRESULT interp_assign_ident(exec_ctx_t *ctx) return hres; vbstack_to_dp(ctx, arg_cnt, TRUE, &dp); - hres = assign_ident(ctx, arg, &dp); + hres = assign_ident(ctx, arg, DISPATCH_PROPERTYPUT, &dp); if(FAILED(hres)) return hres; @@ -832,7 +832,7 @@ static HRESULT interp_set_ident(exec_ctx_t *ctx) return hres; vbstack_to_dp(ctx, 0, TRUE, &dp); - hres = assign_ident(ctx, ctx->instr->arg1.bstr, &dp); + hres = assign_ident(ctx, ctx->instr->arg1.bstr, DISPATCH_PROPERTYPUTREF, &dp); if(FAILED(hres)) return hres; @@ -867,7 +867,7 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) hres = disp_get_id(obj, identifier, VBDISP_LET, FALSE, &id); if(SUCCEEDED(hres)) { vbstack_to_dp(ctx, arg_cnt, TRUE, &dp); - hres = disp_propput(ctx->script, obj, id, &dp); + hres = disp_propput(ctx->script, obj, id, DISPATCH_PROPERTYPUT, &dp); } if(FAILED(hres)) return hres; @@ -908,7 +908,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) hres = disp_get_id(obj, identifier, VBDISP_SET, FALSE, &id); if(SUCCEEDED(hres)) { vbstack_to_dp(ctx, arg_cnt, TRUE, &dp); - hres = disp_propput(ctx->script, obj, id, &dp); + hres = disp_propput(ctx->script, obj, id, DISPATCH_PROPERTYPUTREF, &dp); } if(FAILED(hres)) return hres; @@ -1176,7 +1176,7 @@ static HRESULT interp_enumnext(exec_ctx_t *ctx) return hres; do_continue = hres == S_OK; - hres = assign_ident(ctx, ident, &dp); + hres = assign_ident(ctx, ident, DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF, &dp); VariantClear(&v); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index c9d318e..18ba966 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -1070,7 +1070,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp, return hres; } -HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp) +HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DISPPARAMS *dp) { IDispatchEx *dispex; EXCEPINFO ei = {0}; @@ -1078,13 +1078,13 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS * hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, DISPATCH_PROPERTYPUT, dp, NULL, &ei, NULL /* FIXME! */); + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, NULL, &ei, NULL /* FIXME! */); IDispatchEx_Release(dispex); }else { ULONG err = 0; TRACE("using IDispatch\n"); - hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, DISPATCH_PROPERTYPUT, dp, NULL, &ei, &err); + hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, NULL, &ei, &err); } return hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index d1f35be..cbb90ce 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -148,7 +148,7 @@ HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**) DECLSPEC_HIDDEN; HRESULT disp_get_id(IDispatch*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; HRESULT vbdisp_get_id(vbdisp_t*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC_HIDDEN; HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*) DECLSPEC_HIDDEN; +HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,WORD,DISPPARAMS*) DECLSPEC_HIDDEN; void collect_objects(script_ctx_t*) DECLSPEC_HIDDEN; HRESULT create_procedure_disp(script_ctx_t*,vbscode_t*,IDispatch**) DECLSPEC_HIDDEN; HRESULT create_script_disp(script_ctx_t*,ScriptDisp**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : vbscript: Convert VT_DISPATCH propput value to trivial value if DISPATCH_PROPERTYPUTREF is not set.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: 4bca1665c4dcd6e1c58322b8cb4e0b0ca9915033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bca1665c4dcd6e1c58322b8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:40:51 2015 +0100 vbscript: Convert VT_DISPATCH propput value to trivial value if DISPATCH_PROPERTYPUTREF is not set. --- dlls/vbscript/vbdisp.c | 73 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 51 insertions(+), 22 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 18ba966..a07020b 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -85,19 +85,43 @@ HRESULT vbdisp_get_id(vbdisp_t *This, BSTR name, vbdisp_invoke_type_t invoke_typ return DISP_E_UNKNOWNNAME; } -static VARIANT *get_propput_arg(const DISPPARAMS *dp) +static HRESULT get_propput_arg(script_ctx_t *ctx, const DISPPARAMS *dp, WORD flags, VARIANT *v, BOOL *is_owned) { unsigned i; for(i=0; i < dp->cNamedArgs; i++) { if(dp->rgdispidNamedArgs[i] == DISPID_PROPERTYPUT) - return dp->rgvarg+i; + break; + } + if(i == dp->cNamedArgs) { + WARN("no value to set\n"); + return DISP_E_PARAMNOTOPTIONAL; + } + + *v = dp->rgvarg[i]; + if(V_VT(v) == (VT_VARIANT|VT_BYREF)) + *v = *V_VARIANTREF(v); + *is_owned = FALSE; + + if(V_VT(v) == VT_DISPATCH) { + if(!(flags & DISPATCH_PROPERTYPUTREF)) { + DISPPARAMS val_dp = {NULL}; + VARIANT value; + HRESULT hres; + + hres = disp_call(ctx, V_DISPATCH(v), DISPID_VALUE, &val_dp, &value); + if(FAILED(hres)) + return hres; + + *v = value; + *is_owned = TRUE; + } } - return NULL; + return S_OK; } -static HRESULT invoke_variant_prop(VARIANT *v, WORD flags, DISPPARAMS *dp, VARIANT *res) +static HRESULT invoke_variant_prop(script_ctx_t *ctx, VARIANT *v, WORD flags, DISPPARAMS *dp, VARIANT *res) { HRESULT hres; @@ -115,13 +139,12 @@ static HRESULT invoke_variant_prop(VARIANT *v, WORD flags, DISPPARAMS *dp, VARIA case DISPATCH_PROPERTYPUT: case DISPATCH_PROPERTYPUTREF: case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { - VARIANT *put_val; + VARIANT put_val; + BOOL own_val; - put_val = get_propput_arg(dp); - if(!put_val) { - WARN("no value to set\n"); - return DISP_E_PARAMNOTOPTIONAL; - } + hres = get_propput_arg(ctx, dp, flags, &put_val, &own_val); + if(FAILED(hres)) + return hres; if(arg_cnt(dp)) { FIXME("Arguments not supported\n"); @@ -131,7 +154,10 @@ static HRESULT invoke_variant_prop(VARIANT *v, WORD flags, DISPPARAMS *dp, VARIA if(res) V_VT(res) = VT_EMPTY; - hres = VariantCopyInd(v, put_val); + if(own_val) + *v = put_val; + else + hres = VariantCopyInd(v, &put_val); break; } @@ -414,28 +440,31 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc case DISPATCH_PROPERTYPUT: case DISPATCH_PROPERTYPUTREF: case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { - VARIANT *put_val; DISPPARAMS dp = {NULL, NULL, 1, 0}; + BOOL needs_release; + VARIANT put_val; + HRESULT hres; if(arg_cnt(pdp)) { FIXME("arguments not implemented\n"); return E_NOTIMPL; } - put_val = get_propput_arg(pdp); - if(!put_val) { - WARN("no value to set\n"); - return DISP_E_PARAMNOTOPTIONAL; - } + hres = get_propput_arg(This->desc->ctx, pdp, wFlags, &put_val, &needs_release); + if(FAILED(hres)) + return hres; - dp.rgvarg = put_val; - func = This->desc->funcs[id].entries[V_VT(put_val) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; + dp.rgvarg = &put_val; + func = This->desc->funcs[id].entries[V_VT(&put_val) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; if(!func) { FIXME("no letter/setter\n"); return DISP_E_MEMBERNOTFOUND; } - return exec_script(This->desc->ctx, func, This, &dp, NULL); + hres = exec_script(This->desc->ctx, func, This, &dp, NULL); + if(needs_release) + VariantClear(&put_val); + return hres; } default: FIXME("flags %x\n", wFlags); @@ -444,7 +473,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc } if(id < This->desc->prop_cnt + This->desc->func_cnt) - return invoke_variant_prop(This->props+(id-This->desc->func_cnt), wFlags, pdp, pvarRes); + return invoke_variant_prop(This->desc->ctx, This->props+(id-This->desc->func_cnt), wFlags, pdp, pvarRes); if(This->desc->builtin_prop_cnt) { unsigned min = 0, max = This->desc->builtin_prop_cnt-1, i; @@ -849,7 +878,7 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return E_NOTIMPL; } - return invoke_variant_prop(&ident->u.var->v, wFlags, pdp, pvarRes); + return invoke_variant_prop(This->ctx, &ident->u.var->v, wFlags, pdp, pvarRes); } switch(wFlags) {

1 0

Jacek Caban : vbscript: Fail to set non-object values with DISPATCH_PROPERTYPUTREF flag.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: 86283b31db9c3fe43f42d024612365c4cd3b7dd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86283b31db9c3fe43f42d0246… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:40:59 2015 +0100 vbscript: Fail to set non-object values with DISPATCH_PROPERTYPUTREF flag. --- dlls/vbscript/vbdisp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index a07020b..eec0bf6 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -116,6 +116,9 @@ static HRESULT get_propput_arg(script_ctx_t *ctx, const DISPPARAMS *dp, WORD fla *v = value; *is_owned = TRUE; } + }else if(!(flags & DISPATCH_PROPERTYPUT)) { + WARN("%s can't be assigned without DISPATCH_PROPERTYPUT flag\n", debugstr_variant(v)); + return DISP_E_EXCEPTION; } return S_OK;

1 0

Jacek Caban : vbscript: Leave assigning value up to add_dynamic_var callers.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: 62bc8aeb0ff863c31d804406853f351659753c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62bc8aeb0ff863c31d8044068… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:41:17 2015 +0100 vbscript: Leave assigning value up to add_dynamic_var callers. --- dlls/vbscript/interp.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d2152cd..1fe7304 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -220,13 +220,12 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, - BOOL is_const, VARIANT *val, BOOL own_val, VARIANT **out_var) + BOOL is_const, VARIANT **out_var) { dynamic_var_t *new_var; heap_pool_t *heap; WCHAR *str; unsigned size; - HRESULT hres; heap = ctx->func->type == FUNC_GLOBAL ? &ctx->script->heap : &ctx->heap; @@ -241,15 +240,7 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, memcpy(str, name, size); new_var->name = str; new_var->is_const = is_const; - - if(own_val) { - new_var->v = *val; - }else { - V_VT(&new_var->v) = VT_EMPTY; - hres = VariantCopy(&new_var->v, val); - if(FAILED(hres)) - return hres; - } + V_VT(&new_var->v) = VT_EMPTY; if(ctx->func->type == FUNC_GLOBAL) { new_var->next = ctx->script->global_vars; @@ -259,9 +250,7 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, ctx->dynamic_vars = new_var; } - if(out_var) - *out_var = &new_var->v; - + *out_var = &new_var->v; return S_OK; } @@ -620,9 +609,8 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) break; case REF_NONE: if(res && !ctx->func->code_ctx->option_explicit && arg_cnt == 0) { - VARIANT v, *new; - VariantInit(&v); - hres = add_dynamic_var(ctx, identifier, FALSE, &v, FALSE, &new); + VARIANT *new; + hres = add_dynamic_var(ctx, identifier, FALSE, &new); if(FAILED(hres)) return hres; V_VT(res) = VT_BYREF|VT_VARIANT; @@ -778,13 +766,17 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, WORD flags, DISPPARAMS * FIXME("throw exception\n"); hres = E_FAIL; }else { + VARIANT *new_var; + if(arg_cnt(dp)) { FIXME("arg_cnt %d not supported\n", arg_cnt(dp)); return E_NOTIMPL; } TRACE("creating variable %s\n", debugstr_w(name)); - hres = add_dynamic_var(ctx, name, FALSE, dp->rgvarg, FALSE, NULL); + hres = add_dynamic_var(ctx, name, FALSE, &new_var); + if(SUCCEEDED(hres)) + hres = VariantCopyInd(new_var, dp->rgvarg); } } @@ -920,7 +912,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) static HRESULT interp_const(exec_ctx_t *ctx) { BSTR arg = ctx->instr->arg1.bstr; - variant_val_t val; + VARIANT *v; ref_t ref; HRESULT hres; @@ -937,11 +929,16 @@ static HRESULT interp_const(exec_ctx_t *ctx) return E_FAIL; } - hres = stack_pop_val(ctx, &val); + hres = stack_assume_val(ctx, 0); if(FAILED(hres)) return hres; - return add_dynamic_var(ctx, arg, TRUE, val.v, val.owned, NULL); + hres = add_dynamic_var(ctx, arg, TRUE, &v); + if(FAILED(hres)) + return hres; + + *v = *stack_pop(ctx); + return S_OK; } static HRESULT interp_val(exec_ctx_t *ctx)

1 0

Jacek Caban : vbscript: Leave converting object to trivial values up to calee.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: bd42594da9b6b5fc2af94f2fc8ce40223c956450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd42594da9b6b5fc2af94f2fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:41:30 2015 +0100 vbscript: Leave converting object to trivial values up to calee. --- dlls/vbscript/interp.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 1fe7304..64f998d 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -697,6 +697,29 @@ static HRESULT interp_mcallv(exec_ctx_t *ctx) return do_mcall(ctx, NULL); } +static HRESULT assign_value(exec_ctx_t *ctx, VARIANT *dst, VARIANT *src, WORD flags) +{ + HRESULT hres; + + hres = VariantCopyInd(dst, src); + if(FAILED(hres)) + return hres; + + if(V_VT(dst) == VT_DISPATCH && !(flags & DISPATCH_PROPERTYPUTREF)) { + DISPPARAMS dp = {NULL}; + VARIANT value; + + hres = disp_call(ctx->script, V_DISPATCH(dst), DISPID_VALUE, &dp, &value); + IDispatch_Release(V_DISPATCH(dst)); + if(FAILED(hres)) + return hres; + + *dst = value; + } + + return S_OK; +} + static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, WORD flags, DISPPARAMS *dp) { ref_t ref; @@ -746,7 +769,7 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, WORD flags, DISPPARAMS * return E_NOTIMPL; } - hres = VariantCopyInd(v, dp->rgvarg); + hres = assign_value(ctx, v, dp->rgvarg, flags); break; } case REF_DISP: @@ -776,7 +799,7 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, WORD flags, DISPPARAMS * TRACE("creating variable %s\n", debugstr_w(name)); hres = add_dynamic_var(ctx, name, FALSE, &new_var); if(SUCCEEDED(hres)) - hres = VariantCopyInd(new_var, dp->rgvarg); + hres = assign_value(ctx, new_var, dp->rgvarg, flags); } } @@ -792,10 +815,6 @@ static HRESULT interp_assign_ident(exec_ctx_t *ctx) TRACE("%s\n", debugstr_w(arg)); - hres = stack_assume_val(ctx, arg_cnt); - if(FAILED(hres)) - return hres; - vbstack_to_dp(ctx, arg_cnt, TRUE, &dp); hres = assign_ident(ctx, arg, DISPATCH_PROPERTYPUT, &dp); if(FAILED(hres)) @@ -852,10 +871,6 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) return E_FAIL; } - hres = stack_assume_val(ctx, arg_cnt); - if(FAILED(hres)) - return hres; - hres = disp_get_id(obj, identifier, VBDISP_LET, FALSE, &id); if(SUCCEEDED(hres)) { vbstack_to_dp(ctx, arg_cnt, TRUE, &dp);

1 0

Sebastian Lackner : winebuild: Conditionally use different code for restoring the context structure.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: 4c8b3f63be19e188fd379e9294df4a7eabb9198b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8b3f63be19e188fd379e929… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 2 00:29:42 2015 +0100 winebuild: Conditionally use different code for restoring the context structure. Fixes a regression introduced by 44fbc018eda12bdee5c2c1e2e40dbdc6a81b27fd. --- tools/winebuild/relay.c | 57 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 63c2ca4..cb4b0ca 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -852,36 +852,35 @@ static void build_call_from_regs_x86(void) /* Restore the context structure */ - output( "2:\n" ); + output( "2:\tpushl 0x94(%%ecx)\n" ); /* SegEs */ + output( "\tpopl %%es\n" ); + output( "\tpushl 0x90(%%ecx)\n" ); /* SegFs */ + output( "\tpopl %%fs\n" ); + output( "\tpushl 0x8c(%%ecx)\n" ); /* SegGs */ + output( "\tpopl %%gs\n" ); + + output( "\tmovw %%ss,%%ax\n" ); + output( "\tcmpw 0xc8(%%ecx),%%ax\n" ); /* SegSs */ + output( "\tjne 3f\n" ); /* As soon as we have switched stacks the context structure could * be invalid (when signal handlers are executed for example). Copy * values on the target stack before changing ESP. */ - output( "\tpushl 0xc8(%%ecx)\n" ); /* SegSs */ - output( "\tpopl %%es\n" ); output( "\tmovl 0xc4(%%ecx),%%eax\n" ); /* Esp */ output( "\tleal -4*4(%%eax),%%eax\n" ); output( "\tmovl 0xc0(%%ecx),%%edx\n" ); /* EFlags */ - output( "\t.byte 0x26\n\tmovl %%edx,3*4(%%eax)\n" ); + output( "\t.byte 0x36\n\tmovl %%edx,3*4(%%eax)\n" ); output( "\tmovl 0xbc(%%ecx),%%edx\n" ); /* SegCs */ - output( "\t.byte 0x26\n\tmovl %%edx,2*4(%%eax)\n" ); + output( "\t.byte 0x36\n\tmovl %%edx,2*4(%%eax)\n" ); output( "\tmovl 0xb8(%%ecx),%%edx\n" ); /* Eip */ - output( "\t.byte 0x26\n\tmovl %%edx,1*4(%%eax)\n" ); + output( "\t.byte 0x36\n\tmovl %%edx,1*4(%%eax)\n" ); output( "\tmovl 0xb0(%%ecx),%%edx\n" ); /* Eax */ - output( "\t.byte 0x26\n\tmovl %%edx,0*4(%%eax)\n" ); + output( "\t.byte 0x36\n\tmovl %%edx,0*4(%%eax)\n" ); - output( "\tpushl %%es\n" ); output( "\tpushl 0x98(%%ecx)\n" ); /* SegDs */ - output(" \tpushl 0x94(%%ecx)\n" ); /* SegEs */ - output( "\tpopl %%es\n" ); - output( "\tpushl 0x90(%%ecx)\n"); /* SegFs */ - output( "\tpopl %%fs\n" ); - output( "\tpushl 0x8c(%%ecx)\n"); /* SegGs */ - output( "\tpopl %%gs\n" ); - output( "\tmovl 0x9c(%%ecx),%%edi\n" ); /* Edi */ output( "\tmovl 0xa0(%%ecx),%%esi\n" ); /* Esi */ output( "\tmovl 0xa4(%%ecx),%%ebx\n" ); /* Ebx */ @@ -890,11 +889,37 @@ static void build_call_from_regs_x86(void) output( "\tmovl 0xac(%%ecx),%%ecx\n" ); /* Ecx */ output( "\tpopl %%ds\n" ); - output( "\tpopl %%ss\n" ); output( "\tmovl %%eax,%%esp\n" ); output( "\tpopl %%eax\n" ); output( "\tiret\n" ); + + output("3:\n"); + + /* Restore the context when the stack segment changes. We can't use + * the same code as above because we do not know if the stack segment + * is 16 or 32 bit, and 'movl' will throw an exception when we try to + * access memory above the limit. */ + + output( "\tmovl 0x9c(%%ecx),%%edi\n" ); /* Edi */ + output( "\tmovl 0xa0(%%ecx),%%esi\n" ); /* Esi */ + output( "\tmovl 0xa4(%%ecx),%%ebx\n" ); /* Ebx */ + output( "\tmovl 0xa8(%%ecx),%%edx\n" ); /* Edx */ + output( "\tmovl 0xb0(%%ecx),%%eax\n" ); /* Eax */ + output( "\tmovl 0xb4(%%ecx),%%ebp\n" ); /* Ebp */ + + output( "\tpushl 0xc8(%%ecx)\n" ); /* SegSs */ + output( "\tpopl %%ss\n" ); + output( "\tmovl 0xc4(%%ecx),%%esp\n" ); /* Esp */ + + output( "\tpushl 0xc0(%%ecx)\n" ); /* EFlags */ + output( "\tpushl 0xbc(%%ecx)\n" ); /* SegCs */ + output( "\tpushl 0xb8(%%ecx)\n" ); /* Eip */ + output( "\tpushl 0x98(%%ecx)\n" ); /* SegDs */ + output( "\tmovl 0xac(%%ecx),%%ecx\n" ); /* Ecx */ + + output( "\tpopl %%ds\n" ); + output( "\tiret\n" ); output_cfi( ".cfi_endproc" ); output_function_size( "__wine_call_from_regs" );

1 0

Nikolay Sivov : rpcrt4: Use RPC_* error code names.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: 0810db96faf76b04198efcdf14699096f0731b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0810db96faf76b04198efcdf1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 10:41:57 2015 +0300 rpcrt4: Use RPC_* error code names. --- dlls/rpcrt4/ndr_contexthandle.c | 26 +++++++++++++------------- dlls/rpcrt4/ndr_es.c | 12 ++++++------ dlls/rpcrt4/ndr_marshall.c | 6 +++--- dlls/rpcrt4/ndr_stubless.c | 2 +- dlls/rpcrt4/rpc_assoc.c | 4 ++-- dlls/rpcrt4/rpc_binding.c | 18 +++++++++--------- 6 files changed, 34 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0810db96faf76b04198ef…

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.5.6.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: 129ff974b48bc90a23f35b7a9eab4f2e3a0bd7c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129ff974b48bc90a23f35b7a9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 2 13:34:02 2015 -0600 mscoree: Update Wine Mono to 4.5.6. --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 9fbb386..f4edd02 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.5.4" -#define MONO_SHA "2b271d0bc92d5c9c45febd76fb11f9fcc29ea6d8" +#define MONO_VERSION "4.5.6" +#define MONO_SHA "12ec9a4fa5958426292effd40d9230c7acbba1e8" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index c84b25f..8b46fd5 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -675,7 +675,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.5.4"; + static const char* mono_version = "4.5.6"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Jacek Caban : vbscript: Added DISPATCH_PROPERTYPUTREF tests.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: 33c5a7d14c6a52b0a2a8a325d190335f6d159c0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c5a7d14c6a52b0a2a8a325d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 3 14:41:38 2015 +0100 vbscript: Added DISPATCH_PROPERTYPUTREF tests. --- dlls/vbscript/tests/run.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index c916382..a86711a 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -83,6 +83,8 @@ DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_vbvar_d); DEFINE_EXPECT(global_vbvar_i); +DEFINE_EXPECT(global_letobj_i); +DEFINE_EXPECT(global_setobj_i); DEFINE_EXPECT(testobj_propget_d); DEFINE_EXPECT(testobj_propget_i); DEFINE_EXPECT(testobj_propput_d); @@ -117,6 +119,8 @@ DEFINE_EXPECT(EnableModeless); #define DISPID_GLOBAL_TESTARRAY 1015 #define DISPID_GLOBAL_THROWINT 1016 #define DISPID_GLOBAL_TESTOPTIONALARG 1017 +#define DISPID_GLOBAL_LETOBJ 1018 +#define DISPID_GLOBAL_SETOBJ 1019 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -133,6 +137,7 @@ static BOOL strict_dispid_check, is_english, allow_ui; static const char *test_name = "(null)"; static int test_counter; static SCRIPTUICHANDLING uic_handling = SCRIPTUICHANDLING_NOUIERROR; +static IDispatchEx testObj; static BSTR a2bstr(const char *str) { @@ -333,9 +338,60 @@ static void test_disp(IDispatch *disp) ok(hres == DISP_E_MEMBERNOTFOUND, "InvokeEx failed: %08x, expected DISP_E_MEMBERNOTFOUND\n", hres); ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); + SET_EXPECT(testobj_value_i); + V_VT(args) = VT_DISPATCH; + V_DISPATCH(args) = (IDispatch*)&testObj; + dp.cArgs = dp.cNamedArgs = 1; + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + CHECK_CALLED(testobj_value_i); + + dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I2, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I2(&v) == 0, "V_I2(v) = %d\n", V_I2(&v)); + + V_VT(args) = VT_DISPATCH; + V_DISPATCH(args) = (IDispatch*)&testObj; + dp.cArgs = dp.cNamedArgs = 1; + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF, &dp, NULL, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + + V_VT(args) = VT_DISPATCH; + V_DISPATCH(args) = (IDispatch*)&testObj; + dp.cArgs = dp.cNamedArgs = 1; + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + + dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == (IDispatch*)&testObj, "V_DISPATCH(v) != testObj\n"); + + V_VT(args) = VT_BOOL; + V_BOOL(args) = VARIANT_TRUE; + dp.cArgs = dp.cNamedArgs = 1; + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF, &dp, NULL, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + + dp.cArgs = dp.cNamedArgs = 0; + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); + + V_VT(args) = VT_BOOL; + V_BOOL(args) = VARIANT_FALSE; + dp.cArgs = dp.cNamedArgs = 1; + hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYPUTREF, &dp, NULL, &ei, NULL); + ok(hres == DISP_E_EXCEPTION, "InvokeEx failed: %08x, expected DISP_E_EXCEPTION\n", hres); + V_VT(args) = VT_BOOL; V_BOOL(args) = VARIANT_FALSE; dp.cArgs = 1; + dp.cNamedArgs = 0; V_VT(&v) = VT_BOOL; hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYPUT, &dp, NULL, &ei, NULL); ok(hres == DISP_E_PARAMNOTOPTIONAL, "InvokeEx failed: %08x, expected DISP_E_PARAMNOTOPTIONAL\n", hres); @@ -962,6 +1018,16 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_VBVAR; return S_OK; } + if(!strcmp_wa(bstrName, "letobj")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_LETOBJ; + return S_OK; + } + if(!strcmp_wa(bstrName, "setobj")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_SETOBJ; + return S_OK; + } if(!strcmp_wa(bstrName, "isNullDisp")) { test_grfdex(grfdex, fdexNameCaseInsensitive); *pid = DISPID_GLOBAL_ISNULLDISP; @@ -1124,6 +1190,40 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(V_I2(pdp->rgvarg) == 3, "V_I2(psp->rgvargs) = %d\n", V_I2(pdp->rgvarg)); return S_OK; + case DISPID_GLOBAL_LETOBJ: + CHECK_EXPECT(global_letobj_i); + + ok(wFlags == DISPATCH_PROPERTYPUT, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(pdp->rgdispidNamedArgs != NULL, "rgdispidNamedArgs == NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_DISPATCH(pdp->rgvarg) == (IDispatch*)&testObj, "V_DISPATCH(psp->rgvargs) != testObj\n"); + return S_OK; + + case DISPID_GLOBAL_SETOBJ: + CHECK_EXPECT(global_setobj_i); + + ok(wFlags == DISPATCH_PROPERTYPUTREF, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(pdp->rgdispidNamedArgs != NULL, "rgdispidNamedArgs == NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_DISPATCH(pdp->rgvarg) == (IDispatch*)&testObj, "V_DISPATCH(psp->rgvargs) != testObj\n"); + return S_OK; + case DISPID_GLOBAL_TESTOBJ: ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); @@ -2027,6 +2127,22 @@ static void run_tests(void) CHECK_CALLED(global_vbvar_d); CHECK_CALLED(global_vbvar_i); + SET_EXPECT(global_letobj_i); + parse_script_a("Option Explicit\nletobj = testObj"); + CHECK_CALLED(global_letobj_i); + + SET_EXPECT(global_letobj_i); + parse_script_a("Option Explicit\ntest.letobj = testObj"); + CHECK_CALLED(global_letobj_i); + + SET_EXPECT(global_setobj_i); + parse_script_a("Option Explicit\nset setobj = testObj"); + CHECK_CALLED(global_setobj_i); + + SET_EXPECT(global_setobj_i); + parse_script_a("Option Explicit\nset test.setobj = testObj"); + CHECK_CALLED(global_setobj_i); + SET_EXPECT(testobj_propget_d); SET_EXPECT(testobj_propget_i); parse_script_a("dim x\nx = testObj.propget");

1 0

Sebastian Lackner : ntdll/tests: Add tests for NtQueryLicenseKey.
by Alexandre Julliard March 3, 2015

March 3, 2015

Module: wine Branch: master Commit: d336f1fe685e0c5720a01adf79266cb41c4c0bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d336f1fe685e0c5720a01adf7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 22 07:58:10 2014 +0100 ntdll/tests: Add tests for NtQueryLicenseKey. --- dlls/ntdll/tests/reg.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d336f1fe685e0c5720a01…

1 0