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

[winesync]

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

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

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

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

wine commit id 89941842affb0fec7068a8bd7adca77d8c036032 by Michael Stefaniuc [e-mail]
---
 dll/directx/wine/d3dx9_36/effect.c | 9 +++++----
 sdk/tools/winesync/d3dx9.cfg       | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index 9086b5a2bec..b463d6ed140 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -1250,9 +1250,10 @@ static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *b
     return NULL;
 }

-static UINT get_annotation_from_object(struct d3dx9_base_effect *base,
-        D3DXHANDLE object, struct d3dx_parameter **annotations)
+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(base, object);
     struct d3dx_pass *pass = get_valid_pass(base, object);
     struct d3dx_technique *technique = get_valid_technique(base, object);
@@ -3476,7 +3477,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDL

TRACE("iface %p, object %p, index %u.\n", iface, object, index);

-    annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations);
+    annotation_count = get_annotation_from_object(effect, object, &annotations);

if (index < annotation_count)
     {
@@ -3505,7 +3506,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D
         return NULL;
     }

-    annotation_count = get_annotation_from_object(&effect->base_effect, object, &annotations);
+    annotation_count = get_annotation_from_object(effect, object, &annotations);

annotation = get_annotation_by_name(&effect->base_effect, annotation_count, annotations, name);
     if (annotation)
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index aa2fde3f1d9..eae4af7df47 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: 1dd9104724b333fe27c2a1b7e57b31c29a252420}
+tags: {wine: 89941842affb0fec7068a8bd7adca77d8c036032}