marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Forward D3DXCreateCubeTextureFromFileInMemory to D3DXCreateCubeTextureFromFileInMemoryEx.

oldstable
Józef Kucia 2012-03-25 15:40:40 +02:00 committed by Alexandre Julliard
parent 3a210af107
commit dfd66e5fe0
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3dx9_36/d3dx9_36.spec
View File

@ -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)

11
dlls/d3dx9_36/texture.c
View File

@ -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,