d3dx9: Pass a struct d3dx_effect to get_parameter_element_by_name().

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org> Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3dx9: Pass a struct d3dx_effect to get_parameter_element_by_name().
09770370 · Michael Stefaniuc · Alexandre Julliard · 0c634532 · 09770370
Commit 09770370 authored Mar 19, 2019 by Michael Stefaniuc Committed by Alexandre Julliard Mar 19, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

effect.c dlls/d3dx9_36/effect.c +4 -4

No files found.
--- 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);