March 2012 - Wine-commits - list.winehq.org

Michael Stefaniuc : dplayx: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: f454d8cd0888880fc2e5fc509e6180eb92f03dd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f454d8cd0888880fc2e5fc509… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:34:50 2012 +0100 dplayx: Print the debug string and not the pointer to it. --- dlls/dplayx/dpclassfactory.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index d14169d..c0842b0 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -128,7 +128,7 @@ static IClassFactoryImpl DP_and_DPL_CF = {{&DP_and_DPL_Vtbl}, 1 }; */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - TRACE("(%p,%p,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if ( IsEqualCLSID( riid, &IID_IClassFactory ) ) { @@ -138,6 +138,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) return S_OK; } - ERR("(%p,%p,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + ERR("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Michael Stefaniuc : gameux: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: e5db5b8dfdec39cf865fde08e17f622130a54a09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5db5b8dfdec39cf865fde08e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:35:35 2012 +0100 gameux: Print the debug string and not the pointer to it. --- dlls/gameux/gameexplorer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index bada386..556bf36 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -683,7 +683,7 @@ static HRESULT GAMEUX_UpdateGame(LPGUID InstanceID) { LPWSTR lpRegistryPath; LPWSTR lpGDFBinaryPath, lpGameInstallDirectory; - TRACE("(%p)\n", debugstr_guid(InstanceID)); + TRACE("(%s)\n", debugstr_guid(InstanceID)); /* first, check is game exists in CURRENT_USER scope */ installScope = GIS_CURRENT_USER;

1 0

Michael Stefaniuc : ieframe: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 5a5a89a3276f377c97211df6efc916cae7fb97b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a5a89a3276f377c97211df6e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:36:19 2012 +0100 ieframe: Print the debug string and not the pointer to it. --- dlls/ieframe/dochost.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 9f22514..ac74c9c 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -520,8 +520,8 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, { DocHost *This = impl_from_IOleCommandTarget(iface); - TRACE("(%p)->(%s %d %d %p %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, - nCmdexecopt, debugstr_variant(pvaIn), debugstr_variant(pvaOut)); + TRACE("(%p)->(%s %d %d %s %s)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, + debugstr_variant(pvaIn), debugstr_variant(pvaOut)); if(!pguidCmdGroup) { switch(nCmdID) {

1 0

Michael Stefaniuc : msxml3: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 4df6fe1246a1db0c5a176982ef037c3c31d95904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df6fe1246a1db0c5a176982e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:37:36 2012 +0100 msxml3: Print the debug string and not the pointer to it. --- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/domdoc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index c6d1f8c..63265bf 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -380,7 +380,7 @@ static HRESULT WINAPI domcdata_put_text( BSTR p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - TRACE("(%p)->(%p)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); return node_put_text( &This->node, p ); } diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index aa0691c..6805c75 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2951,7 +2951,7 @@ static HRESULT WINAPI domdoc_getProperty( { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - TRACE("(%p)->(%p)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s)\n", This, debugstr_w(p)); if (!var) return E_INVALIDARG;

1 0

Michael Stefaniuc : mshtml: Print the debug string and not the pointer to it.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: e6a30efe70a784646e448ea14c62f88d19e61a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a30efe70a784646e448ea14… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 21 23:37:01 2012 +0100 mshtml: Print the debug string and not the pointer to it. --- dlls/mshtml/htmlanchor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 27d39e3..1ef7f72 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -392,7 +392,7 @@ static HRESULT WINAPI HTMLAnchorElement_get_protocol(IHTMLAnchorElement *iface, static HRESULT WINAPI HTMLAnchorElement_put_search(IHTMLAnchorElement *iface, BSTR v) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, debugstr_w(v)); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; }

1 0

Jacek Caban : vbscript: Evaluate object expression before value expression in member assignment.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 1e5c2134f1c1626b5f9931e439a56362b54877ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5c2134f1c1626b5f9931e43… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 26 11:53:08 2012 +0200 vbscript: Evaluate object expression before value expression in member assignment. --- dlls/vbscript/compile.c | 8 +++--- dlls/vbscript/interp.c | 68 ++++++++++++++++++++++++++++++---------------- 2 files changed, 48 insertions(+), 28 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 846a55d..f3d88a0 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -697,10 +697,6 @@ static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t * vbsop_t op; HRESULT hres; - hres = compile_expression(ctx, stat->value_expr); - if(FAILED(hres)) - return hres; - if(stat->member_expr->obj_expr) { hres = compile_expression(ctx, stat->member_expr->obj_expr); if(FAILED(hres)) @@ -711,6 +707,10 @@ static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t * op = is_set ? OP_set_ident : OP_assign_ident; } + hres = compile_expression(ctx, stat->value_expr); + if(FAILED(hres)) + return hres; + hres = compile_args(ctx, stat->member_expr->args, &args_cnt); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 82e3724..6e4827d 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -348,6 +348,33 @@ static HRESULT stack_pop_disp(exec_ctx_t *ctx, IDispatch **ret) return S_OK; } +static HRESULT stack_assume_disp(exec_ctx_t *ctx, unsigned n, IDispatch **disp) +{ + VARIANT *v = stack_top(ctx, n), *ref; + + if(V_VT(v) != VT_DISPATCH) { + if(V_VT(v) != (VT_VARIANT|VT_BYREF)) { + FIXME("not supported type: %s\n", debugstr_variant(v)); + return E_FAIL; + } + + ref = V_VARIANTREF(v); + if(V_VT(ref) != VT_DISPATCH) { + FIXME("not disp %s\n", debugstr_variant(ref)); + return E_FAIL; + } + + V_VT(v) = VT_DISPATCH; + V_DISPATCH(v) = V_DISPATCH(ref); + if(V_DISPATCH(v)) + IDispatch_AddRef(V_DISPATCH(v)); + } + + if(disp) + *disp = V_DISPATCH(v); + return S_OK; +} + static inline void instr_jmp(exec_ctx_t *ctx, unsigned addr) { ctx->instr = ctx->code->instrs + addr; @@ -623,7 +650,7 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) return E_NOTIMPL; } - hres = stack_pop_disp(ctx, &obj); + hres = stack_assume_disp(ctx, arg_cnt+1, &obj); if(FAILED(hres)) return hres; @@ -633,25 +660,25 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) } hres = stack_pop_val(ctx, &val); - if(FAILED(hres)) { - IDispatch_Release(obj); + if(FAILED(hres)) return hres; - } hres = disp_get_id(obj, identifier, VBDISP_LET, FALSE, &id); if(SUCCEEDED(hres)) hres = disp_propput(ctx->script, obj, id, val.v); - release_val(&val); - IDispatch_Release(obj); - return hres; + if(FAILED(hres)) + return hres; + + stack_popn(ctx, 1); + return S_OK; } static HRESULT interp_set_member(exec_ctx_t *ctx) { BSTR identifier = ctx->instr->arg1.bstr; const unsigned arg_cnt = ctx->instr->arg2.uint; - IDispatch *obj, *val; + IDispatch *obj; DISPID id; HRESULT hres; @@ -662,7 +689,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) return E_NOTIMPL; } - hres = stack_pop_disp(ctx, &obj); + hres = stack_assume_disp(ctx, 1, &obj); if(FAILED(hres)) return hres; @@ -671,25 +698,18 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) return E_FAIL; } - hres = stack_pop_disp(ctx, &val); - if(FAILED(hres)) { - IDispatch_Release(obj); + hres = stack_assume_disp(ctx, 0, NULL); + if(FAILED(hres)) return hres; - } hres = disp_get_id(obj, identifier, VBDISP_SET, FALSE, &id); - if(SUCCEEDED(hres)) { - VARIANT v; - - V_VT(&v) = VT_DISPATCH; - V_DISPATCH(&v) = val; - hres = disp_propput(ctx->script, obj, id, &v); - } + if(SUCCEEDED(hres)) + hres = disp_propput(ctx->script, obj, id, stack_top(ctx, 0)); + if(FAILED(hres)) + return hres; - if(val) - IDispatch_Release(val); - IDispatch_Release(obj); - return hres; + stack_popn(ctx, 2); + return S_OK; } static HRESULT interp_const(exec_ctx_t *ctx)

1 0

Jacek Caban : vbscript: Added parameterized assign identifier statement support.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 732abbbcc33b167cca6a4ff7cdef788e6cf58fbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=732abbbcc33b167cca6a4ff7c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 26 11:53:41 2012 +0200 vbscript: Added parameterized assign identifier statement support. --- dlls/vbscript/interp.c | 123 ++++++++++++++++++++++++++++++--------------- dlls/vbscript/vbdisp.c | 8 +-- dlls/vbscript/vbscript.h | 2 +- 3 files changed, 86 insertions(+), 47 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 6e4827d..8cfec58 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -315,6 +315,35 @@ static HRESULT stack_pop_val(exec_ctx_t *ctx, variant_val_t *v) return S_OK; } +static HRESULT stack_assume_val(exec_ctx_t *ctx, unsigned n) +{ + VARIANT *v = stack_top(ctx, n); + HRESULT hres; + + if(V_VT(v) == (VT_BYREF|VT_VARIANT)) { + VARIANT *ref = V_VARIANTREF(v); + + V_VT(v) = VT_EMPTY; + hres = VariantCopy(v, ref); + if(FAILED(hres)) + return hres; + } + + if(V_VT(v) == VT_DISPATCH) { + DISPPARAMS dp = {0}; + IDispatch *disp; + + disp = V_DISPATCH(v); + V_VT(v) = VT_EMPTY; + hres = disp_call(ctx->script, disp, DISPID_VALUE, &dp, v); + IDispatch_Release(disp); + if(FAILED(hres)) + return hres; + } + + return S_OK; +} + static inline void release_val(variant_val_t *v) { if(v->owned) @@ -380,11 +409,13 @@ static inline void instr_jmp(exec_ctx_t *ctx, unsigned addr) ctx->instr = ctx->code->instrs + addr; } -static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) +static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, BOOL is_propput, DISPPARAMS *dp) { - dp->cArgs = arg_cnt; - dp->rgdispidNamedArgs = NULL; - dp->cNamedArgs = 0; + static DISPID propput_dispid = DISPID_PROPERTYPUT; + + dp->cNamedArgs = is_propput ? 1 : 0; + dp->cArgs = arg_cnt + dp->cNamedArgs; + dp->rgdispidNamedArgs = is_propput ? &propput_dispid : NULL; if(arg_cnt) { VARIANT tmp; @@ -398,9 +429,9 @@ static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) ctx->stack[ctx->top-arg_cnt+i-1] = tmp; } - dp->rgvarg = ctx->stack + ctx->top-arg_cnt; + dp->rgvarg = ctx->stack + ctx->top-dp->cArgs; }else { - dp->rgvarg = NULL; + dp->rgvarg = is_propput ? ctx->stack+ctx->top-1 : NULL; } } @@ -416,7 +447,7 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) if(FAILED(hres)) return hres; - vbstack_to_dp(ctx, arg_cnt, &dp); + vbstack_to_dp(ctx, arg_cnt, FALSE, &dp); switch(ref.type) { case REF_VAR: @@ -503,7 +534,7 @@ static HRESULT do_mcall(exec_ctx_t *ctx, VARIANT *res) return E_FAIL; } - vbstack_to_dp(ctx, arg_cnt, &dp); + vbstack_to_dp(ctx, arg_cnt, FALSE, &dp); hres = disp_get_id(obj, identifier, VBDISP_CALLGET, FALSE, &id); if(SUCCEEDED(hres)) @@ -537,7 +568,7 @@ static HRESULT interp_mcallv(exec_ctx_t *ctx) return do_mcall(ctx, NULL); } -static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_val) +static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, DISPPARAMS *dp) { ref_t ref; HRESULT hres; @@ -550,22 +581,19 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_v case REF_VAR: { VARIANT *v = ref.u.v; + if(arg_cnt(dp)) { + FIXME("arg_cnt %d not supported\n", arg_cnt(dp)); + return E_NOTIMPL; + } + if(V_VT(v) == (VT_VARIANT|VT_BYREF)) v = V_VARIANTREF(v); - if(own_val) { - VariantClear(v); - *v = *val; - hres = S_OK; - }else { - hres = VariantCopy(v, val); - } + hres = VariantCopy(v, dp->rgvarg); break; } case REF_DISP: - hres = disp_propput(ctx->script, ref.u.d.disp, ref.u.d.id, val); - if(own_val) - VariantClear(val); + hres = disp_propput(ctx->script, ref.u.d.disp, ref.u.d.id, dp); break; case REF_FUNC: FIXME("functions not implemented\n"); @@ -581,8 +609,13 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_v FIXME("throw exception\n"); hres = E_FAIL; }else { + 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, val, own_val); + hres = add_dynamic_var(ctx, name, FALSE, dp->rgvarg, FALSE); } } @@ -593,29 +626,29 @@ static HRESULT interp_assign_ident(exec_ctx_t *ctx) { const BSTR arg = ctx->instr->arg1.bstr; const unsigned arg_cnt = ctx->instr->arg2.uint; - variant_val_t v; + DISPPARAMS dp; HRESULT hres; TRACE("%s\n", debugstr_w(arg)); - if(arg_cnt) { - FIXME("arguments not supported\n"); - return E_NOTIMPL; - } + hres = stack_assume_val(ctx, arg_cnt); + if(FAILED(hres)) + return hres; - hres = stack_pop_val(ctx, &v); + vbstack_to_dp(ctx, arg_cnt, TRUE, &dp); + hres = assign_ident(ctx, arg, &dp); if(FAILED(hres)) return hres; - return assign_ident(ctx, arg, v.v, v.owned); + stack_popn(ctx, arg_cnt+1); + return S_OK; } static HRESULT interp_set_ident(exec_ctx_t *ctx) { const BSTR arg = ctx->instr->arg1.bstr; const unsigned arg_cnt = ctx->instr->arg2.uint; - IDispatch *disp; - VARIANT v; + DISPPARAMS dp; HRESULT hres; TRACE("%s\n", debugstr_w(arg)); @@ -625,21 +658,25 @@ static HRESULT interp_set_ident(exec_ctx_t *ctx) return E_NOTIMPL; } - hres = stack_pop_disp(ctx, &disp); + hres = stack_assume_disp(ctx, 0, NULL); if(FAILED(hres)) return hres; - V_VT(&v) = VT_DISPATCH; - V_DISPATCH(&v) = disp; - return assign_ident(ctx, ctx->instr->arg1.bstr, &v, TRUE); + vbstack_to_dp(ctx, 0, TRUE, &dp); + hres = assign_ident(ctx, ctx->instr->arg1.bstr, &dp); + if(FAILED(hres)) + return hres; + + stack_popn(ctx, 1); + return S_OK; } static HRESULT interp_assign_member(exec_ctx_t *ctx) { BSTR identifier = ctx->instr->arg1.bstr; const unsigned arg_cnt = ctx->instr->arg2.uint; - variant_val_t val; IDispatch *obj; + DISPPARAMS dp; DISPID id; HRESULT hres; @@ -659,18 +696,19 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) return E_FAIL; } - hres = stack_pop_val(ctx, &val); + 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)) - hres = disp_propput(ctx->script, obj, id, val.v); - release_val(&val); + if(SUCCEEDED(hres)) { + vbstack_to_dp(ctx, arg_cnt, TRUE, &dp); + hres = disp_propput(ctx->script, obj, id, &dp); + } if(FAILED(hres)) return hres; - stack_popn(ctx, 1); + stack_popn(ctx, 2); return S_OK; } @@ -679,6 +717,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) BSTR identifier = ctx->instr->arg1.bstr; const unsigned arg_cnt = ctx->instr->arg2.uint; IDispatch *obj; + DISPPARAMS dp; DISPID id; HRESULT hres; @@ -703,8 +742,10 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) return hres; hres = disp_get_id(obj, identifier, VBDISP_SET, FALSE, &id); - if(SUCCEEDED(hres)) - hres = disp_propput(ctx->script, obj, id, stack_top(ctx, 0)); + if(SUCCEEDED(hres)) { + vbstack_to_dp(ctx, arg_cnt, TRUE, &dp); + hres = disp_propput(ctx->script, obj, id, &dp); + } if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index ab62c9f..1e9245a 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -576,23 +576,21 @@ 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, VARIANT *val) +HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp) { - DISPID propput_dispid = DISPID_PROPERTYPUT; - DISPPARAMS dp = {val, &propput_dispid, 1, 1}; IDispatchEx *dispex; EXCEPINFO ei = {0}; HRESULT hres; 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, DISPATCH_PROPERTYPUT, 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, DISPATCH_PROPERTYPUT, dp, NULL, &ei, &err); } return hres; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 173b03e..432380d 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -119,7 +119,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,VARIANT*) DECLSPEC_HIDDEN; +HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*) DECLSPEC_HIDDEN; void collect_objects(script_ctx_t*) DECLSPEC_HIDDEN; static inline unsigned arg_cnt(const DISPPARAMS *dp)

1 0

Jacek Caban : vbscript: Added parameterized assign member statement tests.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 1bc8db60051bef0dc2c4e92534c34930bac11c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc8db60051bef0dc2c4e9253… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 26 11:54:38 2012 +0200 vbscript: Added parameterized assign member statement tests. --- dlls/vbscript/tests/run.c | 63 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 62 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 3fb506b..fd64bfc 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -61,6 +61,8 @@ DEFINE_EXPECT(testobj_propget_d); DEFINE_EXPECT(testobj_propget_i); DEFINE_EXPECT(testobj_propput_d); DEFINE_EXPECT(testobj_propput_i); +DEFINE_EXPECT(global_propargput_d); +DEFINE_EXPECT(global_propargput_i); #define DISPID_GLOBAL_REPORTSUCCESS 1000 #define DISPID_GLOBAL_TRACE 1001 @@ -72,6 +74,8 @@ DEFINE_EXPECT(testobj_propput_i); #define DISPID_GLOBAL_ISNULLDISP 1007 #define DISPID_GLOBAL_TESTDISP 1008 #define DISPID_GLOBAL_REFOBJ 1009 +#define DISPID_GLOBAL_PROPARGPUT 1010 +#define DISPID_GLOBAL_COUNTER 1011 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -80,6 +84,7 @@ static const WCHAR testW[] = {'t','e','s','t',0}; static BOOL strict_dispid_check; static const char *test_name = "(null)"; +static int test_counter; static BSTR a2bstr(const char *str) { @@ -598,6 +603,17 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_REFOBJ; return S_OK; } + if(!strcmp_wa(bstrName, "propargput")) { + CHECK_EXPECT(global_propargput_d); + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_PROPARGPUT; + return S_OK; + } + if(!strcmp_wa(bstrName, "counter")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_COUNTER; + return S_OK; + } if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -717,7 +733,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); ok(pdp != NULL, "pdp == NULL\n"); - ok(!pdp->rgvarg, "rgvarg == NULL\n"); + ok(!pdp->rgvarg, "rgvarg != NULL\n"); ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); @@ -779,6 +795,43 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); test_disp(V_DISPATCH(pdp->rgvarg)); return S_OK; + + case DISPID_GLOBAL_PROPARGPUT: + CHECK_EXPECT(global_propargput_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 == 3, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pdp->rgdispidNamedArgs[0] == DISPID_PROPERTYPUT, "pdp->rgdispidNamedArgs[0] = %d\n", pdp->rgdispidNamedArgs[0]); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_I2, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_I2(pdp->rgvarg) == 0, "V_I2(psp->rgvargs) = %d\n", V_I2(pdp->rgvarg)); + + ok(V_VT(pdp->rgvarg+1) == VT_I2, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg+1)); + ok(V_I2(pdp->rgvarg+1) == 2, "V_I2(psp->rgvargs+1) = %d\n", V_I2(pdp->rgvarg+1)); + + ok(V_VT(pdp->rgvarg+2) == VT_I2, "V_VT(psp->rgvargs+2) = %d\n", V_VT(pdp->rgvarg+2)); + ok(V_I2(pdp->rgvarg+2) == 1, "V_I2(psp->rgvargs+2) = %d\n", V_I2(pdp->rgvarg+2)); + return S_OK; + + case DISPID_GLOBAL_COUNTER: + ok(pdp != NULL, "pdp == NULL\n"); + todo_wine ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_I2; + V_I2(pvarRes) = test_counter++; + return S_OK; } ok(0, "unexpected call %d\n", id); @@ -948,6 +1001,8 @@ static HRESULT parse_script(DWORD flags, BSTR script_str) ok(script_disp != NULL, "script_disp == NULL\n"); ok(script_disp != (IDispatch*)&Global, "script_disp == Global\n"); + test_counter = 0; + hres = IActiveScriptParse64_ParseScriptText(parser, script_str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); IActiveScript_Close(engine); @@ -1227,6 +1282,12 @@ static void run_tests(void) CHECK_CALLED(testobj_propput_d); CHECK_CALLED(testobj_propput_i); + SET_EXPECT(global_propargput_d); + SET_EXPECT(global_propargput_i); + parse_script_a("propargput(counter(), counter()) = counter()"); + CHECK_CALLED(global_propargput_d); + CHECK_CALLED(global_propargput_i); + parse_script_a("x = 1\n Call ok(x = 1, \"x = \" & x)"); parse_script_a("x = _ \n3");

1 0

Jacek Caban : vbscript: Added parameterized member assignment statement implementation.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: d0be36213a80c9257405771e8a88efe15b55b2fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0be36213a80c9257405771e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 26 11:54:54 2012 +0200 vbscript: Added parameterized member assignment statement implementation. --- dlls/vbscript/interp.c | 7 +------ dlls/vbscript/tests/run.c | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 8cfec58..67e1070 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -682,11 +682,6 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) TRACE("%s\n", debugstr_w(identifier)); - if(arg_cnt) { - FIXME("arguments not supported\n"); - return E_NOTIMPL; - } - hres = stack_assume_disp(ctx, arg_cnt+1, &obj); if(FAILED(hres)) return hres; @@ -708,7 +703,7 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - stack_popn(ctx, 2); + stack_popn(ctx, arg_cnt+2); return S_OK; } diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index fd64bfc..861ec7b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1288,6 +1288,12 @@ static void run_tests(void) CHECK_CALLED(global_propargput_d); CHECK_CALLED(global_propargput_i); + SET_EXPECT(global_propargput_d); + SET_EXPECT(global_propargput_i); + parse_script_a("test.propargput(counter(), counter()) = counter()"); + CHECK_CALLED(global_propargput_d); + CHECK_CALLED(global_propargput_i); + parse_script_a("x = 1\n Call ok(x = 1, \"x = \" & x)"); parse_script_a("x = _ \n3");

1 0

Jacek Caban : mshtml.idl: Added IHTMLObjectElement2 declaration.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: ab51e119b52937712bb2cc4c2c9b6c4d27eed407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab51e119b52937712bb2cc4c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 26 12:00:18 2012 +0200 mshtml.idl: Added IHTMLObjectElement2 declaration. --- include/mshtml.idl | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index d80400e..91e853b 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -15851,6 +15851,36 @@ interface IHTMLObjectElement : IDispatch } /***************************************************************************** + * IHTMLObjectElement2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f4cd-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLObjectElement2 : IDispatch +{ + [id(DISPID_IHTMLOBJECTELEMENT2_NAMEDRECORDSET)] + HRESULT namedRecordset( + [in] BSTR dataMember, + [in, optional] VARIANT *hierarchy, + [out, retval] IDispatch **ppRecordset); + + [propput, id(DISPID_IHTMLOBJECTELEMENT2_CLASSID), hidden] + HRESULT classid([in] BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT2_CLASSID), hidden] + HRESULT classid([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLOBJECTELEMENT2_DATA), hidden] + HRESULT data([in] BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT2_DATA), hidden] + HRESULT data([out, retval] BSTR *p); +} + +/***************************************************************************** * IHTMLParamElement interface */ [

1 0