=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3dx9: Add stubs for D3DXCreateVolumeTextureFromFileInMemory functions.
Alexandre Julliard
julliard at winehq.org
Mon Mar 26 12:29:34 CDT 2012
Module: wine
Branch: master
Commit: e0f2d4cf915b343424f16b71b80fdc6a9cf1a578
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f2d4cf915b343424f16b71b80fdc6a9cf1a578
Author: Józef Kucia <joseph.kucia at gmail.com>
Date: Sun Mar 25 15:40:41 2012 +0200
d3dx9: Add stubs for D3DXCreateVolumeTextureFromFileInMemory functions.
---
dlls/d3dx9_36/d3dx9_36.spec | 4 ++--
dlls/d3dx9_36/texture.c | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
index 36eef20..b0f7988 100644
--- a/dlls/d3dx9_36/d3dx9_36.spec
+++ b/dlls/d3dx9_36/d3dx9_36.spec
@@ -110,8 +110,8 @@
@ stub D3DXCreateVolumeTextureFromFileA(ptr ptr ptr)
@ stub D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr)
@ stub D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr)
-@ stub D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
-@ stub D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr)
+@ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr)
@ stub D3DXCreateVolumeTextureFromFileW(ptr ptr ptr)
@ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr)
@ stub D3DXCreateVolumeTextureFromResourceExA(ptr long 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 b54c44c..1606c9a 100644
--- a/dlls/d3dx9_36/texture.c
+++ b/dlls/d3dx9_36/texture.c
@@ -950,6 +950,42 @@ HRESULT WINAPI D3DXCreateVolumeTexture(LPDIRECT3DDEVICE9 device,
usage, format, pool, texture, NULL);
}
+HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemory(LPDIRECT3DDEVICE9 device,
+ LPCVOID data,
+ UINT datasize,
+ LPDIRECT3DVOLUMETEXTURE9 *texture)
+{
+ TRACE("(%p, %p, %u, %p)\n", device, data, datasize, texture);
+
+ return D3DXCreateVolumeTextureFromFileInMemoryEx(device, data, datasize, D3DX_DEFAULT, D3DX_DEFAULT,
+ D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT,
+ 0, NULL, NULL, texture);
+}
+
+HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device,
+ LPCVOID data,
+ UINT datasize,
+ UINT width,
+ UINT height,
+ UINT depth,
+ UINT miplevels,
+ DWORD usage,
+ D3DFORMAT format,
+ D3DPOOL pool,
+ DWORD filter,
+ DWORD mipfilter,
+ D3DCOLOR colorkey,
+ D3DXIMAGE_INFO *imageinfo,
+ PALETTEENTRY *palette,
+ LPDIRECT3DVOLUMETEXTURE9 *texture)
+{
+ FIXME("(%p, %p, %u, %u, %u, %u, %u, %#x, %#x, %#x, %#x, %#x, %#x, %p, %p, %p) : stub\n",
+ device, data, datasize, width, height, depth, miplevels, usage, format, pool,
+ filter, mipfilter, colorkey, imageinfo, palette, texture);
+
+ return E_NOTIMPL;
+}
+
HRESULT WINAPI D3DXFillTexture(LPDIRECT3DTEXTURE9 texture,
LPD3DXFILL2D function,
LPVOID funcdata)
More information about the wine-cvs
mailing list