d3dx9: Don't pass a struct d3dx9_base_effect to d3dx9_base_effect_init().

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org> Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3dx9: Don't pass a struct d3dx9_base_effect to d3dx9_base_effect_init().
de59a129 · Michael Stefaniuc · Alexandre Julliard · f4d5b357 · de59a129
Commit de59a129 authored Mar 20, 2019 by Michael Stefaniuc Committed by Alexandre Julliard Mar 21, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

effect.c dlls/d3dx9_36/effect.c +9 -9

No files found.
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -6173,11 +6173,11 @@ static const char **parse_skip_constants_string(char *skip_constants_string, uns
    return new_alloc;
 }
-static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base,
+static HRESULT d3dx9_base_effect_init(struct d3dx_effect *effect, const char *data, SIZE_T data_size,
-        const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include,
+        const D3D_SHADER_MACRO *defines, ID3DInclude *include, unsigned int eflags, ID3DBlob **errors,
-        UINT eflags, ID3DBlob **errors, struct d3dx_effect *effect, struct d3dx_effect_pool *pool,
+        struct d3dx_effect_pool *pool, const char *skip_constants_string)
-        const char *skip_constants_string)
 {
+    struct d3dx9_base_effect *base = &effect->base_effect;
    DWORD tag, offset;
    const char *ptr = data;
    HRESULT hr;
@@ -6192,9 +6192,9 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base,
 #endif
    unsigned int i, j;
-    TRACE("base %p, data %p, data_size %lu, defines %p, include %p, eflags %#x, errors %p, "
+    TRACE("effect %p, data %p, data_size %lu, defines %p, include %p, eflags %#x, errors %p, "
-            "effect %p, pool %p, skip_constants %s.\n",
+            "pool %p, skip_constants %s.\n",
-            base, data, data_size, defines, include, eflags, errors, effect, pool,
+            effect, data, data_size, defines, include, eflags, errors, pool,
            debugstr_a(skip_constants_string));
    base->effect = effect;
@@ -6339,8 +6339,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev
    IDirect3DDevice9_AddRef(device);
    effect->device = device;
-    if (FAILED(hr = d3dx9_base_effect_init(&effect->base_effect, data, data_size, defines, include,
+    if (FAILED(hr = d3dx9_base_effect_init(effect, data, data_size, defines, include, eflags,
-            eflags, error_messages, effect, pool_impl, skip_constants)))
+            error_messages, pool_impl, skip_constants)))
    {
        FIXME("Failed to parse effect, hr %#x.\n", hr);
        free_effect(effect);