Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-06 18:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Pass a struct d3dx_effect to get_annotation_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 7738fec56b8d55f006babf4d9fb7a1b79cf363af 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 6ff343ea9a
commit e60679e844
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -858,9 +858,10 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx9_base_ef
return NULL; return NULL;
} }
static struct d3dx_parameter *get_annotation_by_name(struct d3dx9_base_effect *base, static struct d3dx_parameter *get_annotation_by_name(struct d3dx_effect *effect, unsigned int count,
unsigned int count, struct d3dx_parameter *annotations, const char *name) struct d3dx_parameter *annotations, const char *name)
{ {
struct d3dx9_base_effect *base = &effect->base_effect;
UINT i, length; UINT i, length;
struct d3dx_parameter *temp_parameter; struct d3dx_parameter *temp_parameter;
const char *part; const char *part;
@ -2255,7 +2256,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D
annotation_count = get_annotation_from_object(effect, object, &annotations); annotation_count = get_annotation_from_object(effect, object, &annotations);
annotation = get_annotation_by_name(&effect->base_effect, annotation_count, annotations, name); annotation = get_annotation_by_name(effect, annotation_count, annotations, name);
if (annotation) if (annotation)
{ {
TRACE("Returning parameter %p\n", annotation); TRACE("Returning parameter %p\n", annotation);

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/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/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} include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h}
tags: {wine: 62a26e1ad0e18b8de8ac8154cbce6c6f66f2249b} tags: {wine: 7738fec56b8d55f006babf4d9fb7a1b79cf363af}