Module: wine Branch: master Commit: 89941842affb0fec7068a8bd7adca77d8c036032 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89941842affb0fec7068a8bd7...
Author: Michael Stefaniuc mstefani@winehq.org Date: Mon Mar 4 23:16:00 2019 +0100
d3dx9: Pass a struct d3dx_effect to get_annotation_from_object().
Signed-off-by: Michael Stefaniuc mstefani@winehq.org Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3dx9_36/effect.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e7b8b86..c621b21 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1246,9 +1246,10 @@ static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *b return NULL; }
-static UINT get_annotation_from_object(struct d3dx9_base_effect *base, - D3DXHANDLE object, struct d3dx_parameter **annotations) +static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object, + struct d3dx_parameter **annotations) { + struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_parameter *param = get_valid_parameter(base, object); struct d3dx_pass *pass = get_valid_pass(base, object); struct d3dx_technique *technique = get_valid_technique(base, object); @@ -3472,7 +3473,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDL
TRACE("iface %p, object %p, index %u.\n", iface, object, index);
- annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + annotation_count = get_annotation_from_object(effect, object, &annotations);
if (index < annotation_count) { @@ -3501,7 +3502,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D return NULL; }
- annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations); + annotation_count = get_annotation_from_object(effect, object, &annotations);
annotation = get_annotation_by_name(&effect->base_effect, annotation_count, annotations, name); if (annotation)