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

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ff343ea9aa41fa765bae843b5c3c26ad9b417f8

commit 6ff343ea9aa41fa765bae843b5c3c26ad9b417f8
Author:     winesync <ros-...@reactos.org>
AuthorDate: Mon Sep 21 22:40:29 2020 +0200
Commit:     Jérôme Gardou <jerome.gar...@reactos.org>
CommitDate: Thu Feb 4 16:37:03 2021 +0100

    [WINESYNC] d3dx9: Pass a struct d3dx_effect to add_param_to_tree().
    
    Signed-off-by: Michael Stefaniuc <mstef...@winehq.org>
    Signed-off-by: Matteo Bruni <mbr...@codeweavers.com>
    Signed-off-by: Alexandre Julliard <julli...@winehq.org>
    
    wine commit id 62a26e1ad0e18b8de8ac8154cbce6c6f66f2249b by Michael 
Stefaniuc <mstef...@winehq.org>
---
 dll/directx/wine/d3dx9_36/effect.c | 12 ++++++------
 sdk/tools/winesync/d3dx9.cfg       |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c 
b/dll/directx/wine/d3dx9_36/effect.c
index 786f9f9304c..961353e2ac1 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -5076,7 +5076,7 @@ static int param_rb_compare(const void *key, const struct 
wine_rb_entry *entry)
     return strcmp(name, param->full_name);
 }
 
-static void add_param_to_tree(struct d3dx9_base_effect *base, struct 
d3dx_parameter *param,
+static void add_param_to_tree(struct d3dx_effect *effect, struct 
d3dx_parameter *param,
         struct d3dx_parameter *parent, char separator, unsigned int element)
 {
     const char *parent_name = parent ? parent->full_name : NULL;
@@ -5131,18 +5131,18 @@ static void add_param_to_tree(struct d3dx9_base_effect 
*base, struct d3dx_parame
         memcpy(param->full_name, param->name, len);
     }
     TRACE("Full name is %s.\n", param->full_name);
-    wine_rb_put(&base->param_tree, param->full_name, &param->rb_entry);
+    wine_rb_put(&effect->base_effect.param_tree, param->full_name, 
&param->rb_entry);
 
     if (is_top_level_parameter(param))
         for (i = 0; i < param->top_level_param->annotation_count; ++i)
-            add_param_to_tree(base, &param->top_level_param->annotations[i], 
param, '@', 0);
+            add_param_to_tree(effect, &param->top_level_param->annotations[i], 
param, '@', 0);
 
     if (param->element_count)
         for (i = 0; i < param->element_count; ++i)
-            add_param_to_tree(base, &param->members[i], param, '[', i);
+            add_param_to_tree(effect, &param->members[i], param, '[', i);
     else
         for (i = 0; i < param->member_count; ++i)
-            add_param_to_tree(base, &param->members[i], param, '.', 0);
+            add_param_to_tree(effect, &param->members[i], param, '.', 0);
 }
 
 static HRESULT d3dx_parse_effect_typedef(struct d3dx_effect *effect, struct 
d3dx_parameter *param,
@@ -6017,7 +6017,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect 
*effect, const char *data, U
             }
             walk_parameter_tree(&base->parameters[i].param, 
param_set_top_level_param,
                 &base->parameters[i]);
-            add_param_to_tree(base, &base->parameters[i].param, NULL, 0, 0);
+            add_param_to_tree(effect, &base->parameters[i].param, NULL, 0, 0);
         }
     }
 
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 849738ee26c..b991cbb5089 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: f9351bae3e22ac500c237ab5a0b0556561e913d6}
+tags: {wine: 62a26e1ad0e18b8de8ac8154cbce6c6f66f2249b}