[ros-diffs] [reactos] 84/218: [WINESYNC] d3dx9: Pass a struct d3dx_effect to get_parameter_element_by_name().

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81c4bfa714dc76ce025bb…

commit 81c4bfa714dc76ce025bbbf56cf436b403edd0b1
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Mon Sep 21 22:40:29 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Thu Feb 4 16:37:03 2021 +0100

    [WINESYNC] d3dx9: Pass a struct d3dx_effect to get_parameter_element_by_name().
    
    Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 09770370c0b9159d3324684146544b6f441e4889 by Michael Stefaniuc
<mstefani(a)winehq.org>
---
 dll/directx/wine/d3dx9_36/effect.c | 8 ++++----
 sdk/tools/winesync/d3dx9.cfg       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index 91a0a1b5721..849dd5ca5f6 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -820,7 +820,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;
@@ -842,7 +842,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);
@@ -890,7 +890,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);
@@ -979,7 +979,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);
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 9b9ed9560eb..8fdf9eb6d33 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h:
sdk/inc
   include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h:
sdk/include/dxsdk/d3dx9of.h,
   include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h:
sdk/include/dxsdk/d3dx9shape.h,
   include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h:
sdk/include/dxsdk/d3dx9xof.h}
-tags: {wine: 0c6345322983ed3df9100b801aaa56367b37a501}
+tags: {wine: 09770370c0b9159d3324684146544b6f441e4889}