From 110aa65e0d0103a605b43c0037f7664f3dd62dfb Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Tue, 3 Jan 2012 23:06:51 +0100
Subject: [PATCH] d3d10: Add a D3D10CompileEffectFromMemory() stub.

---
 dlls/d3d10/d3d10.spec   |  2 +-
 dlls/d3d10/d3d10_main.c | 18 ++++++++++++++++++
 include/d3d10effect.h   |  3 +++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec
index d1b2b9836b9..9f6210be578 100644
--- a/dlls/d3d10/d3d10.spec
+++ b/dlls/d3d10/d3d10.spec
@@ -1,4 +1,4 @@
-@ stub D3D10CompileEffectFromMemory
+@ stdcall D3D10CompileEffectFromMemory(ptr long ptr ptr ptr long long ptr ptr)
 @ stdcall D3D10CompileShader(ptr long str ptr ptr str str long ptr ptr)
 @ stdcall D3D10CreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob
 @ stdcall D3D10CreateDevice(ptr long ptr long long ptr)
diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c
index af792d4d6e0..5c3eec87f14 100644
--- a/dlls/d3d10/d3d10_main.c
+++ b/dlls/d3d10/d3d10_main.c
@@ -243,6 +243,24 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl
     return S_OK;
 }
 
+HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const char *filename,
+        const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags,
+        ID3D10Blob **effect, ID3D10Blob **errors)
+{
+    FIXME("data %p, data_size %lu, filename %s, defines %p, include %p,"
+            " hlsl_flags %#x, fx_flags %#x, effect %p, errors %p stub!\n",
+            data, data_size, wine_dbgstr_a(filename), defines, include,
+            hlsl_flags, fx_flags, effect, errors);
+
+    if (effect)
+        *effect = NULL;
+    if (errors)
+        *errors = NULL;
+
+    return E_NOTIMPL;
+}
+
+
 LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device)
 {
     FIXME("device %p stub!\n", device);
diff --git a/include/d3d10effect.h b/include/d3d10effect.h
index 5dbf31b8364..521cd4b7fff 100644
--- a/include/d3d10effect.h
+++ b/include/d3d10effect.h
@@ -827,6 +827,9 @@ DECLARE_INTERFACE_(ID3D10StateBlock, IUnknown)
 extern "C" {
 #endif
 
+HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const char *filename,
+        const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags,
+        ID3D10Blob **effect, ID3D10Blob **errors);
 HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags,
         ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect);
 HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device,