[PATCH 3/7] d3dx9: Pass a struct d3dx_effect to d3dx9_copy_data()

[Michael Stefaniuc]

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>
---
 dlls/d3dx9_36/effect.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 992d7b466f..acc0eb786f 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -5315,9 +5315,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)
     {
@@ -6168,7 +6168,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)
@@ -6187,7 +6187,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,
                             ¶m->param_eval, get_version_counter_ptr(base), NULL, 0)))
@@ -6202,7 +6202,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));
@@ -6234,7 +6234,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;
@@ -6344,7 +6344,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)
-- 
2.20.1

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=48785

Your paranoid android.


=== debian9 (build log) ===

error: patch failed: dlls/d3dx9_36/effect.c:1163
Task: Patch failed to apply

=== debian9 (build log) ===

error: patch failed: dlls/d3dx9_36/effect.c:1163
Task: Patch failed to apply

[Matteo Bruni]

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>