Christian Costa : d3dx9_36: Add stub for D3DXCreateTextureFromFileInMemoryEx.
Alexandre Julliard
julliard at winehq.org
Wed Mar 17 12:19:07 CDT 2010
Module: wine
Branch: master
Commit: c090624fbc86009c13860603947306406a8ce789
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c090624fbc86009c13860603947306406a8ce789
Author: Christian Costa <titan.costa at wanadoo.fr>
Date: Wed Mar 17 12:21:22 2010 +0100
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 deletions(-)
diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
index 7924081..2034a04 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 f47853a..f0773b9 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;
+}
More information about the wine-cvs
mailing list