[PATCH 2/6] d3dx9: Pass a struct d3dx_effect to d3dx9_create_object()

[Michael Stefaniuc]

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

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index b8fb9041c2..d2af2d5ffa 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -5674,10 +5674,10 @@ err_out:
     return hr;
 }
 
-static HRESULT d3dx9_create_object(struct d3dx9_base_effect *base, struct d3dx_object *object)
+static HRESULT d3dx9_create_object(struct d3dx_effect *effect, struct d3dx_object *object)
 {
     struct d3dx_parameter *param = object->param;
-    struct IDirect3DDevice9 *device = base->effect->device;
+    IDirect3DDevice9 *device = effect->device;
     HRESULT hr;
 
     if (*(char **)param->data)
@@ -5880,7 +5880,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data,
 
                     if (object->data)
                     {
-                        if (FAILED(hr = d3dx9_create_object(base, object)))
+                        if (FAILED(hr = d3dx9_create_object(effect, object)))
                             return hr;
                         if (FAILED(hr = d3dx_create_param_eval(effect, object->data, object->size, param->type,
                                 ¶m->param_eval, get_version_counter_ptr(effect),
@@ -6057,7 +6057,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U
 
         if (effect->objects[id].data)
         {
-            if (FAILED(hr = d3dx9_create_object(base, &effect->objects[id])))
+            if (FAILED(hr = d3dx9_create_object(effect, &effect->objects[id])))
                 goto err_out;
         }
     }
-- 
2.20.1

[Matteo Bruni]

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