[ros-diffs] [reactos] 41/218: [WINESYNC] d3dx9: Merge the d3dx_effect_GetFloat() helper.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6450fd6db321529ca06db…

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

    [WINESYNC] d3dx9: Merge the d3dx_effect_GetFloat() helper.
    
    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 460fd21ccc6785172167553e6dd124fdec020d11 by Michael Stefaniuc
<mstefani(a)winehq.org>
---
 dll/directx/wine/d3dx9_36/effect.c | 28 +++++++++++-----------------
 sdk/tools/winesync/d3dx9.cfg       |  2 +-
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index 3c75ba8f4ed..e2ba9bd5aef 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -1512,22 +1512,6 @@ static HRESULT d3dx9_base_effect_set_float(struct d3dx9_base_effect
*base, D3DXH
     return D3DERR_INVALIDCALL;
 }
 
-static HRESULT d3dx9_base_effect_get_float(struct d3dx9_base_effect *base, D3DXHANDLE
parameter, float *f)
-{
-    struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
-    if (f && param && !param->element_count &&
param->columns == 1 && param->rows == 1)
-    {
-        set_number(f, D3DXPT_FLOAT, (DWORD *)param->data, param->type);
-        TRACE("Returning %f\n", *f);
-        return D3D_OK;
-    }
-
-    WARN("Parameter not found.\n");
-
-    return D3DERR_INVALIDCALL;
-}
-
 static HRESULT d3dx9_base_effect_set_float_array(struct d3dx9_base_effect *base,
         D3DXHANDLE parameter, const float *f, UINT count)
 {
@@ -3560,10 +3544,20 @@ static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface,
D3DXHANDLE parame
 static HRESULT WINAPI d3dx_effect_GetFloat(ID3DXEffect *iface, D3DXHANDLE parameter,
float *f)
 {
     struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
+    struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect,
parameter);
 
     TRACE("iface %p, parameter %p, f %p.\n", iface, parameter, f);
 
-    return d3dx9_base_effect_get_float(&effect->base_effect, parameter, f);
+    if (f && param && !param->element_count &&
param->columns == 1 && param->rows == 1)
+    {
+        set_number(f, D3DXPT_FLOAT, (DWORD *)param->data, param->type);
+        TRACE("Returning %f.\n", *f);
+        return D3D_OK;
+    }
+
+    WARN("Parameter not found.\n");
+
+    return D3DERR_INVALIDCALL;
 }
 
 static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE
parameter,
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 0ee4910590b..62c730723f7 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: e435a1442d6499f358168d8a0ca974b43ccd9140}
+tags: {wine: 460fd21ccc6785172167553e6dd124fdec020d11}