Module: wine Branch: master Commit: ffa72d73050ef3e69488da92c7c04c03ee9e0357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa72d73050ef3e69488da92c7...
Author: Rico Schüller kgbricola@web.de Date: Thu Oct 1 11:53:53 2009 +0200
d3d10: Improve ID3D10EffectType::GetMemberName().
---
dlls/d3d10/effect.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2fd8978..9c654a4 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3292,12 +3292,21 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTy static LPCSTR STDMETHODCALLTYPE d3d10_effect_type_GetMemberName(ID3D10EffectType *iface, UINT index) { struct d3d10_effect_type *This = (struct d3d10_effect_type *)iface; + struct d3d10_effect_type_member *typem;
TRACE("iface %p, index %u\n", iface, index);
- if(index >= This->member_count) return NULL; + if (index >= This->member_count) + { + WARN("Invalid index specified\n"); + return NULL; + } + + typem = &This->members[index]; + + TRACE("Returning name %s\n", debugstr_a(typem->name));
- return This->members[index].name; + return typem->name; }
static LPCSTR STDMETHODCALLTYPE d3d10_effect_type_GetMemberSemantic(ID3D10EffectType *iface, UINT index)