[PATCH 2/7] d3dx9: Merge the d3dx_effect_GetParameterByName() helper

[Michael Stefaniuc]

Signed-off-by: Michael Stefaniuc 
---
 dlls/d3dx9_36/effect.c | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 39281b9d44..22f098ead6 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -1204,25 +1204,6 @@ static D3DXHANDLE d3dx9_base_effect_get_parameter(struct d3dx9_base_effect *base
     return NULL;
 }

-static D3DXHANDLE d3dx9_base_effect_get_parameter_by_name(struct d3dx9_base_effect *base,
-        D3DXHANDLE parameter, const char *name)
-{
-    struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-    D3DXHANDLE handle;
-
-    if (!name)
-    {
-        handle = get_parameter_handle(param);
-        TRACE("Returning parameter %p.\n", handle);
-        return handle;
-    }
-
-    handle = get_parameter_handle(get_parameter_by_name(base, param, name));
-    TRACE("Returning parameter %p.\n", handle);
-
-    return handle;
-}
-
 static D3DXHANDLE d3dx9_base_effect_get_parameter_by_semantic(struct d3dx9_base_effect *base,
         D3DXHANDLE parameter, const char *semantic)
 {
@@ -3465,10 +3446,22 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterByName(ID3DXEffect *iface, D3DX
         const char *name)
 {
     struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
+    struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
+    D3DXHANDLE handle;

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

-    return d3dx9_base_effect_get_parameter_by_name(&effect->base_effect, parameter, name);
+    if (!name)
+    {
+        handle = get_parameter_handle(param);
+        TRACE("Returning parameter %p.\n", handle);
+        return handle;
+    }
+
+    handle = get_parameter_handle(get_parameter_by_name(&effect->base_effect, param, name));
+    TRACE("Returning parameter %p.\n", handle);
+
+    return handle;
 }

static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, D3DXHANDLE parameter,

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=48598

Your paranoid android.

=== debian9 (build log) ===

error: patch failed: dlls/d3dx9_36/effect.c:3465
Task: Patch failed to apply

=== debian9 (build log) ===

error: patch failed: dlls/d3dx9_36/effect.c:3465
Task: Patch failed to apply

[Matteo Bruni]

Signed-off-by: Matteo Bruni