Module: wine Branch: master Commit: fe9db6faf7fdf5a969d69c0a9da7f1ca22553829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe9db6faf7fdf5a969d69c0a9d...
Author: Misha Koshelev misha680@gmail.com Date: Sat Sep 25 14:36:49 2010 -0500
d3dx9_36: Add stub for D3DXCreateCylinder.
---
dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 8 ++++++++ include/d3dx9shape.h | 9 +++++++++ 3 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 8221118..7f974d1 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -45,7 +45,7 @@ @ stub D3DXCreateCubeTextureFromResourceExA @ stub D3DXCreateCubeTextureFromResourceExW @ stub D3DXCreateCubeTextureFromResourceW -@ stub D3DXCreateCylinder +@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @ stdcall D3DXCreateEffectCompilerFromFileA(str ptr ptr long ptr ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 9cb6e0d..0c6f0d3 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1289,6 +1289,14 @@ HRESULT WINAPI D3DXCreateSphere(LPDIRECT3DDEVICE9 device, FLOAT radius, UINT sli return D3D_OK; }
+HRESULT WINAPI D3DXCreateCylinder(LPDIRECT3DDEVICE9 device, FLOAT radius1, FLOAT radius2, FLOAT length, UINT slices, + UINT stacks, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency) +{ + FIXME("(%p, %f, %f, %f, %u, %u, %p, %p): stub\n", device, radius1, radius2, length, slices, stacks, mesh, adjacency); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DXCreateTeapot(LPDIRECT3DDEVICE9 device, LPD3DXMESH *mesh, LPD3DXBUFFER* adjacency) { FIXME("(%p, %p, %p): stub\n", device, mesh, adjacency); diff --git a/include/d3dx9shape.h b/include/d3dx9shape.h index 2890c5d..1a521de 100644 --- a/include/d3dx9shape.h +++ b/include/d3dx9shape.h @@ -39,6 +39,15 @@ HRESULT WINAPI D3DXCreateSphere(LPDIRECT3DDEVICE9 device, LPD3DXMESH* mesh, LPD3DXBUFFER* adjacency);
+HRESULT WINAPI D3DXCreateCylinder(LPDIRECT3DDEVICE9 device, + FLOAT radius1, + FLOAT radius2, + FLOAT length, + UINT slices, + UINT stacks, + LPD3DXMESH *mesh, + LPD3DXBUFFER *adjacency); + HRESULT WINAPI D3DXCreateTeapot(LPDIRECT3DDEVICE9 device, LPD3DXMESH *mesh, LPD3DXBUFFER *adjacency);