[ros-diffs] [reactos] 13/218: [WINESYNC] d3dx9: Merge the stub ID3DXBaseEffect methods.

[winesync]

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

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

[WINESYNC] d3dx9: Merge the stub ID3DXBaseEffect methods.

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

wine commit id 715b932768d1f34815c6b0db18554e0d734bbec6 by Michael Stefaniuc [e-mail]
---
 dll/directx/wine/d3dx9_36/effect.c | 54 ++++++--------------------------------
 sdk/tools/winesync/d3dx9.cfg       |  2 +-
 2 files changed, 9 insertions(+), 47 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c
index b9fa5986d3d..4c56c764643 100644
--- a/dll/directx/wine/d3dx9_36/effect.c
+++ b/dll/directx/wine/d3dx9_36/effect.c
@@ -1202,14 +1202,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base,
     return D3D_OK;
 }

-static HRESULT d3dx9_base_effect_get_function_desc(struct d3dx9_base_effect *base,
-        D3DXHANDLE shader, D3DXFUNCTION_DESC *desc)
-{
-    FIXME("stub!\n");
-
-    return E_NOTIMPL;
-}
-
 static D3DXHANDLE d3dx9_base_effect_get_parameter(struct d3dx9_base_effect *base,
         D3DXHANDLE parameter, UINT index)
 {
@@ -1413,20 +1405,6 @@ static D3DXHANDLE d3dx9_base_effect_get_pass_by_name(struct d3dx9_base_effect *b
     return NULL;
 }

-static D3DXHANDLE d3dx9_base_effect_get_function(struct d3dx9_base_effect *base, UINT index)
-{
-    FIXME("stub!\n");
-
-    return NULL;
-}
-
-static D3DXHANDLE d3dx9_base_effect_get_function_by_name(struct d3dx9_base_effect *base, const char *name)
-{
-    FIXME("stub!\n");
-
-    return NULL;
-}
-
 static UINT get_annotation_from_object(struct d3dx9_base_effect *base,
         D3DXHANDLE object, struct d3dx_parameter **annotations)
 {
@@ -2776,14 +2754,6 @@ static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *bas
     return D3DERR_INVALIDCALL;
 }

-static HRESULT d3dx9_base_effect_set_array_range(struct d3dx9_base_effect *base,
-        D3DXHANDLE parameter, UINT start, UINT end)
-{
-    FIXME("stub!\n");
-
-    return E_NOTIMPL;
-}
-
 static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value)
 {
     static const struct
@@ -3490,11 +3460,9 @@ static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pas
 static HRESULT WINAPI d3dx_effect_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE shader,
         D3DXFUNCTION_DESC *desc)
 {
-    struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface);
+    FIXME("iface %p, shader %p, desc %p stub.\n", iface, shader, desc);

-    TRACE("iface %p, shader %p, desc %p.\n", iface, shader, desc);
-
-    return d3dx9_base_effect_get_function_desc(&effect->base_effect, shader, desc);
+    return E_NOTIMPL;
 }

static D3DXHANDLE WINAPI d3dx_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index)
@@ -3573,20 +3541,16 @@ static D3DXHANDLE WINAPI d3dx_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDL

static D3DXHANDLE WINAPI d3dx_effect_GetFunction(ID3DXEffect *iface, UINT index)
 {
-    struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface);
+    FIXME("iface %p, index %u stub.\n", iface, index);

-    TRACE("iface %p, index %u.\n", iface, index);
-
-    return d3dx9_base_effect_get_function(&effect->base_effect, index);
+    return NULL;
 }

static D3DXHANDLE WINAPI d3dx_effect_GetFunctionByName(ID3DXEffect *iface, const char *name)
 {
-    struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface);
-
-    TRACE("iface %p, name %s.\n", iface, debugstr_a(name));
+    FIXME("iface %p, name %s stub.\n", iface, debugstr_a(name));

-    return d3dx9_base_effect_get_function_by_name(&effect->base_effect, name);
+    return NULL;
 }

static D3DXHANDLE WINAPI d3dx_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index)
@@ -3952,11 +3916,9 @@ static HRESULT WINAPI d3dx_effect_GetVertexShader(struct ID3DXEffect *iface, D3D

static HRESULT WINAPI d3dx_effect_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end)
 {
-    struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface);
+    FIXME("iface %p, parameter %p, start %u, end %u stub.\n", iface, parameter, start, end);

-    TRACE("iface %p, parameter %p, start %u, end %u.\n", iface, parameter, start, end);
-
-    return d3dx9_base_effect_set_array_range(&effect->base_effect, parameter, start, end);
+    return E_NOTIMPL;
 }

/*** ID3DXEffect methods ***/
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 3d9c997660a..ae717736b51 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: 612196b64c6b17d694831b92e7182afe9b2d9aca}
+tags: {wine: 715b932768d1f34815c6b0db18554e0d734bbec6}