September 2009 - Wine-Commits

Alistair Leslie-Hughes : mshtml: Add support for Reference BSTR when setting styles.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 2d791e8c67e76efaf29ff650883a7a47fa0447da URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d791e8c67e76efaf29ff6508… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 10 19:58:43 2009 +1000 mshtml: Add support for Reference BSTR when setting styles. --- dlls/mshtml/htmlstyle.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 5a75e2b..c2cfa43 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -292,6 +292,9 @@ HRESULT set_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, case VT_BSTR: return set_nsstyle_attr(nsstyle, sid, V_BSTR(value), flags); + case VT_BSTR|VT_BYREF: + return set_nsstyle_attr(nsstyle, sid, *V_BSTRREF(value), flags); + case VT_I4: { WCHAR str[14]; static const WCHAR format[] = {'%','d',0};

1 0

Rico Schüller : d3d10: Implement ID3D10EffectConstantBuffer::GetAnnotationByName().
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: f493e56d4d879e2dcaeee52842d204ad01559a20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f493e56d4d879e2dcaeee5284… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 9 19:17:42 2009 +0200 d3d10: Implement ID3D10EffectConstantBuffer::GetAnnotationByName(). --- dlls/d3d10/effect.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index d0f24d4..3ac6875 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1972,9 +1972,24 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buf static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetAnnotationByName( ID3D10EffectConstantBuffer *iface, LPCSTR name) { - FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); + struct d3d10_effect_local_buffer *This = (struct d3d10_effect_local_buffer *)iface; + unsigned int i; - return NULL; + 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; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetMemberByIndex(

1 0

Rico Schüller : d3d10: Implement ID3D10EffectVariable: :GetAnnotationByName().
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 96c2b578fe2c2667ffc7d92cb58a8151a6c9491c URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c2b578fe2c2667ffc7d92cb… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 9 19:17:33 2009 +0200 d3d10: Implement ID3D10EffectVariable::GetAnnotationByName(). --- dlls/d3d10/effect.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ba9c694..d0f24d4 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1701,9 +1701,24 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_Get static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetAnnotationByName( ID3D10EffectVariable *iface, LPCSTR name) { - FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; + unsigned int i; - return NULL; + 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; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetMemberByIndex(

1 0

Rico Schüller : d3d10: Implement ID3D10EffectPass:: GetAnnotationByName().
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 15a0274fe4e9d8c547f8c28137e4087e47897964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15a0274fe4e9d8c547f8c2813… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 9 19:17:30 2009 +0200 d3d10: Implement ID3D10EffectPass::GetAnnotationByName(). --- dlls/d3d10/effect.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 5d6f30a..ba9c694 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1590,9 +1590,24 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnno static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnnotationByName(ID3D10EffectPass *iface, LPCSTR name) { - FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); + struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + unsigned int i; - return NULL; + 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; } static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface, UINT flags)

1 0

Rico Schüller : d3d10: Implement ID3D10EffectTechnique ::GetAnnotationByName().
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 4e1950b706a0c1ade575adf183d69f67048018fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e1950b706a0c1ade575adf18… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 9 19:17:26 2009 +0200 d3d10: Implement ID3D10EffectTechnique::GetAnnotationByName(). --- dlls/d3d10/effect.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ee2fa65..5d6f30a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1413,9 +1413,24 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_Ge static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_GetAnnotationByName( ID3D10EffectTechnique *iface, LPCSTR name) { - FIXME("iface %p, name %s stub!\n", iface, debugstr_a(name)); + struct d3d10_effect_technique *This = (struct d3d10_effect_technique *)iface; + unsigned int i; - return NULL; + 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; } static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByIndex(ID3D10EffectTechnique *iface,

1 0

Rico Schüller : d3d10: Implement ID3D10EffectConstantBuffer::GetAnnotationByIndex().
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: e6af0472b308c97b5444b62886f8485a119091e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6af0472b308c97b5444b6288… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 9 19:17:20 2009 +0200 d3d10: Implement ID3D10EffectConstantBuffer::GetAnnotationByIndex(). --- dlls/d3d10/effect.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cffd645..ee2fa65 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1906,9 +1906,22 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetDesc(ID3D10Effe static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetAnnotationByIndex( ID3D10EffectConstantBuffer *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3d10_effect_local_buffer *This = (struct d3d10_effect_local_buffer *)iface; + struct d3d10_effect_variable *a; - return NULL; + 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; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetAnnotationByName(

1 0

Rico Schüller : d3d10: Implement ID3D10EffectVariable: :GetAnnotationByIndex().
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: 4d91fba96f8fe6c66981b6bfb6ad3dda2ae05b74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d91fba96f8fe6c66981b6bfb… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 9 19:17:17 2009 +0200 d3d10: Implement ID3D10EffectVariable::GetAnnotationByIndex(). --- dlls/d3d10/effect.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index d85cbe4..cffd645 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1650,9 +1650,22 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_GetDesc(ID3D10EffectVaria static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetAnnotationByIndex( ID3D10EffectVariable *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3d10_effect_variable *This = (struct d3d10_effect_variable *)iface; + struct d3d10_effect_variable *a; - return NULL; + 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; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetAnnotationByName(

1 0

Rico Schüller : d3d10: Implement ID3D10EffectPass:: GetAnnotationByIndex().
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: c2f5c3235c1d11bc376a6d085a50aaa6b8bd474f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f5c3235c1d11bc376a6d085… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 9 19:17:14 2009 +0200 d3d10: Implement ID3D10EffectPass::GetAnnotationByIndex(). --- dlls/d3d10/effect.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 07d3629..d85cbe4 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1554,9 +1554,22 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetPixelShaderDesc(ID3D10Effe static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnnotationByIndex(ID3D10EffectPass *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + struct d3d10_effect_variable *a; - return NULL; + 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; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnnotationByName(ID3D10EffectPass *iface,

1 0

Rico Schüller : d3d10: Implement ID3D10EffectTechnique ::GetAnnotationByIndex().
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: d12dcbe85279b59b2699bff8460dcf4469b0018a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d12dcbe85279b59b2699bff84… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 9 19:17:05 2009 +0200 d3d10: Implement ID3D10EffectTechnique::GetAnnotationByIndex(). --- dlls/d3d10/effect.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 26021ee..07d3629 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1392,9 +1392,22 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_technique_GetDesc(ID3D10EffectTech static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_GetAnnotationByIndex( ID3D10EffectTechnique *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3d10_effect_technique *This = (struct d3d10_effect_technique *)iface; + struct d3d10_effect_variable *a; - return NULL; + 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; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_GetAnnotationByName(

1 0

Rico Schüller : d3d10: Implement annotation parsing.
by Alexandre Julliard Sept. 10, 2009

Sept. 10, 2009

Module: wine Branch: master Commit: f63f6fc0c3bb2d4c84809ad107355ae5d9437e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63f6fc0c3bb2d4c84809ad10… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 9 19:17:01 2009 +0200 d3d10: Implement annotation parsing. --- dlls/d3d10/d3d10_private.h | 6 ++ dlls/d3d10/effect.c | 214 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 174 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f63f6fc0c3bb2d4c84809…

1 0