Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Pass a struct d3dx_effect to get_parameter_element_by_name().

Browse source 
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 09770370c0b9159d3324684146544b6f441e4889 by Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
winesync 2020-09-21 22:40:29 +02:00 committed by Jérôme Gardou
parent ee5b715bde
commit 81c4bfa714
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dll/directx/wine/d3dx9_36/effect.c
View file

@ -820,7 +820,7 @@ static void set_matrix_transpose(struct d3dx_parameter *param, const D3DXMATRIX
}
}
static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx9_base_effect *base,
static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_effect *effect,
struct d3dx_parameter *parameter, const char *name)
{
UINT element;
@ -842,7 +842,7 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx9_base_ef
switch (*part++)
{
case '.':
return get_parameter_by_name(base, temp_parameter, part);
return get_parameter_by_name(&effect->base_effect, temp_parameter, part);
case '\0':
TRACE("Returning parameter %p\n", temp_parameter);
@ -890,7 +890,7 @@ static struct d3dx_parameter *get_annotation_by_name(struct d3dx_effect *effect,
return get_parameter_by_name(base, temp_parameter, part);
case '[':
return get_parameter_element_by_name(base, temp_parameter, part);
return get_parameter_element_by_name(effect, temp_parameter, part);
default:
FIXME("Unhandled case \"%c\"\n", *--part);
@ -979,7 +979,7 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base,
return get_parameter_by_name(base, temp_parameter, part);
case '[':
return get_parameter_element_by_name(base, temp_parameter, part);
return get_parameter_element_by_name(effect, temp_parameter, part);
default:
FIXME("Unhandled case \"%c\"\n", *--part);

2
sdk/tools/winesync/d3dx9.cfg
View file

@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h: sdk/inc
include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h,
include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h,
include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h}
tags: {wine: 0c6345322983ed3df9100b801aaa56367b37a501}
tags: {wine: 09770370c0b9159d3324684146544b6f441e4889}