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

Jacek Caban : jscript: Removed no longer needed caller argument from jsdisp_get_idx.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 29b9237c91fee59c004ba728cc8491df2cde69c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b9237c91fee59c004ba728c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 12:14:51 2012 +0100 jscript: Removed no longer needed caller argument from jsdisp_get_idx. --- dlls/jscript/array.c | 35 +++++++++++++++++------------------ dlls/jscript/dispex.c | 4 ++-- dlls/jscript/function.c | 7 +++---- dlls/jscript/jscript.h | 2 +- 4 files changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 4cba634..8a75bbe 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -161,15 +161,14 @@ static HRESULT Array_length(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP return S_OK; } -static HRESULT concat_array(jsdisp_t *array, ArrayInstance *obj, DWORD *len, - jsexcept_t *ei, IServiceProvider *caller) +static HRESULT concat_array(jsdisp_t *array, ArrayInstance *obj, DWORD *len, jsexcept_t *ei) { VARIANT var; DWORD i; HRESULT hres; for(i=0; i < obj->length; i++) { - hres = jsdisp_get_idx(&obj->dispex, i, &var, ei, caller); + hres = jsdisp_get_idx(&obj->dispex, i, &var, ei); if(hres == DISP_E_UNKNOWNNAME) continue; if(FAILED(hres)) @@ -185,7 +184,7 @@ static HRESULT concat_array(jsdisp_t *array, ArrayInstance *obj, DWORD *len, return S_OK; } -static HRESULT concat_obj(jsdisp_t *array, IDispatch *obj, DWORD *len, jsexcept_t *ei, IServiceProvider *caller) +static HRESULT concat_obj(jsdisp_t *array, IDispatch *obj, DWORD *len, jsexcept_t *ei) { jsdisp_t *jsobj; VARIANT var; @@ -194,7 +193,7 @@ static HRESULT concat_obj(jsdisp_t *array, IDispatch *obj, DWORD *len, jsexcept_ jsobj = iface_to_jsdisp((IUnknown*)obj); if(jsobj) { if(is_class(jsobj, JSCLASS_ARRAY)) { - hres = concat_array(array, (ArrayInstance*)jsobj, len, ei, caller); + hres = concat_array(array, (ArrayInstance*)jsobj, len, ei); jsdisp_release(jsobj); return hres; } @@ -219,7 +218,7 @@ static HRESULT Array_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP if(FAILED(hres)) return hres; - hres = concat_obj(ret, jsthis->u.disp, &len, ei, caller); + hres = concat_obj(ret, jsthis->u.disp, &len, ei); if(SUCCEEDED(hres)) { VARIANT *arg; DWORD i; @@ -227,7 +226,7 @@ static HRESULT Array_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP for(i=0; i < arg_cnt(dp); i++) { arg = get_arg(dp, i); if(V_VT(arg) == VT_DISPATCH) - hres = concat_obj(ret, V_DISPATCH(arg), &len, ei, caller); + hres = concat_obj(ret, V_DISPATCH(arg), &len, ei); else hres = jsdisp_propput_idx(ret, len++, arg, ei); if(FAILED(hres)) @@ -268,7 +267,7 @@ static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, cons return E_OUTOFMEMORY; for(i=0; i < length; i++) { - hres = jsdisp_get_idx(array, i, &var, ei, caller); + hres = jsdisp_get_idx(array, i, &var, ei); if(hres == DISP_E_UNKNOWNNAME) { hres = S_OK; continue; @@ -401,7 +400,7 @@ static HRESULT Array_pop(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARA } length--; - hres = jsdisp_get_idx(jsthis, length, &val, ei, caller); + hres = jsdisp_get_idx(jsthis, length, &val, ei); if(SUCCEEDED(hres)) { hres = jsdisp_delete_idx(jsthis, length); } else if(hres == DISP_E_UNKNOWNNAME) { @@ -476,11 +475,11 @@ static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISP for(k=0; k<length/2; k++) { l = length-k-1; - hres1 = jsdisp_get_idx(jsthis, k, &v1, ei, sp); + hres1 = jsdisp_get_idx(jsthis, k, &v1, ei); if(FAILED(hres1) && hres1!=DISP_E_UNKNOWNNAME) return hres1; - hres2 = jsdisp_get_idx(jsthis, l, &v2, ei, sp); + hres2 = jsdisp_get_idx(jsthis, l, &v2, ei); if(FAILED(hres2) && hres2!=DISP_E_UNKNOWNNAME) { VariantClear(&v1); return hres2; @@ -543,14 +542,14 @@ static HRESULT Array_shift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPA return S_OK; } - hres = jsdisp_get_idx(jsthis, 0, &ret, ei, caller); + hres = jsdisp_get_idx(jsthis, 0, &ret, ei); if(hres == DISP_E_UNKNOWNNAME) { V_VT(&ret) = VT_EMPTY; hres = S_OK; } for(i=1; SUCCEEDED(hres) && i<length; i++) { - hres = jsdisp_get_idx(jsthis, i, &v, ei, caller); + hres = jsdisp_get_idx(jsthis, i, &v, ei); if(hres == DISP_E_UNKNOWNNAME) hres = jsdisp_delete_idx(jsthis, i-1); else if(SUCCEEDED(hres)) @@ -625,7 +624,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPA return hres; for(idx=start; idx<end; idx++) { - hres = jsdisp_get_idx(jsthis, idx, &v, ei, sp); + hres = jsdisp_get_idx(jsthis, idx, &v, ei); if(hres == DISP_E_UNKNOWNNAME) continue; @@ -756,7 +755,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPAR vtab = heap_alloc_zero(length * sizeof(VARIANT)); if(vtab) { for(i=0; i<length; i++) { - hres = jsdisp_get_idx(jsthis, i, vtab+i, ei, caller); + hres = jsdisp_get_idx(jsthis, i, vtab+i, ei); if(hres == DISP_E_UNKNOWNNAME) { V_VT(vtab+i) = VT_EMPTY; hres = S_OK; @@ -911,7 +910,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP return hres; for(i=0; SUCCEEDED(hres) && i < delete_cnt; i++) { - hres = jsdisp_get_idx(jsthis, start+i, &v, ei, caller); + hres = jsdisp_get_idx(jsthis, start+i, &v, ei); if(hres == DISP_E_UNKNOWNNAME) hres = S_OK; else if(SUCCEEDED(hres)) @@ -928,7 +927,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP if(add_args < delete_cnt) { for(i = start; SUCCEEDED(hres) && i < length-delete_cnt; i++) { - hres = jsdisp_get_idx(jsthis, i+delete_cnt, &v, ei, caller); + hres = jsdisp_get_idx(jsthis, i+delete_cnt, &v, ei); if(hres == DISP_E_UNKNOWNNAME) hres = jsdisp_delete_idx(jsthis, i+add_args); else if(SUCCEEDED(hres)) @@ -939,7 +938,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP hres = jsdisp_delete_idx(jsthis, i-1); }else if(add_args > delete_cnt) { for(i=length-delete_cnt; SUCCEEDED(hres) && i != start; i--) { - hres = jsdisp_get_idx(jsthis, i+delete_cnt-1, &v, ei, caller); + hres = jsdisp_get_idx(jsthis, i+delete_cnt-1, &v, ei); if(hres == DISP_E_UNKNOWNNAME) hres = jsdisp_delete_idx(jsthis, i+add_args-1); else if(SUCCEEDED(hres)) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 1de1dd0..418296f 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1148,7 +1148,7 @@ HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, VARIANT *var, jsex return prop_get(obj, prop, &dp, var, ei, NULL); } -HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, VARIANT *var, jsexcept_t *ei, IServiceProvider *caller) +HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, VARIANT *var, jsexcept_t *ei) { WCHAR name[12]; DISPPARAMS dp = {NULL, NULL, 0, 0}; @@ -1167,7 +1167,7 @@ HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, VARIANT *var, jsexcept_t *ei, I if(!prop || prop->type==PROP_DELETED) return DISP_E_UNKNOWNNAME; - return prop_get(obj, prop, &dp, var, ei, caller); + return prop_get(obj, prop, &dp, var, ei, NULL); } HRESULT jsdisp_propget(jsdisp_t *jsdisp, DISPID id, VARIANT *val, jsexcept_t *ei) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 23e7033..8b57721 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -357,8 +357,7 @@ static HRESULT Function_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return S_OK; } -static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, jsexcept_t *ei, IServiceProvider *caller, - DISPPARAMS *args) +static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, jsexcept_t *ei, DISPPARAMS *args) { VARIANT var, *argv; DWORD length, i; @@ -378,7 +377,7 @@ static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, jsexcept_t return E_OUTOFMEMORY; for(i=0; i<length; i++) { - hres = jsdisp_get_idx(arg_array, i, argv+i, ei, caller); + hres = jsdisp_get_idx(arg_array, i, argv+i, ei); if(hres == DISP_E_UNKNOWNNAME) V_VT(argv+i) = VT_EMPTY; else if(FAILED(hres)) { @@ -432,7 +431,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI } if(arg_array) { - hres = array_to_args(ctx, arg_array, ei, caller, &args); + hres = array_to_args(ctx, arg_array, ei, &args); jsdisp_release(arg_array); }else { FIXME("throw TypeError\n"); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index a4b7e19..9362fb6 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -217,7 +217,7 @@ HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,VARIANT*,jsexcept_t*) DECLSPE HRESULT jsdisp_propput_const(jsdisp_t*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; +HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; VARIANT_BOOL jsdisp_is_own_prop(jsdisp_t *obj, BSTR name) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Removed no longer needed caller argument from jsdisp_propget_name.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 0d9cc454065b12c98fd177fce97f1b9d1fc5dfb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d9cc454065b12c98fd177fce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 12:14:38 2012 +0100 jscript: Removed no longer needed caller argument from jsdisp_propget_name. --- dlls/jscript/array.c | 2 +- dlls/jscript/dispex.c | 4 ++-- dlls/jscript/engine.c | 2 +- dlls/jscript/error.c | 4 ++-- dlls/jscript/function.c | 2 +- dlls/jscript/jscript.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 0591154..4cba634 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -72,7 +72,7 @@ static HRESULT get_length(script_ctx_t *ctx, vdisp_t *vdisp, jsexcept_t *ei, jsd if(!is_jsdisp(vdisp)) return throw_type_error(ctx, ei, JS_E_JSCRIPT_EXPECTED, NULL); - hres = jsdisp_propget_name(vdisp->u.jsdisp, lengthW, &var, ei, NULL/*FIXME*/); + hres = jsdisp_propget_name(vdisp->u.jsdisp, lengthW, &var, ei); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 6ce585a..1de1dd0 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1131,7 +1131,7 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val return hres; } -HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, VARIANT *var, jsexcept_t *ei, IServiceProvider *caller) +HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, VARIANT *var, jsexcept_t *ei) { DISPPARAMS dp = {NULL, NULL, 0, 0}; dispex_prop_t *prop; @@ -1145,7 +1145,7 @@ HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, VARIANT *var, jsex if(!prop || prop->type==PROP_DELETED) return S_OK; - return prop_get(obj, prop, &dp, var, ei, caller); + return prop_get(obj, prop, &dp, var, ei, NULL); } HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, VARIANT *var, jsexcept_t *ei, IServiceProvider *caller) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 72626d5..2fa6b04 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1396,7 +1396,7 @@ static HRESULT interp_instanceof(exec_ctx_t *ctx) } if(is_class(obj, JSCLASS_FUNCTION)) { - hres = jsdisp_propget_name(obj, prototypeW, &prot, ctx->ei, NULL/*FIXME*/); + hres = jsdisp_propget_name(obj, prototypeW, &prot, ctx->ei); }else { hres = throw_type_error(ctx->parser->script, ctx->ei, JS_E_FUNCTION_EXPECTED, NULL); } diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 498aef2..bb50c3e 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -56,7 +56,7 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, return S_OK; } - hres = jsdisp_propget_name(jsthis, nameW, &v, ei, caller); + hres = jsdisp_propget_name(jsthis, nameW, &v, ei); if(FAILED(hres)) return hres; @@ -71,7 +71,7 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, } } - hres = jsdisp_propget_name(jsthis, messageW, &v, ei, caller); + hres = jsdisp_propget_name(jsthis, messageW, &v, ei); if(SUCCEEDED(hres)) { if(V_VT(&v) != VT_EMPTY) { hres = to_string(ctx, &v, ei, &msg); diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index aeef2b2..23e7033 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -364,7 +364,7 @@ static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, jsexcept_t DWORD length, i; HRESULT hres; - hres = jsdisp_propget_name(arg_array, lengthW, &var, ei, NULL/*FIXME*/); + hres = jsdisp_propget_name(arg_array, lengthW, &var, ei); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 4b71bf7..a4b7e19 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -216,7 +216,7 @@ HRESULT jsdisp_propget(jsdisp_t*,DISPID,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_const(jsdisp_t*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; +HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msiexec: Support the "b!" UI option.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 3a9d30d485fa8f067308c837944840435e5c5a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9d30d485fa8f067308c8379… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 12 12:24:55 2012 +0100 msiexec: Support the "b!" UI option. --- programs/msiexec/msiexec.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 4542f34..2227af0 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -887,6 +887,11 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; WINE_FIXME("Unknown modifier: !\n"); } + else if(msi_strequal(argvW[i]+2, "b!")) + { + InstallUILevel = INSTALLUILEVEL_BASIC; + WINE_FIXME("Unknown modifier: !\n"); + } else { fprintf(stderr, "Unknown option \"%s\" for UI level\n",

1 0

Jacek Caban : jscript: Added QueryService(SID_VariantConversion) implementation.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: c6360c3e6e7fc3d82c436580320eaafc4af3bf3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6360c3e6e7fc3d82c4365803… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 12:12:40 2012 +0100 jscript: Added QueryService(SID_VariantConversion) implementation. --- dlls/jscript/jscript.c | 6 +++++- dlls/jscript/jscript.h | 1 + dlls/jscript/jsutils.c | 11 ++++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 1ca5f9c..45edeb1 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -72,6 +72,7 @@ void script_release(script_ctx_t *ctx) jsheap_free(&ctx->tmp_heap); SysFreeString(ctx->last_match); + ctx->jscaller->ctx = NULL; IServiceProvider_Release(&ctx->jscaller->IServiceProvider_iface); heap_free(ctx); @@ -411,8 +412,10 @@ static ULONG WINAPI JScript_Release(IActiveScript *iface) if(!ref) { if(This->ctx && This->ctx->state != SCRIPTSTATE_CLOSED) IActiveScript_Close(&This->IActiveScript_iface); - if(This->ctx) + if(This->ctx) { + This->ctx->active_script = NULL; script_release(This->ctx); + } heap_free(This); unlock_module(); } @@ -709,6 +712,7 @@ static HRESULT WINAPI JScriptParse_InitNew(IActiveScriptParse *iface) ctx->ref = 1; ctx->state = SCRIPTSTATE_UNINITIALIZED; + ctx->active_script = &This->IActiveScript_iface; ctx->safeopt = This->safeopt; ctx->version = This->version; jsheap_init(&ctx->tmp_heap); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 47df16d..cdb8eb6 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -293,6 +293,7 @@ struct _script_ctx_t { LONG ref; SCRIPTSTATE state; + IActiveScript *active_script; exec_ctx_t *exec_ctx; named_item_t *named_items; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 6d77fe1..b9a35db 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -20,6 +20,7 @@ #include "wine/port.h" #include <math.h> +#include <assert.h> #include "jscript.h" #include "engine.h" @@ -769,8 +770,10 @@ static ULONG WINAPI JSCaller_Release(IServiceProvider *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + assert(!This->ctx); heap_free(This); + } return ref; } @@ -780,6 +783,11 @@ static HRESULT WINAPI JSCaller_QueryService(IServiceProvider *iface, REFGUID gui { JSCaller *This = impl_from_IServiceProvider(iface); + if(IsEqualGUID(guidService, &SID_VariantConversion) && This->ctx && This->ctx->active_script) { + TRACE("(%p)->(SID_VariantConversion)\n", This); + return IActiveScript_QueryInterface(This->ctx->active_script, riid, ppv); + } + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); *ppv = NULL; @@ -803,6 +811,7 @@ HRESULT create_jscaller(script_ctx_t *ctx) ret->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; ret->ref = 1; + ret->ctx = ctx; ctx->jscaller = ret; return S_OK;

1 0

Jacek Caban : jscript: Removed no longer needed caller argument from jsdisp_call_name.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: a80dd7cb79967706cdb8a9b0276d7063a15e99ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80dd7cb79967706cdb8a9b02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 12:13:25 2012 +0100 jscript: Removed no longer needed caller argument from jsdisp_call_name. --- dlls/jscript/dispex.c | 4 ++-- dlls/jscript/jscript.h | 2 +- dlls/jscript/object.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index f94e41d..ddd149f 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1006,7 +1006,7 @@ HRESULT jsdisp_call(jsdisp_t *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIA } HRESULT jsdisp_call_name(jsdisp_t *disp, const WCHAR *name, WORD flags, DISPPARAMS *dp, VARIANT *retv, - jsexcept_t *ei, IServiceProvider *caller) + jsexcept_t *ei) { dispex_prop_t *prop; HRESULT hres; @@ -1019,7 +1019,7 @@ HRESULT jsdisp_call_name(jsdisp_t *disp, const WCHAR *name, WORD flags, DISPPARA if(retv) V_VT(retv) = VT_EMPTY; - return invoke_prop_func(disp, disp, prop, flags, dp, retv, ei, caller); + return invoke_prop_func(disp, disp, prop, flags, dp, retv, ei, NULL); } HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index ee8999c..1a30b3f 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -209,7 +209,7 @@ HRESULT init_dispex_from_constr(jsdisp_t*,script_ctx_t*,const builtin_info_t*,js HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_call_value(jsdisp_t*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_call(jsdisp_t*,DISPID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_call_name(jsdisp_t*,const WCHAR*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; +HRESULT jsdisp_call_name(jsdisp_t*,const WCHAR*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT disp_propget(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propget(jsdisp_t*,DISPID,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index c1137c1..8c64122 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -90,7 +90,7 @@ static HRESULT Object_toLocaleString(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return E_FAIL; } - return jsdisp_call_name(jsthis->u.jsdisp, toStringW, DISPATCH_METHOD, &params, retv, ei, sp); + return jsdisp_call_name(jsthis->u.jsdisp, toStringW, DISPATCH_METHOD, &params, retv, ei); } static HRESULT Object_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp,

1 0

Jacek Caban : jscript: Added VARIANT conversion tests.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 93972b79cca1fcb6d0b2a21ce0b1c4a4645b297b URL: http://source.winehq.org/git/wine.git/?a=commit;h=93972b79cca1fcb6d0b2a21ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 12:12:55 2012 +0100 jscript: Added VARIANT conversion tests. --- dlls/jscript/tests/Makefile.in | 1 + dlls/jscript/tests/caller.c | 564 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 565 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=93972b79cca1fcb6d0b2a…

1 0

Jacek Caban : jscript: Added ChangeType implementation.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: bac7c1ef3650a6b48e97094bef87d87ad4bd7a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bac7c1ef3650a6b48e97094be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 12:12:26 2012 +0100 jscript: Added ChangeType implementation. --- dlls/jscript/jscript.c | 16 +++++++++- dlls/jscript/jscript.h | 2 + dlls/jscript/jsutils.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 4453bcc..1ca5f9c 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -1002,8 +1002,20 @@ static ULONG WINAPI VariantChangeType_Release(IVariantChangeType *iface) static HRESULT WINAPI VariantChangeType_ChangeType(IVariantChangeType *iface, VARIANT *dst, VARIANT *src, LCID lcid, VARTYPE vt) { JScript *This = impl_from_IVariantChangeType(iface); - FIXME("(%p)->(%p %s %x %d)\n", This, dst, debugstr_variant(src), lcid, vt); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%p %s %x %d)\n", This, dst, debugstr_variant(src), lcid, vt); + + if(!This->ctx) { + FIXME("Object uninitialized\n"); + return E_UNEXPECTED; + } + + hres = VariantClear(dst); + if(FAILED(hres)) + return hres; + + return variant_change_type(This->ctx, dst, src, vt); } static const IVariantChangeTypeVtbl VariantChangeTypeVtbl = { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 2e2d57b..47df16d 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -260,6 +260,8 @@ HRESULT to_uint32(script_ctx_t*,VARIANT*,jsexcept_t*,DWORD*) DECLSPEC_HIDDEN; HRESULT to_string(script_ctx_t*,VARIANT*,jsexcept_t*,BSTR*) DECLSPEC_HIDDEN; HRESULT to_object(script_ctx_t*,VARIANT*,IDispatch**) DECLSPEC_HIDDEN; +HRESULT variant_change_type(script_ctx_t*,VARIANT*,VARIANT*,VARTYPE); + BSTR int_to_bstr(int) DECLSPEC_HIDDEN; HRESULT double_to_bstr(double,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 2e1030e..6d77fe1 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -657,6 +657,76 @@ HRESULT to_object(script_ctx_t *ctx, VARIANT *v, IDispatch **disp) return S_OK; } +HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTYPE vt) +{ + jsexcept_t ei; + HRESULT hres; + + memset(&ei, 0, sizeof(ei)); + + switch(vt) { + case VT_I2: + case VT_I4: { + INT i; + + hres = to_int32(ctx, src, &ei, &i); + if(SUCCEEDED(hres)) { + if(vt == VT_I4) + V_I4(dst) = i; + else + V_I2(dst) = i; + } + break; + } + case VT_R8: + hres = to_number(ctx, src, &ei, dst); + if(SUCCEEDED(hres) && V_VT(dst) == VT_I4) + V_R8(dst) = V_I4(dst); + break; + case VT_R4: { + VARIANT n; + + hres = to_number(ctx, src, &ei, &n); + if(SUCCEEDED(hres)) + V_R4(dst) = num_val(&n); + break; + } + case VT_BOOL: { + VARIANT_BOOL b; + + hres = to_boolean(src, &b); + if(SUCCEEDED(hres)) + V_BOOL(dst) = b; + break; + } + case VT_BSTR: { + BSTR str; + + hres = to_string(ctx, src, &ei, &str); + if(SUCCEEDED(hres)) + V_BSTR(dst) = str; + break; + } + case VT_EMPTY: + hres = V_VT(src) == VT_EMPTY ? S_OK : E_NOTIMPL; + break; + case VT_NULL: + hres = V_VT(src) == VT_NULL ? S_OK : E_NOTIMPL; + break; + default: + FIXME("vt %d not implemented\n", vt); + hres = E_NOTIMPL; + } + + if(FAILED(hres)) { + VariantClear(&ei.var); + return hres; + } + + V_VT(dst) = vt; + return S_OK; +} + static inline JSCaller *impl_from_IServiceProvider(IServiceProvider *iface) { return CONTAINING_RECORD(iface, JSCaller, IServiceProvider_iface);

1 0

Hans Leidekker : msi: Deformat the description field of INSTALLMESSAGE_ACTIONDATA messages.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 531cab9febfa3ab674535aa652cfba7da1852518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=531cab9febfa3ab674535aa65… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 12 12:25:33 2012 +0100 msi: Deformat the description field of INSTALLMESSAGE_ACTIONDATA messages. --- dlls/msi/package.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 89da1da..dd11374 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1749,13 +1749,11 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall) INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIRECORD *record ) { - static const WCHAR szActionData[] = - {'A','c','t','i','o','n','D','a','t','a',0}; - static const WCHAR szSetProgress[] = - {'S','e','t','P','r','o','g','r','e','s','s',0}; - static const WCHAR szActionText[] = - {'A','c','t','i','o','n','T','e','x','t',0}; - LPWSTR message; + static const WCHAR szActionData[] = {'A','c','t','i','o','n','D','a','t','a',0}; + static const WCHAR szSetProgress[] = {'S','e','t','P','r','o','g','r','e','s','s',0}; + static const WCHAR szActionText[] = {'A','c','t','i','o','n','T','e','x','t',0}; + MSIRECORD *uirow; + LPWSTR deformated, message; DWORD i, len, total_len, log_type = 0; INT rc = 0; char *msg; @@ -1894,27 +1892,27 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC switch (eMessageType & 0xff000000) { case INSTALLMESSAGE_ACTIONDATA: - /* FIXME: format record here instead of in ui_actiondata to get the - * correct action data for external scripts */ - ControlEvent_FireSubscribedEvent(package, szActionData, record); + deformat_string(package, MSI_RecordGetString(record, 2), &deformated); + uirow = MSI_CreateRecord(1); + MSI_RecordSetStringW(uirow, 1, deformated); + msi_free(deformated); + + ControlEvent_FireSubscribedEvent(package, szActionData, uirow); + + msiobj_release(&uirow->hdr); break; - case INSTALLMESSAGE_ACTIONSTART: - { - MSIRECORD *uirow; - LPWSTR deformated; - LPCWSTR action_text = MSI_RecordGetString(record, 2); - deformat_string(package, action_text, &deformated); + case INSTALLMESSAGE_ACTIONSTART: + deformat_string(package, MSI_RecordGetString(record, 2), &deformated); uirow = MSI_CreateRecord(1); MSI_RecordSetStringW(uirow, 1, deformated); - TRACE("INSTALLMESSAGE_ACTIONSTART: %s\n", debugstr_w(deformated)); msi_free(deformated); ControlEvent_FireSubscribedEvent(package, szActionText, uirow); msiobj_release(&uirow->hdr); break; - } + case INSTALLMESSAGE_PROGRESS: ControlEvent_FireSubscribedEvent(package, szSetProgress, record); break;

1 0

Jacek Caban : jscript: Removed no longer needed caller argument from jsdisp_propput_name and jsdisp_propget .
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 12bc6e0cc718d3127df4c3be523f9d4812dd6503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12bc6e0cc718d3127df4c3be5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 12:14:10 2012 +0100 jscript: Removed no longer needed caller argument from jsdisp_propput_name and jsdisp_propget. --- dlls/jscript/array.c | 8 ++++---- dlls/jscript/dispex.c | 12 ++++++------ dlls/jscript/engine.c | 8 ++++---- dlls/jscript/error.c | 8 ++++---- dlls/jscript/function.c | 18 +++++++++--------- dlls/jscript/global.c | 8 ++++---- dlls/jscript/jscript.h | 4 ++-- dlls/jscript/regexp.c | 14 +++++++------- 8 files changed, 40 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12bc6e0cc718d3127df4c…

1 0

Jacek Caban : jscript: Removed no longer needed caller argument from jsdisp_call_value.
by Alexandre Julliard March 12, 2012

March 12, 2012

Module: wine Branch: master Commit: 07be020a48ca9cab5dd7b9d110d550453075538e URL: http://source.winehq.org/git/wine.git/?a=commit;h=07be020a48ca9cab5dd7b9d11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 12:13:10 2012 +0100 jscript: Removed no longer needed caller argument from jsdisp_call_value. --- dlls/jscript/array.c | 9 ++++----- dlls/jscript/dispex.c | 5 ++--- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.h | 2 +- dlls/jscript/string.c | 6 +++--- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index f99fe01..51fd94d 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -648,8 +648,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPA return S_OK; } -static HRESULT sort_cmp(script_ctx_t *ctx, jsdisp_t *cmp_func, VARIANT *v1, VARIANT *v2, jsexcept_t *ei, - IServiceProvider *caller, INT *cmp) +static HRESULT sort_cmp(script_ctx_t *ctx, jsdisp_t *cmp_func, VARIANT *v1, VARIANT *v2, jsexcept_t *ei, INT *cmp) { HRESULT hres; @@ -662,7 +661,7 @@ static HRESULT sort_cmp(script_ctx_t *ctx, jsdisp_t *cmp_func, VARIANT *v1, VARI args[0] = *v2; args[1] = *v1; - hres = jsdisp_call_value(cmp_func, DISPATCH_METHOD, &dp, &res, ei, caller); + hres = jsdisp_call_value(cmp_func, DISPATCH_METHOD, &dp, &res, ei); if(FAILED(hres)) return hres; @@ -786,7 +785,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPAR sorttab[i] = vtab+i; for(i=0; i < length/2; i++) { - hres = sort_cmp(ctx, cmp_func, sorttab[2*i+1], sorttab[2*i], ei, caller, &cmp); + hres = sort_cmp(ctx, cmp_func, sorttab[2*i+1], sorttab[2*i], ei, &cmp); if(FAILED(hres)) break; @@ -811,7 +810,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPAR memcpy(tmpbuf, sorttab+i, k*sizeof(VARIANT*)); while(a < k && b < bend) { - hres = sort_cmp(ctx, cmp_func, tmpbuf[a], sorttab[i+k+b], ei, caller, &cmp); + hres = sort_cmp(ctx, cmp_func, tmpbuf[a], sorttab[i+k+b], ei, &cmp); if(FAILED(hres)) break; diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 5ce98e7..f94e41d 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -979,14 +979,13 @@ HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID * return DISP_E_UNKNOWNNAME; } -HRESULT jsdisp_call_value(jsdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, - jsexcept_t *ei, IServiceProvider *caller) +HRESULT jsdisp_call_value(jsdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { vdisp_t vdisp; HRESULT hres; set_jsdisp(&vdisp, jsthis); - hres = jsthis->builtin_info->value_prop.invoke(jsthis->ctx, &vdisp, flags, dp, retv, ei, caller); + hres = jsthis->builtin_info->value_prop.invoke(jsthis->ctx, &vdisp, flags, dp, retv, ei, NULL); vdisp_release(&vdisp); return hres; } diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index c196e88..c8e740e 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -117,7 +117,7 @@ static HRESULT constructor_call(jsdisp_t *constr, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { if(flags != DISPATCH_PROPERTYGET) - return jsdisp_call_value(constr, flags, dp, retv, ei, sp); + return jsdisp_call_value(constr, flags, dp, retv, ei); jsdisp_addref(constr); var_set_jsdisp(retv, constr); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index cdb8eb6..ee8999c 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -207,7 +207,7 @@ HRESULT init_dispex(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DEC HRESULT init_dispex_from_constr(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN; HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_call_value(jsdisp_t*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; +HRESULT jsdisp_call_value(jsdisp_t*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_call(jsdisp_t*,DISPID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_call_name(jsdisp_t*,const WCHAR*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT disp_propget(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 9c947a1..44450e4 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -711,7 +711,7 @@ static HRESULT strbuf_append(strbuf_t *buf, const WCHAR *str, DWORD len) } static HRESULT rep_call(script_ctx_t *ctx, jsdisp_t *func, const WCHAR *str, match_result_t *match, - match_result_t *parens, DWORD parens_cnt, BSTR *ret, jsexcept_t *ei, IServiceProvider *caller) + match_result_t *parens, DWORD parens_cnt, BSTR *ret, jsexcept_t *ei) { DISPPARAMS dp = {NULL, NULL, 0, 0}; VARIANTARG *args, *arg; @@ -755,7 +755,7 @@ static HRESULT rep_call(script_ctx_t *ctx, jsdisp_t *func, const WCHAR *str, mat } if(SUCCEEDED(hres)) - hres = jsdisp_call_value(func, DISPATCH_METHOD, &dp, &var, ei, caller); + hres = jsdisp_call_value(func, DISPATCH_METHOD, &dp, &var, ei); for(i=0; i < parens_cnt+3; i++) { if(i != parens_cnt+1) @@ -884,7 +884,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI if(rep_func) { BSTR cstr; - hres = rep_call(ctx, rep_func, str, &match, parens, parens_cnt, &cstr, ei, caller); + hres = rep_call(ctx, rep_func, str, &match, parens, parens_cnt, &cstr, ei); if(FAILED(hres)) break;

1 0