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

[winesync]

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

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

    [WINESYNC] d3dx9: Pass a struct d3dx_effect to d3dx9_copy_data().
    
    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 26b9b04e7f40c7a2011684f01ff07be91047b492 by Michael Stefaniuc
<mstefani(a)winehq.org>
---
 dll/directx/wine/d3dx9_36/effect.c | 14 +++++++-------
 sdk/tools/winesync/d3dx9.cfg       |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index 9e773481114..2a16ecd680b 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -5319,9 +5319,9 @@ static HRESULT d3dx9_parse_name(char **name, const char *ptr)
     return D3D_OK;
 }
 
-static HRESULT d3dx9_copy_data(struct d3dx9_base_effect *base, unsigned int object_id,
const char **ptr)
+static HRESULT d3dx9_copy_data(struct d3dx_effect *effect, unsigned int object_id, const
char **ptr)
 {
-    struct d3dx_object *object = &base->objects[object_id];
+    struct d3dx_object *object = &effect->base_effect.objects[object_id];
 
     if (object->size || object->data)
     {
@@ -6172,7 +6172,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const
char *data,
                 case D3DXPT_VERTEXSHADER:
                 case D3DXPT_PIXELSHADER:
                     state->type = ST_CONSTANT;
-                    if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr)))
+                    if (FAILED(hr = d3dx9_copy_data(effect, param->object_id, ptr)))
                         return hr;
 
                     if (object->data)
@@ -6191,7 +6191,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const
char *data,
                 case D3DXPT_FLOAT:
                 case D3DXPT_STRING:
                     state->type = ST_FXLC;
-                    if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr)))
+                    if (FAILED(hr = d3dx9_copy_data(effect, param->object_id, ptr)))
                         return hr;
                     if (FAILED(hr = d3dx_create_param_eval(base, object->data,
object->size, param->type,
                             &param->param_eval, get_version_counter_ptr(base),
NULL, 0)))
@@ -6206,7 +6206,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const
char *data,
 
         case 1:
             state->type = ST_PARAMETER;
-            if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr)))
+            if (FAILED(hr = d3dx9_copy_data(effect, param->object_id, ptr)))
                 return hr;
 
             TRACE("Looking for parameter %s.\n", debugstr_a(object->data));
@@ -6238,7 +6238,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const
char *data,
 
         case 2:
             state->type = ST_ARRAY_SELECTOR;
-            if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr)))
+            if (FAILED(hr = d3dx9_copy_data(effect, param->object_id, ptr)))
                 return hr;
             hr = d3dx_parse_array_selector(effect, state, skip_constants,
skip_constants_count);
             break;
@@ -6348,7 +6348,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const
char *data, U
         read_dword(&ptr, &id);
         TRACE("id: %u.\n", id);
 
-        if (FAILED(hr = d3dx9_copy_data(base, id, &ptr)))
+        if (FAILED(hr = d3dx9_copy_data(effect, id, &ptr)))
             goto err_out;
 
         if (base->objects[id].data)
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index afcb40214df..f249ca06f78 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: 54bdc66acf4abe1f1fa38238ed824c2372e1ff91}
+tags: {wine: 26b9b04e7f40c7a2011684f01ff07be91047b492}