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

[winesync]

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

commit 329ee4ce8094e9e3535316772258b9a41be69452
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:03 2021 +0100

[WINESYNC] d3dx9: Merge the d3dx_effect_GetVectorArray() 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 4d978ec0812cd18960337d5709853d93d98a1f2e by Michael Stefaniuc [e-mail]
---
 dll/directx/wine/d3dx9_36/effect.c | 72 +++++++++++++++++---------------------
 sdk/tools/winesync/d3dx9.cfg       |  2 +-
 2 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index 7e0a195ec31..b041181bbe2 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -1282,45 +1282,6 @@ static HRESULT d3dx9_base_effect_set_vector_array(struct d3dx9_base_effect *base
     return D3DERR_INVALIDCALL;
 }

-static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base,
-        D3DXHANDLE parameter, D3DXVECTOR4 *vector, UINT count)
-{
-    struct d3dx_parameter *param = get_valid_parameter(base, parameter);
-
-    if (!count) return D3D_OK;
-
-    if (vector && param && count <= param->element_count)
-    {
-        UINT i;
-
-        TRACE("Class %s\n", debug_d3dxparameter_class(param->class));
-
-        switch (param->class)
-        {
-            case D3DXPC_VECTOR:
-                for (i = 0; i < count; ++i)
-                {
-                    get_vector(&param->members[i], &vector[i]);
-                }
-                return D3D_OK;
-
-            case D3DXPC_SCALAR:
-            case D3DXPC_MATRIX_ROWS:
-            case D3DXPC_OBJECT:
-            case D3DXPC_STRUCT:
-                break;
-
-            default:
-                FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class));
-                break;
-        }
-    }
-
-    WARN("Parameter not found.\n");
-
-    return D3DERR_INVALIDCALL;
-}
-
 static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base,
         D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader)
 {
@@ -2983,10 +2944,41 @@ static HRESULT WINAPI d3dx_effect_GetVectorArray(ID3DXEffect *iface, D3DXHANDLE
         D3DXVECTOR4 *vector, UINT count)
 {
     struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
+    struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);

TRACE("iface %p, parameter %p, vector %p, count %u.\n", iface, parameter, vector, count);

-    return d3dx9_base_effect_get_vector_array(&effect->base_effect, parameter, vector, count);
+    if (!count)
+        return D3D_OK;
+
+    if (vector && param && count <= param->element_count)
+    {
+        unsigned int i;
+
+        TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
+
+        switch (param->class)
+        {
+            case D3DXPC_VECTOR:
+                for (i = 0; i < count; ++i)
+                    get_vector(&param->members[i], &vector[i]);
+                return D3D_OK;
+
+            case D3DXPC_SCALAR:
+            case D3DXPC_MATRIX_ROWS:
+            case D3DXPC_OBJECT:
+            case D3DXPC_STRUCT:
+                break;
+
+            default:
+                FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class));
+                break;
+        }
+    }
+
+    WARN("Parameter not found.\n");
+
+    return D3DERR_INVALIDCALL;
 }

static HRESULT WINAPI d3dx_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXMATRIX *matrix)
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 622efe37f26..8123432039d 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: 3754ba683f2d3ccb16354a75b530c317382929d8}
+tags: {wine: 4d978ec0812cd18960337d5709853d93d98a1f2e}