[PATCH 6/7] d3dx9: Pass a struct d3dx_effect to get_annotation_by_name()

15 Mar 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
 dlls/d3dx9_36/effect.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index a45f2890b2..ae577d0f9b 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -854,9 +854,10 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx9_base_ef
     return NULL;
 }
 
-static struct d3dx_parameter *get_annotation_by_name(struct d3dx9_base_effect *base,
-        unsigned int count, struct d3dx_parameter *annotations, const char *name)
+static struct d3dx_parameter *get_annotation_by_name(struct d3dx_effect *effect, unsigned int count,
+        struct d3dx_parameter *annotations, const char *name)
 {
+    struct d3dx9_base_effect *base = &effect->base_effect;
     UINT i, length;
     struct d3dx_parameter *temp_parameter;
     const char *part;
@@ -2251,7 +2252,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D
 
     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)
     {
         TRACE("Returning parameter %p\n", annotation);
-- 
2.20.1

    

Michael Stefaniuc