[PATCH 1/5] d3dx9: Avoid LPD3DXALLOCATEHIERARCHY.
Henri Verbeet
hverbeet at codeweavers.com
Tue Dec 4 15:10:07 CST 2012
---
dlls/d3dx9_36/mesh.c | 2 +-
include/d3dx9anim.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
index ad7bfa7..986cbd4 100644
--- a/dlls/d3dx9_36/mesh.c
+++ b/dlls/d3dx9_36/mesh.c
@@ -3803,7 +3803,7 @@ HRESULT WINAPI D3DXCleanMesh(D3DXCLEANTYPE clean_type, ID3DXMesh *mesh_in, const
return E_NOTIMPL;
}
-HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME frame, LPD3DXALLOCATEHIERARCHY alloc_hier)
+HRESULT WINAPI D3DXFrameDestroy(D3DXFRAME *frame, ID3DXAllocateHierarchy *alloc_hier)
{
HRESULT hr;
BOOL last = FALSE;
diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h
index 5e9ef58..2ae780d 100644
--- a/include/d3dx9anim.h
+++ b/include/d3dx9anim.h
@@ -385,7 +385,7 @@ HRESULT WINAPI D3DXSaveMeshHierarchyToFileW(const WCHAR *filename, DWORD format,
const D3DXFRAME *frame_root, ID3DXAnimationController *animation_controller,
ID3DXSaveUserData *user_data_saver);
#define D3DXSaveMeshHierarchyToFile WINELIB_NAME_AW(D3DXSaveMeshHierarchyToFile)
-HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME, LPD3DXALLOCATEHIERARCHY);
+HRESULT WINAPI D3DXFrameDestroy(D3DXFRAME *frame_root, ID3DXAllocateHierarchy *alloc);
HRESULT WINAPI D3DXFrameAppendChild(LPD3DXFRAME, CONST D3DXFRAME*);
LPD3DXFRAME WINAPI D3DXFrameFind(CONST D3DXFRAME*, LPCSTR);
HRESULT WINAPI D3DXFrameRegisterNamedMatrices(D3DXFRAME *frame_root, ID3DXAnimationController *animation_controller);
--
1.7.8.6
More information about the wine-patches
mailing list