[PATCH 3/8] d3dx9: Pass a struct d3dx_effect to get_annotation_from_object()

[Michael Stefaniuc]

Signed-off-by: Michael Stefaniuc <mstefani(a)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 e7b8b86eb3..c621b21562 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)
-- 
2.20.1

[Matteo Bruni]

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>