[reactos] 95/218: [WINESYNC] d3dx9: Merge the two pool fields of struct d3dx_effect.

[winesync]

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

commit 2c660479aedaa7e7348c5cdc518272222cd8ac15
Author:     winesync [e-mail]
AuthorDate: Mon Sep 21 22:50:18 2020 +0200
Commit:     Jérôme Gardou [e-mail]
CommitDate: Thu Feb 4 16:37:03 2021 +0100

[WINESYNC] d3dx9: Merge the two pool fields of struct d3dx_effect.

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

wine commit id ef974e59856d702523ef04b5e315d0c980097c8d by Michael Stefaniuc [e-mail]
---
 dll/directx/wine/d3dx9_36/effect.c | 21 ++++++++++-----------
 sdk/tools/winesync/d3dx9.cfg       |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index 393efae5c7b..0dc42b5931d 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -156,7 +156,6 @@ struct d3dx9_base_effect
 {
     struct d3dx_effect *effect;

-    struct d3dx_effect_pool *pool;
     DWORD flags;

ULONG64 version_counter;
@@ -180,7 +179,7 @@ struct d3dx_effect

struct ID3DXEffectStateManager *manager;
     struct IDirect3DDevice9 *device;
-    struct ID3DXEffectPool *pool;
+    struct d3dx_effect_pool *pool;
     struct d3dx_technique *active_technique;
     struct d3dx_pass *active_pass;
     BOOL started;
@@ -683,6 +682,7 @@ static void free_technique(struct d3dx_technique *technique)

static void d3dx_effect_cleanup(struct d3dx_effect *effect)
 {
+    ID3DXEffectPool *pool;
     unsigned int i;

TRACE("effect %p.\n", effect);
@@ -711,7 +711,10 @@ static void d3dx_effect_cleanup(struct d3dx_effect *effect)
     }

if (effect->pool)
-        effect->pool->lpVtbl->Release(effect->pool);
+    {
+        pool = &effect->pool->ID3DXEffectPool_iface;
+        pool->lpVtbl->Release(pool);
+    }

if (effect->manager)
         IUnknown_Release(effect->manager);
@@ -1128,7 +1131,7 @@ static BOOL walk_parameter_tree(struct d3dx_parameter *param, walk_parameter_dep

static ULONG64 *get_version_counter_ptr(struct d3dx_effect *effect)
 {
-    return effect->base_effect.pool ? &effect->base_effect.pool->version_counter : &effect->base_effect.version_counter;
+    return effect->pool ? &effect->pool->version_counter : &effect->base_effect.version_counter;
 }

static ULONG64 next_effect_update_version(struct d3dx_effect *effect)
@@ -3540,7 +3543,7 @@ static HRESULT WINAPI d3dx_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool **
     *pool = NULL;
     if (effect->pool)
     {
-        *pool = effect->pool;
+        *pool = &effect->pool->ID3DXEffectPool_iface;
         (*pool)->lpVtbl->AddRef(*pool);
     }

@@ -5941,7 +5944,6 @@ static BOOL param_set_top_level_param(void *top_level_param, struct d3dx_paramet
 static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, UINT data_size,
         DWORD start, const char **skip_constants, unsigned int skip_constants_count)
 {
-    struct d3dx9_base_effect *base = &effect->base_effect;
     const char *ptr = data + start;
     UINT stringcount, resourcecount;
     HRESULT hr;
@@ -6051,7 +6053,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U

for (i = 0; i < effect->parameter_count; ++i)
     {
-        if (FAILED(hr = d3dx_pool_sync_shared_parameter(base->pool, &effect->parameters[i])))
+        if (FAILED(hr = d3dx_pool_sync_shared_parameter(effect->pool, &effect->parameters[i])))
             goto err_out;
         effect->parameters[i].version_counter = get_version_counter_ptr(effect);
         set_dirty(&effect->parameters[i].param);
@@ -6157,7 +6159,6 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev
 #endif
     struct d3dx9_base_effect *base = &effect->base_effect;
     ID3DBlob *bytecode = NULL, *temp_errors = NULL;
-    struct d3dx_effect_pool *pool_impl = NULL;
     unsigned int skip_constants_count = 0;
     char *skip_constants_buffer = NULL;
     const char **skip_constants = NULL;
@@ -6177,15 +6178,13 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev
     if (pool)
     {
         pool->lpVtbl->AddRef(pool);
-        pool_impl = impl_from_ID3DXEffectPool(pool);
+        effect->pool = impl_from_ID3DXEffectPool(pool);
     }
-    effect->pool = pool;

IDirect3DDevice9_AddRef(device);
     effect->device = device;

base->effect = effect;
-    base->pool = pool_impl;
     base->flags = eflags;

read_dword(&ptr, &tag);
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 4cfdb06fce5..09089bd67da 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: 3bd0fc3d6ad75ec723f2268e2d6de79be904de2c}
+tags: {wine: ef974e59856d702523ef04b5e315d0c980097c8d}