[reactos] 63/218: [WINESYNC] d3dx9: Merge the d3dx_effect_GetString() helper.

[winesync]

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

commit da7f239a06c9ad71d5e0c39028da69bf72667f85
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_GetString() 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 ea45ed1751860905daa33af5e45d38cbbeadd0ad by Michael Stefaniuc [e-mail]
---
 dll/directx/wine/d3dx9_36/effect.c | 29 +++++++++++------------------
 sdk/tools/winesync/d3dx9.cfg       |  2 +-
 2 files changed, 12 insertions(+), 19 deletions(-)

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

-static HRESULT d3dx9_base_effect_get_string(struct d3dx9_base_effect *base,
-        D3DXHANDLE parameter, const char **string)
-{
-    struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
-    if (string && param && !param->element_count && param->type == D3DXPT_STRING)
-    {
-        *string = *(const char **)param->data;
-        TRACE("Returning %s.\n", debugstr_a(*string));
-        return D3D_OK;
-    }
-
-    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)
 {
@@ -3565,10 +3548,20 @@ static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE param
 static HRESULT WINAPI d3dx_effect_GetString(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 %p.\n", iface, parameter, string);

-    return d3dx9_base_effect_get_string(&effect->base_effect, parameter, string);
+    if (string && param && !param->element_count && param->type == D3DXPT_STRING)
+    {
+        *string = *(const char **)param->data;
+        TRACE("Returning %s.\n", debugstr_a(*string));
+        return D3D_OK;
+    }
+
+    WARN("Parameter not found.\n");
+
+    return D3DERR_INVALIDCALL;
 }

static HRESULT WINAPI d3dx_effect_SetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter,
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 4f4bd100d09..303f2124531 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: 7ce336969ca4f7adba33c45f5f746a8f656348cc}
+tags: {wine: ea45ed1751860905daa33af5e45d38cbbeadd0ad}