ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Fix flags for annotation structures.

This commit is contained in:
Rico Schüller 2011-04-26 09:21:17 +02:00 committed by Alexandre Julliard
parent 03204e99b7
commit a5fbbbe4a9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/d3dx9_36/effect.c
View File

@ -3074,13 +3074,16 @@ static HRESULT d3dx9_parse_name(char **name, const char *ptr)
return D3D_OK; return D3D_OK;
} }
static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const char *data, const char **ptr, struct d3dx_parameter *parent) static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const char *data, const char **ptr,
struct d3dx_parameter *parent, UINT flags)
{ {
DWORD offset; DWORD offset;
HRESULT hr; HRESULT hr;
D3DXHANDLE *member_handles = NULL; D3DXHANDLE *member_handles = NULL;
UINT i; UINT i;
param->flags = flags;
if (!parent) if (!parent)
{ {
read_dword(ptr, &param->type); read_dword(ptr, &param->type);
@ -3157,7 +3160,6 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch
param->annotation_count = 0; param->annotation_count = 0;
param->member_count = parent->member_count; param->member_count = parent->member_count;
param->bytes = parent->bytes; param->bytes = parent->bytes;
param->flags = parent->flags;
param->rows = parent->rows; param->rows = parent->rows;
param->columns = parent->columns; param->columns = parent->columns;
} }
@ -3191,7 +3193,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch
member_handles[i] = get_parameter_handle(member); member_handles[i] = get_parameter_handle(member);
member->base = param->base; member->base = param->base;
hr = d3dx9_parse_effect_typedef(member, data, ptr, param); hr = d3dx9_parse_effect_typedef(member, data, ptr, param, flags);
if (hr != D3D_OK) if (hr != D3D_OK)
{ {
WARN("Failed to parse member\n"); WARN("Failed to parse member\n");
@ -3228,7 +3230,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch
member_handles[i] = get_parameter_handle(member); member_handles[i] = get_parameter_handle(member);
member->base = param->base; member->base = param->base;
hr = d3dx9_parse_effect_typedef(member, data, ptr, NULL); hr = d3dx9_parse_effect_typedef(member, data, ptr, NULL, flags);
if (hr != D3D_OK) if (hr != D3D_OK)
{ {
WARN("Failed to parse member\n"); WARN("Failed to parse member\n");
@ -3281,7 +3283,7 @@ static HRESULT d3dx9_parse_effect_annotation(struct d3dx_parameter *anno, const
read_dword(ptr, &offset); read_dword(ptr, &offset);
TRACE("Typedef offset: %#x\n", offset); TRACE("Typedef offset: %#x\n", offset);
ptr2 = data + offset; ptr2 = data + offset;
hr = d3dx9_parse_effect_typedef(anno, data, &ptr2, NULL); hr = d3dx9_parse_effect_typedef(anno, data, &ptr2, NULL, D3DX_PARAMETER_ANNOTATION);
if (hr != D3D_OK) if (hr != D3D_OK)
{ {
WARN("Failed to parse type definition\n"); WARN("Failed to parse type definition\n");
@ -3321,7 +3323,7 @@ static HRESULT d3dx9_parse_effect_parameter(struct d3dx_parameter *param, const
read_dword(ptr, &param->annotation_count); read_dword(ptr, &param->annotation_count);
TRACE("Annotation count: %u\n", param->annotation_count); TRACE("Annotation count: %u\n", param->annotation_count);
hr = d3dx9_parse_effect_typedef(param, data, &ptr2, NULL); hr = d3dx9_parse_effect_typedef(param, data, &ptr2, NULL, param->flags);
if (hr != D3D_OK) if (hr != D3D_OK)
{ {
WARN("Failed to parse type definition\n"); WARN("Failed to parse type definition\n");