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

Jacek Caban : jscript: Properly handle NULL strings in add_eval.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: f8b20563aa5c8419e82020698295d27e6aab5688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8b20563aa5c8419e82020698… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 14:28:02 2012 +0100 jscript: Properly handle NULL strings in add_eval. --- dlls/jscript/engine.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 11b434f..0ae142a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1509,8 +1509,11 @@ static HRESULT add_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep V_VT(retv) = VT_BSTR; V_BSTR(retv) = SysAllocStringLen(NULL, len1+len2); - memcpy(V_BSTR(retv), lstr, len1*sizeof(WCHAR)); - memcpy(V_BSTR(retv)+len1, rstr, (len2+1)*sizeof(WCHAR)); + if(len1) + memcpy(V_BSTR(retv), lstr, len1*sizeof(WCHAR)); + if(len2) + memcpy(V_BSTR(retv)+len1, rstr, len2*sizeof(WCHAR)); + V_BSTR(retv)[len1+len2] = 0; } if(V_VT(&l) != VT_BSTR)

1 0

Hans Leidekker : advapi32: Implement CredMarshalCredential and CredUnmarshalCredential.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: d5d2f01d3e8ed076ecf8f990210454047817fb72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d2f01d3e8ed076ecf8f9902… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 8 20:27:37 2012 +0100 advapi32: Implement CredMarshalCredential and CredUnmarshalCredential. --- dlls/advapi32/advapi32.spec | 8 +- dlls/advapi32/cred.c | 261 +++++++++++++++++++++++++++++++++++++ dlls/advapi32/tests/cred.c | 302 ++++++++++++++++++++++++++++++++++++++++++- include/wincred.h | 32 +++++ 4 files changed, 596 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5d2f01d3e8ed076ecf8f…

1 0

Dmitry Timoshkov : gdiplus: Create GDI brush only when needed.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 0d7bc4b325de1788dc2643ac84d5579bed82d562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7bc4b325de1788dc2643ac8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 8 20:32:28 2012 +0800 gdiplus: Create GDI brush only when needed. --- dlls/gdiplus/brush.c | 150 +++----------------------------- dlls/gdiplus/gdiplus_private.h | 2 - dlls/gdiplus/graphics.c | 189 +++++++++++++++++++++++++++++++++++++--- 3 files changed, 188 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d7bc4b325de1788dc264…

1 0

Jacek Caban : jscript: Pass proper caller argument to InvokeEx.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: dfb59c60498825ebdfae97d1cdc154c0b5c4ef62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb59c60498825ebdfae97d1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 14:28:16 2012 +0100 jscript: Pass proper caller argument to InvokeEx. --- dlls/jscript/dispex.c | 8 +++-- dlls/jscript/jscript.c | 9 +++++ dlls/jscript/jscript.h | 11 ++++++ dlls/jscript/jsutils.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/tests/run.c | 4 ++ 5 files changed, 110 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 0b73073..4ffb378 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1057,7 +1057,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DIS return IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, retv, &ei->ei, &err); } - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei->ei, caller); + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei->ei, &ctx->jscaller->IServiceProvider_iface); IDispatchEx_Release(dispex); return hres; @@ -1120,7 +1120,8 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, DISPATCH_PROPERTYPUT, &dp, NULL, &ei->ei, caller); + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, DISPATCH_PROPERTYPUT, &dp, NULL, &ei->ei, + &ctx->jscaller->IServiceProvider_iface); IDispatchEx_Release(dispex); }else { ULONG err = 0; @@ -1207,7 +1208,8 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val return IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, &err); } - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, caller); + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, + &ctx->jscaller->IServiceProvider_iface); IDispatchEx_Release(dispex); return hres; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 750104c..4453bcc 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -72,6 +72,8 @@ void script_release(script_ctx_t *ctx) jsheap_free(&ctx->tmp_heap); SysFreeString(ctx->last_match); + IServiceProvider_Release(&ctx->jscaller->IServiceProvider_iface); + heap_free(ctx); } @@ -694,6 +696,7 @@ static HRESULT WINAPI JScriptParse_InitNew(IActiveScriptParse *iface) { JScript *This = impl_from_IActiveScriptParse(iface); script_ctx_t *ctx; + HRESULT hres; TRACE("(%p)\n", This); @@ -710,6 +713,12 @@ static HRESULT WINAPI JScriptParse_InitNew(IActiveScriptParse *iface) ctx->version = This->version; jsheap_init(&ctx->tmp_heap); + hres = create_jscaller(ctx); + if(FAILED(hres)) { + heap_free(ctx); + return hres; + } + ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); if(ctx) { script_release(ctx); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index cbe3cf9..9248f23 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -279,10 +279,19 @@ typedef struct { void release_cc(cc_ctx_t*) DECLSPEC_HIDDEN; +typedef struct { + IServiceProvider IServiceProvider_iface; + + LONG ref; + + script_ctx_t *ctx; +} JSCaller; + struct _script_ctx_t { LONG ref; SCRIPTSTATE state; + exec_ctx_t *exec_ctx; named_item_t *named_items; IActiveScriptSite *site; @@ -291,6 +300,7 @@ struct _script_ctx_t { DWORD version; LCID lcid; cc_ctx_t *cc; + JSCaller *jscaller; jsheap_t tmp_heap; @@ -344,6 +354,7 @@ HRESULT create_string_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN HRESULT create_vbarray_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; IUnknown *create_ax_site(script_ctx_t*) DECLSPEC_HIDDEN; +HRESULT create_jscaller(script_ctx_t*) DECLSPEC_HIDDEN; typedef struct { const WCHAR *str; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index b145d8a..ba9f780 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -656,3 +656,84 @@ HRESULT to_object(script_ctx_t *ctx, VARIANT *v, IDispatch **disp) return S_OK; } + +static inline JSCaller *impl_from_IServiceProvider(IServiceProvider *iface) +{ + return CONTAINING_RECORD(iface, JSCaller, IServiceProvider_iface); +} + +static HRESULT WINAPI JSCaller_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) +{ + JSCaller *This = impl_from_IServiceProvider(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IServiceProvider_iface; + }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { + TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); + *ppv = &This->IServiceProvider_iface; + }else { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI JSCaller_AddRef(IServiceProvider *iface) +{ + JSCaller *This = impl_from_IServiceProvider(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI JSCaller_Release(IServiceProvider *iface) +{ + JSCaller *This = impl_from_IServiceProvider(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI JSCaller_QueryService(IServiceProvider *iface, REFGUID guidService, + REFIID riid, void **ppv) +{ + JSCaller *This = impl_from_IServiceProvider(iface); + + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + + *ppv = NULL; + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl ServiceProviderVtbl = { + JSCaller_QueryInterface, + JSCaller_AddRef, + JSCaller_Release, + JSCaller_QueryService +}; + +HRESULT create_jscaller(script_ctx_t *ctx) +{ + JSCaller *ret; + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; + ret->ref = 1; + + ctx->jscaller = ret; + return S_OK; +} diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index f83cedd..64a8c7e 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -286,6 +286,8 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { + ok(pspCaller != NULL, "pspCaller = NULL\n"); + switch(id) { case DISPID_VALUE: ok(pdp != NULL, "pdp == NULL\n"); @@ -498,6 +500,8 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { + ok(pspCaller != NULL, "pspCaller = NULL\n"); + switch(id) { case DISPID_GLOBAL_OK: ok(wFlags == INVOKE_FUNC || wFlags == (INVOKE_FUNC|INVOKE_PROPERTYGET), "wFlags = %x\n", wFlags);

1 0

Jacek Caban : jscript: Removed no longer needed caller argument of disp_call function.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: e0ae18260e66026e9591ff8d43742008c206e52e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ae18260e66026e9591ff8d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 14:28:33 2012 +0100 jscript: Removed no longer needed caller argument of disp_call function. --- dlls/jscript/dispex.c | 12 +++++------- dlls/jscript/engine.c | 6 +++--- dlls/jscript/jscript.h | 4 ++-- dlls/jscript/jsutils.c | 4 ++-- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 4ffb378..07c4cb7 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -368,7 +368,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, jsdisp_t *jsthis, dispex_prop_t if(FAILED(hres)) return hres; - hres = disp_call(This->ctx, V_DISPATCH(&prop->u.var), DISPID_VALUE, flags, &new_dp, retv, ei, caller); + hres = disp_call(This->ctx, V_DISPATCH(&prop->u.var), DISPID_VALUE, flags, &new_dp, retv, ei); if(new_dp.rgvarg != dp->rgvarg) { heap_free(new_dp.rgvarg); @@ -991,8 +991,7 @@ HRESULT jsdisp_call_value(jsdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT return hres; } -HRESULT jsdisp_call(jsdisp_t *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIANT *retv, - jsexcept_t *ei, IServiceProvider *caller) +HRESULT jsdisp_call(jsdisp_t *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { dispex_prop_t *prop; @@ -1004,7 +1003,7 @@ HRESULT jsdisp_call(jsdisp_t *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIA if(!prop) return DISP_E_MEMBERNOTFOUND; - 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 jsdisp_call_name(jsdisp_t *disp, const WCHAR *name, WORD flags, DISPPARAMS *dp, VARIANT *retv, @@ -1024,8 +1023,7 @@ HRESULT jsdisp_call_name(jsdisp_t *disp, const WCHAR *name, WORD flags, DISPPARA return invoke_prop_func(disp, disp, prop, flags, dp, retv, ei, caller); } -HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIANT *retv, - jsexcept_t *ei, IServiceProvider *caller) +HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { jsdisp_t *jsdisp; IDispatchEx *dispex; @@ -1033,7 +1031,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DIS jsdisp = iface_to_jsdisp((IUnknown*)disp); if(jsdisp) { - hres = jsdisp_call(jsdisp, id, flags, dp, retv, ei, caller); + hres = jsdisp_call(jsdisp, id, flags, dp, retv, ei); jsdisp_release(jsdisp); return hres; } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0ae142a..b96c55f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -990,7 +990,7 @@ static HRESULT interp_new(exec_ctx_t *ctx) jsstack_to_dp(ctx, arg, &dp); hres = disp_call(ctx->parser->script, V_DISPATCH(constr), DISPID_VALUE, - DISPATCH_CONSTRUCT, &dp, &v, ctx->ei, NULL/*FIXME*/); + DISPATCH_CONSTRUCT, &dp, &v, ctx->ei); if(FAILED(hres)) return hres; @@ -1015,7 +1015,7 @@ static HRESULT interp_call(exec_ctx_t *ctx) jsstack_to_dp(ctx, argn, &dp); hres = disp_call(ctx->parser->script, V_DISPATCH(objv), DISPID_VALUE, DISPATCH_METHOD, &dp, - do_ret ? &v : NULL, ctx->ei, NULL/*FIXME*/); + do_ret ? &v : NULL, ctx->ei); if(FAILED(hres)) return hres; @@ -1042,7 +1042,7 @@ static HRESULT interp_call_member(exec_ctx_t *ctx) return throw_type_error(ctx->parser->script, ctx->ei, id, NULL); jsstack_to_dp(ctx, argn, &dp); - hres = disp_call(ctx->parser->script, obj, id, DISPATCH_METHOD, &dp, do_ret ? &v : NULL, ctx->ei, NULL/*FIXME*/); + hres = disp_call(ctx->parser->script, obj, id, DISPATCH_METHOD, &dp, do_ret ? &v : NULL, ctx->ei); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 9248f23..ed2402d 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -206,9 +206,9 @@ HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,jsdisp_t*,jsdisp_t**) HRESULT init_dispex(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN; 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*,IServiceProvider*) 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(jsdisp_t*,DISPID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*) 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*,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index ba9f780..33540d7 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -221,7 +221,7 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret hres = jsdisp_get_id(jsdisp, hint == HINT_STRING ? toStringW : valueOfW, 0, &id); if(SUCCEEDED(hres)) { - hres = jsdisp_call(jsdisp, id, DISPATCH_METHOD, &dp, ret, ei, NULL /*FIXME*/); + hres = jsdisp_call(jsdisp, id, DISPATCH_METHOD, &dp, ret, ei); if(FAILED(hres)) { WARN("call error - forwarding exception\n"); jsdisp_release(jsdisp); @@ -237,7 +237,7 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret hres = jsdisp_get_id(jsdisp, hint == HINT_STRING ? valueOfW : toStringW, 0, &id); if(SUCCEEDED(hres)) { - hres = jsdisp_call(jsdisp, id, DISPATCH_METHOD, &dp, ret, ei, NULL /*FIXME*/); + hres = jsdisp_call(jsdisp, id, DISPATCH_METHOD, &dp, ret, ei); if(FAILED(hres)) { WARN("call error - forwarding exception\n"); jsdisp_release(jsdisp);

1 0

Jacek Caban : jscript: Removed no longer needed disp_propget caller argument.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: f560e98346700770c35e7f3a37dcde72d742e1ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=f560e98346700770c35e7f3a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 14:28:48 2012 +0100 jscript: Removed no longer needed disp_propget caller argument. --- dlls/jscript/dispex.c | 4 ++-- dlls/jscript/engine.c | 14 +++++++------- dlls/jscript/jscript.h | 2 +- dlls/jscript/jsutils.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 07c4cb7..e8cc6e9 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1184,7 +1184,7 @@ HRESULT jsdisp_propget(jsdisp_t *jsdisp, DISPID id, VARIANT *val, jsexcept_t *ei return prop_get(jsdisp, prop, &dp, val, ei, caller); } -HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) +HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val, jsexcept_t *ei) { DISPPARAMS dp = {NULL,NULL,0,0}; IDispatchEx *dispex; @@ -1193,7 +1193,7 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val jsdisp = iface_to_jsdisp((IUnknown*)disp); if(jsdisp) { - hres = jsdisp_propget(jsdisp, id, val, ei, caller); + hres = jsdisp_propget(jsdisp, id, val, ei, NULL); jsdisp_release(jsdisp); return hres; } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b96c55f..95b2348 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -230,7 +230,7 @@ static HRESULT exprval_value(script_ctx_t *ctx, exprval_t *val, jsexcept_t *ei, return E_FAIL; } - return disp_propget(ctx, val->u.idref.disp, val->u.idref.id, ret, ei, NULL/*FIXME*/); + return disp_propget(ctx, val->u.idref.disp, val->u.idref.id, ret, ei); case EXPRVAL_INVALID: assert(0); } @@ -843,7 +843,7 @@ static HRESULT interp_array(exec_ctx_t *ctx) hres = disp_get_id(ctx->parser->script, obj, name, 0, &id); SysFreeString(name); if(SUCCEEDED(hres)) { - hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei, NULL/*FIXME*/); + hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei); }else if(hres == DISP_E_UNKNOWNNAME) { V_VT(&v) = VT_EMPTY; hres = S_OK; @@ -873,7 +873,7 @@ static HRESULT interp_member(exec_ctx_t *ctx) hres = disp_get_id(ctx->parser->script, obj, arg, 0, &id); if(SUCCEEDED(hres)) { V_VT(&v) = VT_EMPTY; - hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei, NULL/*FIXME*/); + hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei); }else if(hres == DISP_E_UNKNOWNNAME) { V_VT(&v) = VT_EMPTY; hres = S_OK; @@ -940,7 +940,7 @@ static HRESULT interp_refval(exec_ctx_t *ctx) if(!disp) return throw_reference_error(ctx->parser->script, ctx->ei, JS_E_ILLEGAL_ASSIGN, NULL); - hres = disp_propget(ctx->parser->script, disp, id, &v, ctx->ei, NULL/*FIXME*/); + hres = disp_propget(ctx->parser->script, disp, id, &v, ctx->ei); if(FAILED(hres)) return hres; @@ -1784,7 +1784,7 @@ static HRESULT interp_typeofid(exec_ctx_t *ctx) return stack_push_string(ctx, undefinedW); V_VT(&v) = VT_EMPTY; - hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei, NULL/*FIXME*/); + hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei); IDispatch_Release(obj); if(FAILED(hres)) return stack_push_string(ctx, unknownW); @@ -1896,7 +1896,7 @@ static HRESULT interp_postinc(exec_ctx_t *ctx) if(!obj) return throw_type_error(ctx->parser->script, ctx->ei, JS_E_OBJECT_EXPECTED, NULL); - hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei, NULL/*FIXME*/); + hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei); if(SUCCEEDED(hres)) { VARIANT n, inc; @@ -1930,7 +1930,7 @@ static HRESULT interp_preinc(exec_ctx_t *ctx) if(!obj) return throw_type_error(ctx->parser->script, ctx->ei, JS_E_OBJECT_EXPECTED, NULL); - hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei, NULL/*FIXME*/); + hres = disp_propget(ctx->parser->script, obj, id, &v, ctx->ei); if(SUCCEEDED(hres)) { VARIANT n; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index ed2402d..42537cc 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -210,7 +210,7 @@ HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,WORD,DISPPARAMS*,VARIANT*,jsex HRESULT jsdisp_call_value(jsdisp_t*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*) 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*,IServiceProvider*) 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*,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT jsdisp_propget(jsdisp_t*,DISPID,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 33540d7..2e1030e 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -211,7 +211,7 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret jsdisp = iface_to_jsdisp((IUnknown*)V_DISPATCH(v)); if(!jsdisp) { V_VT(ret) = VT_EMPTY; - return disp_propget(ctx, V_DISPATCH(v), DISPID_VALUE, ret, ei, NULL /*FIXME*/); + return disp_propget(ctx, V_DISPATCH(v), DISPID_VALUE, ret, ei); } if(hint == NO_HINT)

1 0

Henri Verbeet : d3dx9/tests: Add some tests for loading luminance/ alpha data.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: db9e7836fad08002345f5322973555b2e26bd7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=db9e7836fad08002345f53229… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 8 20:27:13 2012 +0100 d3dx9/tests: Add some tests for loading luminance/alpha data. --- dlls/d3dx9_36/tests/surface.c | 127 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 124 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index ab47c6f..2e9da17 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -205,13 +205,16 @@ static void test_D3DXGetImageInfo(void) } #define check_pixel_1bpp(lockrect, x, y, color) \ -ok(((BYTE*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch] == color, "Got color %#x, expected %#x\n", ((BYTE*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch], color) +ok(((BYTE*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch] == color, "Got color 0x%02x, expected 0x%02x.\n", \ +((BYTE*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch], color) #define check_pixel_2bpp(lockrect, x, y, color) \ -ok(((WORD*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch / 2] == color, "Got color %#x, expected %#x\n", ((WORD*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch / 2], color) +ok(((WORD*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch / 2] == color, "Got color 0x%04x, expected 0x%04x.\n", \ +((WORD*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch / 2], color) #define check_pixel_4bpp(lockrect, x, y, color) \ -ok(((DWORD*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch / 4] == color, "Got color %#x, expected %#x\n", ((DWORD*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch / 4], color) +ok(((DWORD*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch / 4] == color, "Got color 0x%08x, expected 0x%08x.\n", \ +((DWORD*)(lockrect).pBits)[(x) + (y) * (lockrect).Pitch / 4], color) static void test_D3DXLoadSurface(IDirect3DDevice9 *device) { HRESULT hr; @@ -222,6 +225,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) const WORD pixdata_a8r3g3b2[] = { 0x57df, 0x98fc, 0xacdd, 0xc891 }; const WORD pixdata_a1r5g5b5[] = { 0x46b5, 0x99c8, 0x06a2, 0x9431 }; const WORD pixdata_r5g6b5[] = { 0x9ef6, 0x658d, 0x0aee, 0x42ee }; + const WORD pixdata_a8l8[] = { 0xff00, 0x00ff, 0xff30, 0x7f7f }; const DWORD pixdata_g16r16[] = { 0x07d23fbe, 0xdc7f44a4, 0xe4d8976b, 0x9a84fe89 }; const DWORD pixdata_a8b8g8r8[] = { 0xc3394cf0, 0x235ae892, 0x09b197fd, 0x8dc32bf6 }; const DWORD pixdata_a2r10g10b10[] = { 0x57395aff, 0x5b7668fd, 0xb0d856b5, 0xff2c61d6 }; @@ -430,6 +434,18 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) } IDirect3DSurface9_UnlockRect(surf); + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a8l8, + D3DFMT_A8L8, 4, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(SUCCEEDED(hr), "Failed to load surface, hr %#x.\n", hr); + hr = IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + check_pixel_4bpp(lockrect, 0, 0, 0xff000000); + check_pixel_4bpp(lockrect, 1, 0, 0x00ffffff); + check_pixel_4bpp(lockrect, 0, 1, 0xff303030); + check_pixel_4bpp(lockrect, 1, 1, 0x7f7f7f7f); + hr = IDirect3DSurface9_UnlockRect(surf); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + check_release((IUnknown*)surf, 0); } @@ -497,6 +513,111 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) check_pixel_2bpp(lockrect, 1, 1, 0xff0e); IDirect3DSurface9_UnlockRect(surf); + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a8l8, + D3DFMT_A8L8, 4, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(SUCCEEDED(hr), "Failed to load surface, hr %#x.\n", hr); + hr = IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + check_pixel_2bpp(lockrect, 0, 0, 0x8000); + check_pixel_2bpp(lockrect, 1, 0, 0x7fff); + check_pixel_2bpp(lockrect, 0, 1, 0x98c6); + check_pixel_2bpp(lockrect, 1, 1, 0x3def); + hr = IDirect3DSurface9_UnlockRect(surf); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + check_release((IUnknown*)surf, 0); + } + + /* A8L8 */ + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 2, D3DFMT_A8L8, D3DPOOL_DEFAULT, &surf, NULL); + if (FAILED(hr)) + skip("Failed to create A8L8 surface, hr %#x.\n", hr); + else + { + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a8r3g3b2, + D3DFMT_A8R3G3B2, 4, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(SUCCEEDED(hr), "Failed to load surface, hr %#x.\n", hr); + hr = IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + check_pixel_2bpp(lockrect, 0, 0, 0x57f7); + check_pixel_2bpp(lockrect, 1, 0, 0x98ed); + check_pixel_2bpp(lockrect, 0, 1, 0xaceb); + check_pixel_2bpp(lockrect, 1, 1, 0xc88d); + hr = IDirect3DSurface9_UnlockRect(surf); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a1r5g5b5, + D3DFMT_A1R5G5B5, 4, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, D3D_OK); + hr = IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + check_pixel_2bpp(lockrect, 0, 0, 0x00a6); + check_pixel_2bpp(lockrect, 1, 0, 0xff62); + check_pixel_2bpp(lockrect, 0, 1, 0x007f); + check_pixel_2bpp(lockrect, 1, 1, 0xff19); + hr = IDirect3DSurface9_UnlockRect(surf); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_r5g6b5, + D3DFMT_R5G6B5, 4, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(SUCCEEDED(hr), "Failed to load surface, hr %#x.\n", hr); + hr = IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + check_pixel_2bpp(lockrect, 0, 0, 0xffce); + check_pixel_2bpp(lockrect, 1, 0, 0xff9c); + check_pixel_2bpp(lockrect, 0, 1, 0xff4d); + check_pixel_2bpp(lockrect, 1, 1, 0xff59); + hr = IDirect3DSurface9_UnlockRect(surf); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_g16r16, + D3DFMT_G16R16, 8, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(SUCCEEDED(hr), "Failed to load surface, hr %#x.\n", hr); + hr = IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + check_pixel_2bpp(lockrect, 0, 0, 0xff25); + check_pixel_2bpp(lockrect, 1, 0, 0xffbe); + check_pixel_2bpp(lockrect, 0, 1, 0xffd6); + check_pixel_2bpp(lockrect, 1, 1, 0xffb6); + hr = IDirect3DSurface9_UnlockRect(surf); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a8b8g8r8, + D3DFMT_A8B8G8R8, 8, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(SUCCEEDED(hr), "Failed to load surface, hr %#x.\n", hr); + hr = IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + check_pixel_2bpp(lockrect, 0, 0, 0xc36d); + check_pixel_2bpp(lockrect, 1, 0, 0x23cb); + check_pixel_2bpp(lockrect, 0, 1, 0x09af); + check_pixel_2bpp(lockrect, 1, 1, 0x8d61); + hr = IDirect3DSurface9_UnlockRect(surf); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a2r10g10b10, + D3DFMT_A2R10G10B10, 8, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(SUCCEEDED(hr), "Failed to load surface, hr %#x.\n", hr); + hr = IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + check_pixel_2bpp(lockrect, 0, 0, 0x558c); + check_pixel_2bpp(lockrect, 1, 0, 0x5565); + check_pixel_2bpp(lockrect, 0, 1, 0xaa95); + check_pixel_2bpp(lockrect, 1, 1, 0xffcb); + hr = IDirect3DSurface9_UnlockRect(surf); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a8l8, + D3DFMT_A8L8, 4, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(SUCCEEDED(hr), "Failed to load surface, hr %#x.\n", hr); + hr = IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + check_pixel_2bpp(lockrect, 0, 0, 0xff00); + check_pixel_2bpp(lockrect, 1, 0, 0x00ff); + check_pixel_2bpp(lockrect, 0, 1, 0xff30); + check_pixel_2bpp(lockrect, 1, 1, 0x7f7f); + hr = IDirect3DSurface9_UnlockRect(surf); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + check_release((IUnknown*)surf, 0); }

1 0

Henri Verbeet : wined3d: Remove a texture dimension check in state_alpha().
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 06aab27197d5f8c135d2b16793c72de7b32977b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06aab27197d5f8c135d2b1679… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 8 20:27:15 2012 +0100 wined3d: Remove a texture dimension check in state_alpha(). I don't think there's any reason color-keying shouldn't work on e.g. cube textures, although it probably isn't very common either. --- dlls/wined3d/state.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 264d16d..5e6c537 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -528,16 +528,10 @@ static void state_alpha(struct wined3d_context *context, const struct wined3d_st */ if (state->textures[0]) { - struct wined3d_texture *texture = state->textures[0]; - GLenum texture_dimensions = texture->target; + struct wined3d_surface *surface = surface_from_resource(state->textures[0]->sub_resources[0]); - if (texture_dimensions == GL_TEXTURE_2D || texture_dimensions == GL_TEXTURE_RECTANGLE_ARB) - { - struct wined3d_surface *surf = surface_from_resource(texture->sub_resources[0]); - - if (surf->CKeyFlags & WINEDDSD_CKSRCBLT) - enable_ckey = TRUE; - } + if (surface->CKeyFlags & WINEDDSD_CKSRCBLT) + enable_ckey = TRUE; } if (enable_ckey || context->last_was_ckey)

1 0

Henri Verbeet : ddraw: Get rid of IDirectDrawImpl.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 1cee1891fd9b195d0f876a7c7fe2d0bfc0f77fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cee1891fd9b195d0f876a7c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 8 20:27:16 2012 +0100 ddraw: Get rid of IDirectDrawImpl. --- dlls/ddraw/ddraw.c | 623 ++++++++++++++++++++++---------------------- dlls/ddraw/ddraw_private.h | 39 ++-- dlls/ddraw/device.c | 2 +- dlls/ddraw/light.c | 2 +- dlls/ddraw/main.c | 22 +- dlls/ddraw/material.c | 2 +- dlls/ddraw/palette.c | 2 +- dlls/ddraw/surface.c | 2 +- dlls/ddraw/vertexbuffer.c | 2 +- dlls/ddraw/viewport.c | 2 +- 10 files changed, 346 insertions(+), 352 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1cee1891fd9b195d0f876…

1 0

André Hentschel : dbghelp: Silence arm_fetch_minidump_module.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 84a036a435c86e3a75d185fa0cbd3ffed38fec9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a036a435c86e3a75d185fa0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:27:54 2012 +0100 dbghelp: Silence arm_fetch_minidump_module. --- dlls/dbghelp/cpu_arm.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index eeb8984..a38afe8 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -238,7 +238,9 @@ static BOOL arm_fetch_minidump_thread(struct dump_context* dc, unsigned index, u static BOOL arm_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags) { - FIXME("NIY\n"); + /* FIXME: actually, we should probably take care of FPO data, unless it's stored in + * function table minidump stream + */ return FALSE; }

1 0