Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to get_parameter_element_by_name().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 09770370c0b9159d3324684146544b6f441e4889
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=09770370c0b9159d332468414...

Author: Michael Stefaniuc 
Date:   Tue Mar 19 08:51:28 2019 +0100

d3dx9: Pass a struct d3dx_effect to get_parameter_element_by_name().

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Matteo Bruni 
Signed-off-by: Alexandre Julliard

---

dlls/d3dx9_36/effect.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 9986c8e..8242b70 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -816,7 +816,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;
@@ -838,7 +838,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);
@@ -886,7 +886,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);
@@ -975,7 +975,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);