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

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=598c2e03b21b2b7bd313cd...

commit 598c2e03b21b2b7bd313cde5456fa081d7ba507b
Author:     winesync [e-mail]
AuthorDate: Mon Sep 21 22:40:28 2020 +0200
Commit:     Jérôme Gardou [e-mail]
CommitDate: Thu Feb 4 16:37:02 2021 +0100

[WINESYNC] d3dx9: Merge the d3dx_effect_SetString() helper.

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

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

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index 4b826495e3e..e6363cef6b8 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -1503,22 +1503,6 @@ static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base
     return D3DERR_INVALIDCALL;
 }

-static HRESULT d3dx9_base_effect_set_string(struct d3dx9_base_effect *base,
-        D3DXHANDLE parameter, const char *string)
-{
-    struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
-    if (param && param->type == D3DXPT_STRING)
-    {
-        set_dirty(param);
-        return set_string(param->data, string);
-    }
-
-    WARN("Parameter not found.\n");
-
-    return D3DERR_INVALIDCALL;
-}
-
 static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base,
         D3DXHANDLE parameter, struct IDirect3DBaseTexture9 *texture)
 {
@@ -3539,10 +3523,19 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTransposePointerArray(ID3DXEffect *if
 static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char *string)
 {
     struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
+    struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);

TRACE("iface %p, parameter %p, string %s.\n", iface, parameter, debugstr_a(string));

-    return d3dx9_base_effect_set_string(&effect->base_effect, parameter, string);
+    if (param && param->type == D3DXPT_STRING)
+    {
+        set_dirty(param);
+        return set_string(param->data, string);
+    }
+
+    WARN("Parameter not found.\n");
+
+    return D3DERR_INVALIDCALL;
 }

static HRESULT WINAPI d3dx_effect_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string)
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 303f2124531..1e65387fae8 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: ea45ed1751860905daa33af5e45d38cbbeadd0ad}
+tags: {wine: e288158dec12f4f55aea01fb1e2879c6e9a18028}