[ros-diffs] [reactos] 89/218: [WINESYNC] d3dx9: Use get_version_counter_ptr() instead of open coding it.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=433f7dc03047b04c8b983…

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

    [WINESYNC] d3dx9: Use get_version_counter_ptr() instead of open coding it.
    
    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 9438d031277cce1a1c21e0739e12d4c37f365467 by Michael Stefaniuc
<mstefani(a)winehq.org>
---
 dll/directx/wine/d3dx9_36/effect.c | 4 +---
 sdk/tools/winesync/d3dx9.cfg       | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index 197fdfa4b3d..726f34b73ac 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -6081,9 +6081,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const
char *data, U
     {
         if (FAILED(hr = d3dx_pool_sync_shared_parameter(base->pool,
&base->parameters[i])))
             goto err_out;
-        base->parameters[i].version_counter = base->pool
-                ? &base->pool->version_counter
-                : &base->version_counter;
+        base->parameters[i].version_counter = get_version_counter_ptr(effect);
         set_dirty(&base->parameters[i].param);
     }
     return D3D_OK;
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 3fba5ef6fcf..a9237e77ff8 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: 074e3232ee90c94f9a8e7c55988b29b40e1e3f0f}
+tags: {wine: 9438d031277cce1a1c21e0739e12d4c37f365467}