Józef Kucia : d3dx9: Forward D3DXCreateCubeTextureFromFileInMemory to D3DXCreateCubeTextureFromFileInMemoryEx .

[Alexandre Julliard]

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

Author: Józef Kucia 
Date:   Sun Mar 25 15:40:40 2012 +0200

d3dx9: Forward D3DXCreateCubeTextureFromFileInMemory to D3DXCreateCubeTextureFromFileInMemoryEx.

---

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

diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
index 70ff3d9..36eef20 100644
--- a/dlls/d3dx9_36/d3dx9_36.spec
+++ b/dlls/d3dx9_36/d3dx9_36.spec
@@ -38,7 +38,7 @@
 @ stub D3DXCreateCubeTextureFromFileA(ptr ptr ptr)
 @ 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)
+@ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long 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)
diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
index 4fc6eff..b54c44c 100644
--- a/dlls/d3dx9_36/texture.c
+++ b/dlls/d3dx9_36/texture.c
@@ -908,6 +908,17 @@ HRESULT WINAPI D3DXCreateCubeTexture(LPDIRECT3DDEVICE9 device,
     return IDirect3DDevice9_CreateCubeTexture(device, size, miplevels, usage, format, pool, texture, NULL);
 }

+HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemory(LPDIRECT3DDEVICE9 device,
+                                                     LPCVOID data,
+                                                     UINT datasize,
+                                                     LPDIRECT3DCUBETEXTURE9 *texture)
+{
+    TRACE("(%p, %p, %u, %p)\n", device, data, datasize, texture);
+
+    return D3DXCreateCubeTextureFromFileInMemoryEx(device, data, datasize, D3DX_DEFAULT, D3DX_DEFAULT,
+        0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, texture);
+}
+
 HRESULT WINAPI D3DXCreateVolumeTexture(LPDIRECT3DDEVICE9 device,
                                        UINT width,
                                        UINT height,