[reactos] 75/218: [WINESYNC] d3dx9: Pass a struct d3dx_effect to get_valid_pass().

[winesync]

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

commit ce95dc581346331054c76b35498c1fa708f97313
Author:     winesync [e-mail]
AuthorDate: Mon Sep 21 22:40:29 2020 +0200
Commit:     Jérôme Gardou [e-mail]
CommitDate: Thu Feb 4 16:37:03 2021 +0100

[WINESYNC] d3dx9: Pass a struct d3dx_effect to get_valid_pass().

Signed-off-by: Michael Stefaniuc [e-mail]
    Signed-off-by: Matteo Bruni [e-mail]
    Signed-off-by: Alexandre Julliard [e-mail]

wine commit id 956b30dbf3899e3cd0ccccc17d99f01047caf634 by Michael Stefaniuc [e-mail]
---
 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 c8d638d425f..4cf181b5598 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -487,8 +487,9 @@ static struct d3dx_technique *get_valid_technique(struct d3dx_effect *effect, D3
     return get_technique_by_name(effect, technique);
 }

-static struct d3dx_pass *get_valid_pass(struct d3dx9_base_effect *base, D3DXHANDLE pass)
+static struct d3dx_pass *get_valid_pass(struct d3dx_effect *effect, D3DXHANDLE pass)
 {
+    struct d3dx9_base_effect *base = &effect->base_effect;
     unsigned int i, k;

for (i = 0; i < base->technique_count; ++i)
@@ -1091,9 +1092,8 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta
 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(effect, object);
-    struct d3dx_pass *pass = get_valid_pass(base, object);
+    struct d3dx_pass *pass = get_valid_pass(effect, object);
     struct d3dx_technique *technique = get_valid_technique(effect, object);

if (pass)
@@ -1922,7 +1922,7 @@ static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDL
 static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass_handle, D3DXPASS_DESC *desc)
 {
     struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
-    struct d3dx_pass *pass = get_valid_pass(&effect->base_effect, pass_handle);
+    struct d3dx_pass *pass = get_valid_pass(effect, pass_handle);
     unsigned int i;

TRACE("iface %p, pass %p, desc %p.\n", iface, pass, desc);
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index bdfef6e6269..702d64801fc 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: 6ecc2c51b3849d313ad670a4b0ff14ca50aeb26a}
+tags: {wine: 956b30dbf3899e3cd0ccccc17d99f01047caf634}