September 2009 - Wine-Commits

Jacek Caban : msxml3: Store xmlnode pointer in domattr.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: f78f5a6110b0f32e41ce3acfdc0a6a91e425116c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78f5a6110b0f32e41ce3acfd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 30 15:34:03 2009 +0200 msxml3: Store xmlnode pointer in domattr. --- dlls/msxml3/attribute.c | 96 ++++++++++++++++++++++------------------------- 1 files changed, 45 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f78f5a6110b0f32e41ce3…

1 0

Rico Schüller : d3d10: Forward ID3D10EffectVariable functions from ID3D10EffectConstantBuffer to ID3D10EffectVariable .
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: 3eb2d779e408e773ea4224a776b7038fd858b999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb2d779e408e773ea4224a77… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 30 11:41:16 2009 +0200 d3d10: Forward ID3D10EffectVariable functions from ID3D10EffectConstantBuffer to ID3D10EffectVariable. --- dlls/d3d10/effect.c | 124 ++++++++++----------------------------------------- 1 files changed, 24 insertions(+), 100 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ab50663..27e68d6 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2022,220 +2022,144 @@ static BOOL STDMETHODCALLTYPE d3d10_effect_constant_buffer_IsValid(ID3D10EffectC static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetType(ID3D10EffectConstantBuffer *iface) { - FIXME("iface %p stub!\n", iface); - - return NULL; + return d3d10_effect_variable_GetType((ID3D10EffectVariable *)iface); } static HRESULT STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetDesc(ID3D10EffectConstantBuffer *iface, D3D10_EFFECT_VARIABLE_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); - - return E_NOTIMPL; + return d3d10_effect_variable_GetDesc((ID3D10EffectVariable *)iface, desc); } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetAnnotationByIndex( ID3D10EffectConstantBuffer *iface, UINT index) { - struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; - struct d3d10_effect_variable *a; - - TRACE("iface %p, index %u\n", iface, index); - - if (index >= This->annotation_count) - { - WARN("Invalid index specified\n"); - return (ID3D10EffectVariable *)&null_variable; - } - - a = &This->annotations[index]; - - TRACE("Returning annotation %p, %s\n", a, debugstr_a(a->name)); - - return (ID3D10EffectVariable *)a; + return d3d10_effect_variable_GetAnnotationByIndex((ID3D10EffectVariable *)iface, index); } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetAnnotationByName( ID3D10EffectConstantBuffer *iface, LPCSTR name) { - struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; - unsigned int i; - - TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); - - for (i = 0; i < This->annotation_count; ++i) - { - struct d3d10_effect_variable *a = &This->annotations[i]; - if (!strcmp(a->name, name)) - { - TRACE("Returning annotation %p\n", a); - return (ID3D10EffectVariable *)a; - } - } - - WARN("Invalid name specified\n"); - - return (ID3D10EffectVariable *)&null_variable; + return d3d10_effect_variable_GetAnnotationByName((ID3D10EffectVariable *)iface, name); } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetMemberByIndex( ID3D10EffectConstantBuffer *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); - - return NULL; + return d3d10_effect_variable_GetMemberByIndex((ID3D10EffectVariable *)iface, index); } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetMemberByName( ID3D10EffectConstantBuffer *iface, LPCSTR name) { - FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); - - return NULL; + return d3d10_effect_variable_GetMemberByName((ID3D10EffectVariable *)iface, name); } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetMemberBySemantic( ID3D10EffectConstantBuffer *iface, LPCSTR semantic) { - FIXME("iface %p, semantic %s stub!\n", iface, debugstr_a(semantic)); - - return NULL; + return d3d10_effect_variable_GetMemberBySemantic((ID3D10EffectVariable *)iface, semantic); } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetElement( ID3D10EffectConstantBuffer *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); - - return NULL; + return d3d10_effect_variable_GetElement((ID3D10EffectVariable *)iface, index); } static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetParentConstantBuffer( ID3D10EffectConstantBuffer *iface) { - FIXME("iface %p stub!\n", iface); - - return NULL; + return d3d10_effect_variable_GetParentConstantBuffer((ID3D10EffectVariable *)iface); } static struct ID3D10EffectScalarVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsScalar( ID3D10EffectConstantBuffer *iface) { - FIXME("iface %p stub!\n", iface); - - return NULL; + return d3d10_effect_variable_AsScalar((ID3D10EffectVariable *)iface); } static struct ID3D10EffectVectorVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsVector( ID3D10EffectConstantBuffer *iface) { - FIXME("iface %p stub!\n", iface); - - return NULL; + return d3d10_effect_variable_AsVector((ID3D10EffectVariable *)iface); } static struct ID3D10EffectMatrixVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsMatrix( ID3D10EffectConstantBuffer *iface) { - FIXME("iface %p stub!\n", iface); - - return NULL; + return d3d10_effect_variable_AsMatrix((ID3D10EffectVariable *)iface); } static struct ID3D10EffectStringVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsString( ID3D10EffectConstantBuffer *iface) { - FIXME("iface %p stub!\n", iface); - - return NULL; + return d3d10_effect_variable_AsString((ID3D10EffectVariable *)iface); } static struct ID3D10EffectShaderResourceVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsShaderResource( ID3D10EffectConstantBuffer *iface) { - FIXME("iface %p stub!\n", iface); - - return NULL; + return d3d10_effect_variable_AsShaderResource((ID3D10EffectVariable *)iface); } static struct ID3D10EffectRenderTargetViewVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsRenderTargetView( ID3D10EffectConstantBuffer *iface) { - FIXME("iface %p stub!\n", iface); - - return NULL; + return d3d10_effect_variable_AsRenderTargetView((ID3D10EffectVariable *)iface); } static struct ID3D10EffectDepthStencilViewVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsDepthStencilView( ID3D10EffectConstantBuffer *iface) { - FIXME("iface %p stub!\n", iface); - - return NULL; + return d3d10_effect_variable_AsDepthStencilView((ID3D10EffectVariable *)iface); } static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsConstantBuffer( ID3D10EffectConstantBuffer *iface) { - FIXME("iface %p stub!\n", iface); - - return NULL; + return d3d10_effect_variable_AsConstantBuffer((ID3D10EffectVariable *)iface); } static struct ID3D10EffectShaderVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsShader( ID3D10EffectConstantBuffer *iface) { - FIXME("iface %p stub!\n", iface); - - return NULL; + return d3d10_effect_variable_AsShader((ID3D10EffectVariable *)iface); } static struct ID3D10EffectBlendVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsBlend(ID3D10EffectConstantBuffer *iface) { - FIXME("iface %p stub!\n", iface); - - return NULL; + return d3d10_effect_variable_AsBlend((ID3D10EffectVariable *)iface); } static struct ID3D10EffectDepthStencilVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsDepthStencil( ID3D10EffectConstantBuffer *iface) { - FIXME("iface %p stub!\n", iface); - - return NULL; + return d3d10_effect_variable_AsDepthStencil((ID3D10EffectVariable *)iface); } static struct ID3D10EffectRasterizerVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsRasterizer( ID3D10EffectConstantBuffer *iface) { - FIXME("iface %p stub!\n", iface); - - return NULL; + return d3d10_effect_variable_AsRasterizer((ID3D10EffectVariable *)iface); } static struct ID3D10EffectSamplerVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsSampler( ID3D10EffectConstantBuffer *iface) { - FIXME("iface %p stub!\n", iface); - - return NULL; + return d3d10_effect_variable_AsSampler((ID3D10EffectVariable *)iface); } static HRESULT STDMETHODCALLTYPE d3d10_effect_constant_buffer_SetRawValue(ID3D10EffectConstantBuffer *iface, void *data, UINT offset, UINT count) { - FIXME("iface %p, data %p, offset %u, count %u stub!\n", iface, data, offset, count); - - return E_NOTIMPL; + return d3d10_effect_variable_SetRawValue((ID3D10EffectVariable *)iface, data, offset, count); } static HRESULT STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetRawValue(ID3D10EffectConstantBuffer *iface, void *data, UINT offset, UINT count) { - FIXME("iface %p, data %p, offset %u, count %u stub!\n", iface, data, offset, count); - - return E_NOTIMPL; + return d3d10_effect_variable_GetRawValue((ID3D10EffectVariable *)iface, data, offset, count); } /* ID3D10EffectConstantBuffer methods */

1 0

Rico Schüller : d3d10: Parse constant buffer type.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: 10a4516e50b8fdf731807fb7265d3902c2469c83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a4516e50b8fdf731807fb72… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 30 11:39:56 2009 +0200 d3d10: Parse constant buffer type. --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 66 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 60 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 7ef2c17..ae4d6f2 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -109,8 +109,8 @@ struct d3d10_effect_local_buffer struct d3d10_effect *effect; char *name; DWORD data_size; - DWORD member_count; DWORD annotation_count; + struct d3d10_effect_type *type; struct d3d10_effect_variable *members; struct d3d10_effect_variable *annotations; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ccbc3c4..e2a1c88 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -717,8 +717,18 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, cons { unsigned int i; DWORD offset; + D3D10_CBUFFER_TYPE d3d10_cbuffer_type; HRESULT hr; + l->type = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*l->type)); + if (!l->type) + { + ERR("Failed to allocate local buffer type memory.\n"); + return E_OUTOFMEMORY; + } + l->type->vtbl = &d3d10_effect_type_vtbl; + l->type->type_class = D3D10_SVC_OBJECT; + read_dword(ptr, &offset); TRACE("Local buffer name at offset %#x.\n", offset); @@ -732,10 +742,36 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, cons read_dword(ptr, &l->data_size); TRACE("Local buffer data size: %#x.\n", l->data_size); - skip_dword_unknown(ptr, 1); + read_dword(ptr, &d3d10_cbuffer_type); + TRACE("Local buffer type: %#x.\n", d3d10_cbuffer_type); + + switch(d3d10_cbuffer_type) + { + case D3D10_CT_CBUFFER: + l->type->basetype = D3D10_SVT_CBUFFER; + if (!copy_name("cbuffer", &l->type->name)) + { + ERR("Failed to copy name.\n"); + return E_OUTOFMEMORY; + } + break; - read_dword(ptr, &l->member_count); - TRACE("Local buffer member count: %#x.\n", l->member_count); + case D3D10_CT_TBUFFER: + l->type->basetype = D3D10_SVT_TBUFFER; + if (!copy_name("tbuffer", &l->type->name)) + { + ERR("Failed to copy name.\n"); + return E_OUTOFMEMORY; + } + break; + + default: + ERR("Unexpected D3D10_CBUFFER_TYPE %#x!\n", d3d10_cbuffer_type); + return E_FAIL; + } + + read_dword(ptr, &l->type->member_count); + TRACE("Local buffer member count: %#x.\n", l->type->member_count); skip_dword_unknown(ptr, 1); @@ -759,14 +795,14 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, cons if (FAILED(hr)) return hr; } - l->members = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, l->member_count * sizeof(*l->members)); + l->members = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, l->type->member_count * sizeof(*l->members)); if (!l->members) { ERR("Failed to allocate members memory.\n"); return E_OUTOFMEMORY; } - for (i = 0; i < l->member_count; ++i) + for (i = 0; i < l->type->member_count; ++i) { struct d3d10_effect_variable *v = &l->members[i]; @@ -775,7 +811,21 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, cons hr = parse_fx10_variable(v, ptr, data); if (FAILED(hr)) return hr; + + l->type->size_packed += v->type->size_packed; + l->type->size_unpacked += v->type->size_unpacked; } + l->type->stride = l->type->size_unpacked = (l->type->size_unpacked + 0xf) & ~0xf; + + TRACE("Constant buffer:\n"); + TRACE("\tType name: %s.\n", debugstr_a(l->type->name)); + TRACE("\tElement count: %u.\n", l->type->element_count); + TRACE("\tMember count: %u.\n", l->type->member_count); + TRACE("\tUnpacked size: %#x.\n", l->type->size_unpacked); + TRACE("\tStride: %#x.\n", l->type->stride); + TRACE("\tPacked size %#x.\n", l->type->size_packed); + TRACE("\tBasetype: %s.\n", debug_d3d10_shader_variable_type(l->type->basetype)); + TRACE("\tTypeclass: %s.\n", debug_d3d10_shader_variable_class(l->type->type_class)); return S_OK; } @@ -1070,12 +1120,14 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_local_buffer * HeapFree(GetProcessHeap(), 0, l->name); if (l->members) { - for (i = 0; i < l->member_count; ++i) + for (i = 0; i < l->type->member_count; ++i) { d3d10_effect_variable_destroy(&l->members[i]); } HeapFree(GetProcessHeap(), 0, l->members); } + HeapFree(GetProcessHeap(), 0, l->type->name); + HeapFree(GetProcessHeap(), 0, l->type); if (l->annotations) { @@ -1254,7 +1306,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB struct d3d10_effect_local_buffer *l = &This->local_buffers[i]; unsigned int j; - for (j = 0; j < l->member_count; ++j) + for (j = 0; j < l->type->member_count; ++j) { struct d3d10_effect_variable *v = &l->members[j];

1 0

Jacek Caban : jscript: Added ActiveXObject constructor implementation.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: 6d4533a8f87cae8b8f0e481ea777a38ab487cdd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4533a8f87cae8b8f0e481ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 30 14:34:47 2009 +0200 jscript: Added ActiveXObject constructor implementation. --- dlls/jscript/Makefile.in | 2 +- dlls/jscript/activex.c | 124 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/error.c | 5 ++ dlls/jscript/jscript.c | 6 ++ dlls/jscript/jscript.h | 4 +- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + 7 files changed, 139 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index d9d490a..6373796 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = jscript.dll -IMPORTS = oleaut32 user32 advapi32 kernel32 +IMPORTS = oleaut32 ole32 user32 advapi32 kernel32 RC_SRCS = \ jscript_De.rc \ diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index eada0c2..2029edf 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -20,16 +20,136 @@ #include "wine/port.h" #include "jscript.h" +#include "objsafe.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(jscript); +/* Defined as extern in urlmon.idl, but not exported by uuid.lib */ +const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = + {0x10200490,0xfa38,0x11d0,{0xac,0x0e,0x00,0xa0,0xc9,0xf,0xff,0xc0}}; + +static IInternetHostSecurityManager *get_sec_mgr(script_ctx_t *ctx) +{ + IInternetHostSecurityManager *secmgr; + IServiceProvider *sp; + HRESULT hres; + + if(!ctx->site) + return NULL; + + if(ctx->secmgr) + return ctx->secmgr; + + hres = IActiveScriptSite_QueryInterface(ctx->site, &IID_IServiceProvider, (void**)&sp); + if(FAILED(hres)) + return NULL; + + hres = IServiceProvider_QueryService(sp, &SID_SInternetHostSecurityManager, &IID_IInternetHostSecurityManager, + (void**)&secmgr); + IServiceProvider_Release(sp); + if(FAILED(hres)) + return NULL; + + return ctx->secmgr = secmgr; +} + +static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) +{ + IInternetHostSecurityManager *secmgr; + struct CONFIRMSAFETY cs; + DWORD policy_size; + BYTE *bpolicy; + IUnknown *obj; + DWORD policy; + GUID guid; + HRESULT hres; + + hres = CLSIDFromProgID(progid, &guid); + if(FAILED(hres)) + return NULL; + + TRACE("GUID %s\n", debugstr_guid(&guid)); + + secmgr = get_sec_mgr(ctx); + if(!secmgr) + return NULL; + + policy = 0; + hres = IInternetHostSecurityManager_ProcessUrlAction(secmgr, URLACTION_ACTIVEX_RUN, (BYTE*)&policy, sizeof(policy), + (BYTE*)&guid, sizeof(GUID), 0, 0); + if(FAILED(hres) || policy != URLPOLICY_ALLOW) + return NULL; + + /* FIXME: Use IClassFactoryEx */ + + hres = CoCreateInstance(&guid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)&obj); + if(FAILED(hres)) + return NULL; + + cs.clsid = guid; + cs.pUnk = obj; + cs.dwFlags = 0; + hres = IInternetHostSecurityManager_QueryCustomPolicy(secmgr, &GUID_CUSTOM_CONFIRMOBJECTSAFETY, &bpolicy, &policy_size, + (BYTE*)&cs, sizeof(cs), 0); + if(SUCCEEDED(hres)) { + policy = policy_size >= sizeof(DWORD) ? *(DWORD*)bpolicy : URLPOLICY_DISALLOW; + CoTaskMemFree(bpolicy); + } + + if(FAILED(hres) || policy != URLPOLICY_ALLOW) { + IUnknown_Release(obj); + return NULL; + } + + return obj; +} + static HRESULT ActiveXObject_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + IDispatch *disp; + IUnknown *obj; + BSTR progid; + HRESULT hres; + + TRACE("\n"); + + if(flags != DISPATCH_CONSTRUCT) { + FIXME("unsupported flags %x\n", flags); + return E_NOTIMPL; + } + + if(ctx->safeopt != (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER)) { + FIXME("Unsupported safeopt %x\n", ctx->safeopt); + return E_NOTIMPL; + } + + if(arg_cnt(dp) != 1) { + FIXME("unsuported arg_cnt %d\n", arg_cnt(dp)); + return E_NOTIMPL; + } + + hres = to_string(ctx, get_arg(dp,0), ei, &progid); + if(FAILED(hres)) + return hres; + + obj = create_activex_object(ctx, progid); + SysFreeString(progid); + if(!obj) + return throw_generic_error(ctx, ei, IDS_CREATE_OBJ_ERROR, NULL); + + hres = IUnknown_QueryInterface(obj, &IID_IDispatch, (void**)&disp); + IUnknown_Release(obj); + if(FAILED(hres)) { + FIXME("Object does not support IDispatch\n"); + return E_NOTIMPL; + } + + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = disp; + return S_OK; } HRESULT create_activex_constr(script_ctx_t *ctx, DispatchEx **ret) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 91bc95a..9530a4c 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -429,6 +429,11 @@ HRESULT throw_eval_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR return throw_error(ctx, ei, id, str, ctx->eval_error_constr); } +HRESULT throw_generic_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) +{ + return throw_error(ctx, ei, id, str, ctx->error_constr); +} + HRESULT throw_range_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCHAR *str) { return throw_error(ctx, ei, id, str, ctx->range_error_constr); diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 1efe8e1..90a5b47 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -351,6 +351,11 @@ static HRESULT WINAPI JScript_Close(IActiveScript *iface) This->ctx->named_items = NULL; } + if(This->ctx->secmgr) { + IInternetHostSecurityManager_Release(This->ctx->secmgr); + This->ctx->secmgr = NULL; + } + if(This->ctx->site) { IActiveScriptSite_Release(This->ctx->site); This->ctx->site = NULL; @@ -554,6 +559,7 @@ static HRESULT WINAPI JScriptParse_InitNew(IActiveScriptParse *iface) ctx->ref = 1; ctx->state = SCRIPTSTATE_UNINITIALIZED; + ctx->safeopt = This->safeopt; jsheap_init(&ctx->tmp_heap); ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 9190110..533be57 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -214,6 +214,7 @@ HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,cons HRESULT Function_value(script_ctx_t*,vdisp_t*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT throw_eval_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); +HRESULT throw_generic_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); HRESULT throw_range_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); HRESULT throw_reference_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); HRESULT throw_regexp_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); @@ -221,7 +222,6 @@ HRESULT throw_syntax_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); HRESULT throw_type_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); HRESULT throw_uri_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); - HRESULT create_object(script_ctx_t*,DispatchEx*,DispatchEx**); HRESULT create_math(script_ctx_t*,DispatchEx**); HRESULT create_array(script_ctx_t*,DWORD,DispatchEx**); @@ -260,6 +260,8 @@ struct _script_ctx_t { exec_ctx_t *exec_ctx; named_item_t *named_items; IActiveScriptSite *site; + IInternetHostSecurityManager *secmgr; + DWORD safeopt; LCID lcid; jsheap_t tmp_heap; diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 7962ad3..14be9bd 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -24,6 +24,7 @@ STRINGTABLE DISCARDABLE { IDS_TO_PRIMITIVE "Error converting object to primitive type" IDS_INVALID_CALL_ARG "Invalid procedure call or argument" + IDS_CREATE_OBJ_ERROR "Automation server can't create object" IDS_NO_PROPERTY "Object doesn't support this property or method" IDS_ARG_NOT_OPT "Argument not optional" IDS_SYNTAX_ERROR "Syntax error" diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index fcebcb9..17c0df0 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -20,6 +20,7 @@ #define IDS_TO_PRIMITIVE 0x0001 #define IDS_INVALID_CALL_ARG 0x0005 +#define IDS_CREATE_OBJ_ERROR 0x01AD #define IDS_NO_PROPERTY 0x01B6 #define IDS_ARG_NOT_OPT 0x01c1 #define IDS_SYNTAX_ERROR 0x03EA

1 0

Jacek Caban : jscript: Added ActiveXObject tests.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: 40160adf2953ee3bae40870343d248388a16be19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40160adf2953ee3bae4087034… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 30 14:35:28 2009 +0200 jscript: Added ActiveXObject tests. --- dlls/jscript/tests/Makefile.in | 3 +- dlls/jscript/tests/activex.c | 969 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 971 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40160adf2953ee3bae408…

1 0

Rico Schüller : d3d10: Add the D3D10_CBUFFER_TYPE enum .
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: 390cc62e011b9a9ff59146c9d2889fe9105f2dc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=390cc62e011b9a9ff59146c9d… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 30 11:39:27 2009 +0200 d3d10: Add the D3D10_CBUFFER_TYPE enum. --- include/d3d10shader.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 4033c9b..59221cc 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -82,6 +82,12 @@ typedef enum _D3D10_SHADER_VARIABLE_TYPE D3D10_SVT_FORCE_DWORD = 0x7fffffff } D3D10_SHADER_VARIABLE_TYPE, *LPD3D10_SHADER_VARIABLE_TYPE; +typedef enum D3D10_CBUFFER_TYPE +{ + D3D10_CT_CBUFFER = 0, + D3D10_CT_TBUFFER = 1 +} D3D10_CBUFFER_TYPE, *LPD3D10_CBUFFER_TYPE; + typedef enum D3D10_NAME { D3D10_NAME_UNDEFINED = 0,

1 0

Rico Schüller : d3d10: Implement ID3D10EffectType:: GetMemberName().
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: 90fadf84d9d8b615ff3c28ec2be9b93b01e1c5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=90fadf84d9d8b615ff3c28ec2… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 30 11:42:14 2009 +0200 d3d10: Implement ID3D10EffectType::GetMemberName(). --- dlls/d3d10/d3d10_private.h | 10 ++ dlls/d3d10/effect.c | 235 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 209 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90fadf84d9d8b615ff3c2…

1 0

Rico Schüller : d3d10: Make the constant buffer a variable.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: df9e1013d558e8bf34e2b992d9d2aa5e04e9c685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9e1013d558e8bf34e2b992d… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 30 11:40:38 2009 +0200 d3d10: Make the constant buffer a variable. --- dlls/d3d10/d3d10_private.h | 15 ++------------- dlls/d3d10/effect.c | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index ae4d6f2..62ce904 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -90,7 +90,7 @@ struct d3d10_effect_variable { const struct ID3D10EffectVariableVtbl *vtbl; - struct d3d10_effect_local_buffer *buffer; + struct d3d10_effect_variable *buffer; struct d3d10_effect *effect; char *name; @@ -98,18 +98,7 @@ struct d3d10_effect_variable DWORD buffer_offset; DWORD annotation_count; DWORD flag; - struct d3d10_effect_type *type; - struct d3d10_effect_variable *annotations; -}; - -struct d3d10_effect_local_buffer -{ - const struct ID3D10EffectConstantBufferVtbl *vtbl; - - struct d3d10_effect *effect; - char *name; DWORD data_size; - DWORD annotation_count; struct d3d10_effect_type *type; struct d3d10_effect_variable *members; struct d3d10_effect_variable *annotations; @@ -169,7 +158,7 @@ struct d3d10_effect DWORD shader_compile_count; struct wine_rb_tree types; - struct d3d10_effect_local_buffer *local_buffers; + struct d3d10_effect_variable *local_buffers; struct d3d10_effect_technique *techniques; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e2a1c88..ab50663 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -57,16 +57,16 @@ static struct d3d10_effect_technique null_technique = {&d3d10_effect_technique_vtbl, NULL, NULL, 0, 0, NULL, NULL}; static struct d3d10_effect_pass null_pass = {&d3d10_effect_pass_vtbl, NULL, NULL, 0, 0, 0, NULL, NULL}; -static struct d3d10_effect_local_buffer null_local_buffer = - {&d3d10_effect_constant_buffer_vtbl, NULL, NULL, 0, 0, 0, NULL, NULL}; +static struct d3d10_effect_variable null_local_buffer = + {(ID3D10EffectVariableVtbl *)&d3d10_effect_constant_buffer_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL}; static struct d3d10_effect_variable null_variable = - {&d3d10_effect_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, NULL}; + {&d3d10_effect_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL}; static struct d3d10_effect_variable null_scalar_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_scalar_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, NULL}; + {(ID3D10EffectVariableVtbl *)&d3d10_effect_scalar_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL}; static struct d3d10_effect_variable null_vector_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_vector_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, NULL}; + {(ID3D10EffectVariableVtbl *)&d3d10_effect_vector_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL}; static struct d3d10_effect_variable null_matrix_variable = - {(ID3D10EffectVariableVtbl *)&d3d10_effect_matrix_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, NULL}; + {(ID3D10EffectVariableVtbl *)&d3d10_effect_matrix_variable_vtbl, NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL, NULL, NULL}; static inline void read_dword(const char **ptr, DWORD *d) { @@ -713,7 +713,7 @@ static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char * return S_OK; } -static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, const char **ptr, const char *data) +static HRESULT parse_fx10_local_buffer(struct d3d10_effect_variable *l, const char **ptr, const char *data) { unsigned int i; DWORD offset; @@ -884,8 +884,8 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d for (i = 0; i < e->local_buffer_count; ++i) { - struct d3d10_effect_local_buffer *l = &e->local_buffers[i]; - l->vtbl = &d3d10_effect_constant_buffer_vtbl; + struct d3d10_effect_variable *l = &e->local_buffers[i]; + l->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_constant_buffer_vtbl; l->effect = e; hr = parse_fx10_local_buffer(l, &ptr, data); @@ -1111,7 +1111,7 @@ static void d3d10_effect_technique_destroy(struct d3d10_effect_technique *t) } } -static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_local_buffer *l) +static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l) { unsigned int i; @@ -1246,7 +1246,7 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon UINT index) { struct d3d10_effect *This = (struct d3d10_effect *)iface; - struct d3d10_effect_local_buffer *l; + struct d3d10_effect_variable *l; TRACE("iface %p, index %u\n", iface, index); @@ -1273,7 +1273,7 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon for (i = 0; i < This->local_buffer_count; ++i) { - struct d3d10_effect_local_buffer *l = &This->local_buffers[i]; + struct d3d10_effect_variable *l = &This->local_buffers[i]; if (!strcmp(l->name, name)) { @@ -1303,7 +1303,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB for (i = 0; i < This->local_buffer_count; ++i) { - struct d3d10_effect_local_buffer *l = &This->local_buffers[i]; + struct d3d10_effect_variable *l = &This->local_buffers[i]; unsigned int j; for (j = 0; j < l->type->member_count; ++j) @@ -2017,7 +2017,7 @@ static BOOL STDMETHODCALLTYPE d3d10_effect_constant_buffer_IsValid(ID3D10EffectC { TRACE("iface %p\n", iface); - return (struct d3d10_effect_local_buffer *)iface != &null_local_buffer; + return (struct d3d10_effect_variable *)iface != &null_local_buffer; } static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetType(ID3D10EffectConstantBuffer *iface) @@ -2038,7 +2038,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetDesc(ID3D10Effe static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetAnnotationByIndex( ID3D10EffectConstantBuffer *iface, UINT index) { - struct d3d10_effect_local_buffer *This = (struct d3d10_effect_local_buffer *)iface; + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; struct d3d10_effect_variable *a; TRACE("iface %p, index %u\n", iface, index); @@ -2059,7 +2059,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buf static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetAnnotationByName( ID3D10EffectConstantBuffer *iface, LPCSTR name) { - struct d3d10_effect_local_buffer *This = (struct d3d10_effect_local_buffer *)iface; + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; unsigned int i; TRACE("iface %p, name %s.\n", iface, debugstr_a(name));

1 0

Henri Verbeet : wined3d: Add a separate function for initializing the " contained_*" fields from the "changed" field.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: be0b7355fcf4a3f16bb23a829d74a084f84e7fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0b7355fcf4a3f16bb23a829… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 30 10:49:13 2009 +0200 wined3d: Add a separate function for initializing the "contained_*" fields from the "changed" field. --- dlls/wined3d/device.c | 89 +------------------------------- dlls/wined3d/stateblock.c | 112 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 114 insertions(+), 88 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 60bd37d..fc67dec 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4406,7 +4406,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface) static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IWineD3DStateBlock** ppStateBlock) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - unsigned int i, j; IWineD3DStateBlockImpl *object = This->updateStateBlock; if (!This->isRecordingState) { @@ -4415,93 +4414,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IW return WINED3DERR_INVALIDCALL; } - for (i = 0; i <= WINEHIGHEST_RENDER_STATE >> 5; ++i) - { - DWORD map = object->changed.renderState[i]; - for (j = 0; map; map >>= 1, ++j) - { - if (!(map & 1)) continue; - - object->contained_render_states[object->num_contained_render_states++] = (i << 5) | j; - } - } - - for (i = 0; i <= HIGHEST_TRANSFORMSTATE >> 5; ++i) - { - DWORD map = object->changed.transform[i]; - for (j = 0; map; map >>= 1, ++j) - { - if (!(map & 1)) continue; - - object->contained_transform_states[object->num_contained_transform_states++] = (i << 5) | j; - } - } - for(i = 0; i < GL_LIMITS(vshader_constantsF); i++) { - if(object->changed.vertexShaderConstantsF[i]) { - object->contained_vs_consts_f[object->num_contained_vs_consts_f] = i; - object->num_contained_vs_consts_f++; - } - } - for(i = 0; i < MAX_CONST_I; i++) { - if (object->changed.vertexShaderConstantsI & (1 << i)) - { - object->contained_vs_consts_i[object->num_contained_vs_consts_i] = i; - object->num_contained_vs_consts_i++; - } - } - for(i = 0; i < MAX_CONST_B; i++) { - if (object->changed.vertexShaderConstantsB & (1 << i)) - { - object->contained_vs_consts_b[object->num_contained_vs_consts_b] = i; - object->num_contained_vs_consts_b++; - } - } - for (i = 0; i < GL_LIMITS(pshader_constantsF); ++i) - { - if (object->changed.pixelShaderConstantsF[i]) - { - object->contained_ps_consts_f[object->num_contained_ps_consts_f] = i; - ++object->num_contained_ps_consts_f; - } - } - for(i = 0; i < MAX_CONST_I; i++) { - if (object->changed.pixelShaderConstantsI & (1 << i)) - { - object->contained_ps_consts_i[object->num_contained_ps_consts_i] = i; - object->num_contained_ps_consts_i++; - } - } - for(i = 0; i < MAX_CONST_B; i++) { - if (object->changed.pixelShaderConstantsB & (1 << i)) - { - object->contained_ps_consts_b[object->num_contained_ps_consts_b] = i; - object->num_contained_ps_consts_b++; - } - } - for(i = 0; i < MAX_TEXTURES; i++) { - DWORD map = object->changed.textureState[i]; - - for(j = 0; map; map >>= 1, ++j) - { - if (!(map & 1)) continue; - - object->contained_tss_states[object->num_contained_tss_states].stage = i; - object->contained_tss_states[object->num_contained_tss_states].state = j; - ++object->num_contained_tss_states; - } - } - for(i = 0; i < MAX_COMBINED_SAMPLERS; i++){ - DWORD map = object->changed.samplerState[i]; - - for (j = 0; map; map >>= 1, ++j) - { - if (!(map & 1)) continue; - - object->contained_sampler_states[object->num_contained_sampler_states].stage = i; - object->contained_sampler_states[object->num_contained_sampler_states].state = j; - ++object->num_contained_sampler_states; - } - } + stateblock_init_contained_states(object); *ppStateBlock = (IWineD3DStateBlock*) object; This->isRecordingState = FALSE; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index eb2780a..4034f1a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -228,6 +228,118 @@ static void stateblock_copy_values(IWineD3DStateBlockImpl *dst, const IWineD3DSt memcpy(dst->pixelShaderConstantF, src->pixelShaderConstantF, sizeof(float) * gl_info->max_pshader_constantsF * 4); } +void stateblock_init_contained_states(IWineD3DStateBlockImpl *stateblock) +{ + const struct wined3d_gl_info *gl_info = &stateblock->wineD3DDevice->adapter->gl_info; + unsigned int i, j; + + for (i = 0; i <= WINEHIGHEST_RENDER_STATE >> 5; ++i) + { + DWORD map = stateblock->changed.renderState[i]; + for (j = 0; map; map >>= 1, ++j) + { + if (!(map & 1)) continue; + + stateblock->contained_render_states[stateblock->num_contained_render_states] = (i << 5) | j; + ++stateblock->num_contained_render_states; + } + } + + for (i = 0; i <= HIGHEST_TRANSFORMSTATE >> 5; ++i) + { + DWORD map = stateblock->changed.transform[i]; + for (j = 0; map; map >>= 1, ++j) + { + if (!(map & 1)) continue; + + stateblock->contained_transform_states[stateblock->num_contained_transform_states] = (i << 5) | j; + ++stateblock->num_contained_transform_states; + } + } + + for (i = 0; i < gl_info->max_vshader_constantsF; ++i) + { + if (stateblock->changed.vertexShaderConstantsF[i]) + { + stateblock->contained_vs_consts_f[stateblock->num_contained_vs_consts_f] = i; + ++stateblock->num_contained_vs_consts_f; + } + } + + for (i = 0; i < MAX_CONST_I; ++i) + { + if (stateblock->changed.vertexShaderConstantsI & (1 << i)) + { + stateblock->contained_vs_consts_i[stateblock->num_contained_vs_consts_i] = i; + ++stateblock->num_contained_vs_consts_i; + } + } + + for (i = 0; i < MAX_CONST_B; ++i) + { + if (stateblock->changed.vertexShaderConstantsB & (1 << i)) + { + stateblock->contained_vs_consts_b[stateblock->num_contained_vs_consts_b] = i; + ++stateblock->num_contained_vs_consts_b; + } + } + + for (i = 0; i < gl_info->max_pshader_constantsF; ++i) + { + if (stateblock->changed.pixelShaderConstantsF[i]) + { + stateblock->contained_ps_consts_f[stateblock->num_contained_ps_consts_f] = i; + ++stateblock->num_contained_ps_consts_f; + } + } + + for (i = 0; i < MAX_CONST_I; ++i) + { + if (stateblock->changed.pixelShaderConstantsI & (1 << i)) + { + stateblock->contained_ps_consts_i[stateblock->num_contained_ps_consts_i] = i; + ++stateblock->num_contained_ps_consts_i; + } + } + + for (i = 0; i < MAX_CONST_B; ++i) + { + if (stateblock->changed.pixelShaderConstantsB & (1 << i)) + { + stateblock->contained_ps_consts_b[stateblock->num_contained_ps_consts_b] = i; + ++stateblock->num_contained_ps_consts_b; + } + } + + for (i = 0; i < MAX_TEXTURES; ++i) + { + DWORD map = stateblock->changed.textureState[i]; + + for(j = 0; map; map >>= 1, ++j) + { + if (!(map & 1)) continue; + + stateblock->contained_tss_states[stateblock->num_contained_tss_states].stage = i; + stateblock->contained_tss_states[stateblock->num_contained_tss_states].state = j; + ++stateblock->num_contained_tss_states; + } + } + + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) + { + DWORD map = stateblock->changed.samplerState[i]; + + for (j = 0; map; map >>= 1, ++j) + { + if (!(map & 1)) continue; + + stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].stage = i; + stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].state = j; + ++stateblock->num_contained_sampler_states; + } + } +} + /********************************************************** * IWineD3DStateBlockImpl IUnknown parts follows **********************************************************/ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 044bae9..f48d791 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2354,6 +2354,7 @@ struct IWineD3DStateBlockImpl HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl *device, WINED3DSTATEBLOCKTYPE type, IUnknown *parent) DECLSPEC_HIDDEN; +void stateblock_init_contained_states(IWineD3DStateBlockImpl *object) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued state * because only the driver knows about it, but we have a created state because d3d

1 0

Henri Verbeet : wined3d: Add a separate function for copying stateblock values.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: 345b329217f0279f899d2311fc4ca974bdb91322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=345b329217f0279f899d2311f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 30 10:49:11 2009 +0200 wined3d: Add a separate function for copying stateblock values. --- dlls/wined3d/stateblock.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e568ec6..c637de0 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -164,20 +164,11 @@ static void stateblock_savedstates_set(SAVEDSTATES *states, BOOL value, const st memset(states->vertexShaderConstantsF, value, sizeof(BOOL) * gl_info->max_vshader_constantsF); } -static void stateblock_copy(IWineD3DStateBlockImpl *dst, const IWineD3DStateBlockImpl *src) +static void stateblock_copy_values(IWineD3DStateBlockImpl *dst, const IWineD3DStateBlockImpl *src, + const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = &src->wineD3DDevice->adapter->gl_info; unsigned int l; - dst->lpVtbl = src->lpVtbl; - dst->ref = src->ref; - dst->parent = src->parent; - dst->wineD3DDevice = src->wineD3DDevice; - dst->blockType = src->blockType; - - /* Saved states */ - stateblock_savedstates_copy(&dst->changed, &src->changed, gl_info); - /* Single items */ dst->gl_primitive_type = src->gl_primitive_type; dst->vertexDecl = src->vertexDecl; @@ -237,6 +228,23 @@ static void stateblock_copy(IWineD3DStateBlockImpl *dst, const IWineD3DStateBloc memcpy(dst->pixelShaderConstantF, src->pixelShaderConstantF, sizeof(float) * gl_info->max_pshader_constantsF * 4); } +static void stateblock_copy(IWineD3DStateBlockImpl *dst, const IWineD3DStateBlockImpl *src) +{ + const struct wined3d_gl_info *gl_info = &src->wineD3DDevice->adapter->gl_info; + + dst->lpVtbl = src->lpVtbl; + dst->ref = src->ref; + dst->parent = src->parent; + dst->wineD3DDevice = src->wineD3DDevice; + dst->blockType = src->blockType; + + /* Saved states */ + stateblock_savedstates_copy(&dst->changed, &src->changed, gl_info); + + /* Saved values */ + stateblock_copy_values(dst, src, gl_info); +} + /********************************************************** * IWineD3DStateBlockImpl IUnknown parts follows **********************************************************/

1 0