From c090624fbc86009c13860603947306406a8ce789 Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@wanadoo.fr>
Date: Wed, 17 Mar 2010 12:21:22 +0100
Subject: [PATCH] d3dx9_36: Add stub for D3DXCreateTextureFromFileInMemoryEx.

---
 dlls/d3dx9_36/d3dx9_36.spec |  2 +-
 dlls/d3dx9_36/texture.c     | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
index 792408194d2..2034a04aece 100644
--- a/dlls/d3dx9_36/d3dx9_36.spec
+++ b/dlls/d3dx9_36/d3dx9_36.spec
@@ -97,7 +97,7 @@
 @ stub D3DXCreateTextureFromFileExA
 @ stub D3DXCreateTextureFromFileExW
 @ stub D3DXCreateTextureFromFileInMemory
-@ stub D3DXCreateTextureFromFileInMemoryEx
+@ stdcall D3DXCreateTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long ptr ptr ptr)
 @ stub D3DXCreateTextureFromFileW
 @ stub D3DXCreateTextureFromResourceA
 @ stub D3DXCreateTextureFromResourceExA
diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
index f47853a89df..f0773b9ad36 100644
--- a/dlls/d3dx9_36/texture.c
+++ b/dlls/d3dx9_36/texture.c
@@ -35,3 +35,25 @@ HRESULT WINAPI D3DXCreateTexture(LPDIRECT3DDEVICE9 pDevice,
 
     return IDirect3DDevice9_CreateTexture(pDevice, width, height, miplevels, usage, format, pool, ppTexture, NULL);
 }
+
+HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device,
+                                                   LPCVOID srcdata,
+                                                   UINT srcdatasize,
+                                                   UINT width,
+                                                   UINT height,
+                                                   UINT miplevels,
+                                                   DWORD usage,
+                                                   D3DFORMAT format,
+                                                   D3DPOOL pool,
+                                                   DWORD filter,
+                                                   DWORD mipfilter,
+                                                   D3DCOLOR colorkey,
+                                                   D3DXIMAGE_INFO* srcinfo,
+                                                   PALETTEENTRY* palette,
+                                                   LPDIRECT3DTEXTURE9* texture)
+{
+    FIXME("(%p, %p, %d, %d, %d, %d, %x, %x, %x, %d, %d, %x, %p, %p, %p): stub\n", device, srcdata, srcdatasize, width,
+        height, miplevels, usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture);
+
+    return E_NOTIMPL;
+}
-- 
2.11.4.GIT