Travis Athougies : d3dx9_36: Added stub D3DXCreateCubeTextureFromFileInMemory.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4434becd039f502fa34b5f28a7366409332c3193
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4434becd039f502fa34b5f28a7...

Author: Travis Athougies 
Date:   Thu Jun 23 18:55:16 2011 -0700

d3dx9_36: Added stub D3DXCreateCubeTextureFromFileInMemory.

---

dlls/d3dx9_36/d3dx9_36.spec |    2 +-
 dlls/d3dx9_36/texture.c     |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
index f3b4efe..b212b05 100644
--- a/dlls/d3dx9_36/d3dx9_36.spec
+++ b/dlls/d3dx9_36/d3dx9_36.spec
@@ -39,7 +39,7 @@
 @ stub D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr)
-@ stub D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr)
+@ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromFileW(ptr ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr)
 @ stub D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr)
diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
index 1c40d96..20d8880 100644
--- a/dlls/d3dx9_36/texture.c
+++ b/dlls/d3dx9_36/texture.c
@@ -1029,6 +1029,16 @@ HRESULT WINAPI D3DXFillTexture(LPDIRECT3DTEXTURE9 texture,
     return D3D_OK;
 }

+HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 pDevice, LPCVOID pSrcData, UINT SrcDataSize,
+        UINT Size, UINT MipLevels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, DWORD Filter, DWORD MipFilter, D3DCOLOR ColorKey,
+        D3DXIMAGE_INFO *pSrcInfo, PALETTEENTRY *pPalette, LPDIRECT3DCUBETEXTURE9 *ppCubeTexture)
+{
+    FIXME("(%p, %p, %u, %u, %u, %#x, %#x, %#x, %#x, %#x, %#x, %p, %p, %p): stub\n", pDevice, pSrcData, SrcDataSize, Size, MipLevels,
+            Usage, Format, Pool, Filter, MipFilter, ColorKey, pSrcInfo, pPalette, ppCubeTexture);
+
+    return E_NOTIMPL;
+}
+
 enum cube_coord
 {
     XCOORD = 0,