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

[winesync]

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

commit e60679e844018d53bfd3fd08db62aa2f21702153
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_annotation_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 7738fec56b8d55f006babf4d9fb7a1b79cf363af by Michael Stefaniuc
<mstefani(a)winehq.org>
---
 dll/directx/wine/d3dx9_36/effect.c | 7 ++++---
 sdk/tools/winesync/d3dx9.cfg       | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index 961353e2ac1..2eab4fd4097 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -858,9 +858,10 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct
d3dx9_base_ef
     return NULL;
 }
 
-static struct d3dx_parameter *get_annotation_by_name(struct d3dx9_base_effect *base,
-        unsigned int count, struct d3dx_parameter *annotations, const char *name)
+static struct d3dx_parameter *get_annotation_by_name(struct d3dx_effect *effect, unsigned
int count,
+        struct d3dx_parameter *annotations, const char *name)
 {
+    struct d3dx9_base_effect *base = &effect->base_effect;
     UINT i, length;
     struct d3dx_parameter *temp_parameter;
     const char *part;
@@ -2255,7 +2256,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect
*iface, D3D
 
     annotation_count = get_annotation_from_object(effect, object, &annotations);
 
-    annotation = get_annotation_by_name(&effect->base_effect, annotation_count,
annotations, name);
+    annotation = get_annotation_by_name(effect, annotation_count, annotations, name);
     if (annotation)
     {
         TRACE("Returning parameter %p\n", annotation);
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index b991cbb5089..26ac628eb93 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: 62a26e1ad0e18b8de8ac8154cbce6c6f66f2249b}
+tags: {wine: 7738fec56b8d55f006babf4d9fb7a1b79cf363af}