d3dx9: Avoid LPD3DXMESH.

dlls/d3dx9_36/mesh.c

@@ -1459,8 +1459,8 @@ static HRESULT WINAPI ID3DXMeshImpl_UnlockAttributeBuffer(ID3DXMesh *iface)
     return D3D_OK;
 }
 
-static HRESULT WINAPI ID3DXMeshImpl_Optimize(ID3DXMesh *iface, DWORD flags, CONST DWORD *adjacency_in, DWORD *adjacency_out,
-                                             DWORD *face_remap, LPD3DXBUFFER *vertex_remap, LPD3DXMESH *opt_mesh)
+static HRESULT WINAPI ID3DXMeshImpl_Optimize(ID3DXMesh *iface, DWORD flags, const DWORD *adjacency_in,
+        DWORD *adjacency_out, DWORD *face_remap, ID3DXBuffer **vertex_remap, ID3DXMesh **opt_mesh)
 {
     ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface);
     HRESULT hr;
@@ -3795,8 +3795,8 @@ cleanup:
     return hr;
 }
 
-HRESULT WINAPI D3DXCleanMesh(D3DXCLEANTYPE clean_type, LPD3DXMESH mesh_in, const DWORD *adjacency_in,
-                             LPD3DXMESH *mesh_out, DWORD *adjacency_out, LPD3DXBUFFER *errors_and_warnings)
+HRESULT WINAPI D3DXCleanMesh(D3DXCLEANTYPE clean_type, ID3DXMesh *mesh_in, const DWORD *adjacency_in,
+        ID3DXMesh **mesh_out, DWORD *adjacency_out, ID3DXBuffer **errors_and_warnings)
 {
     FIXME("(%u, %p, %p, %p, %p, %p)\n", clean_type, mesh_in, adjacency_in, mesh_out, adjacency_out, errors_and_warnings);
 
@@ -5890,7 +5890,7 @@ error:
     return hr;
 }
 
-HRESULT WINAPI D3DXValidMesh(LPD3DXMESH mesh, CONST DWORD *adjacency, LPD3DXBUFFER *errors_and_warnings)
+HRESULT WINAPI D3DXValidMesh(ID3DXMesh *mesh, const DWORD *adjacency, ID3DXBuffer **errors_and_warnings)
 {
     FIXME("(%p, %p, %p): stub\n", mesh, adjacency, *errors_and_warnings);
 
@@ -6461,13 +6461,8 @@ static inline void write_ib(void *index_buffer, BOOL indices_are_32bit,
  *   Attribute sorting not implemented.
  *
  */
-HRESULT WINAPI D3DXWeldVertices(LPD3DXMESH mesh,
-                                DWORD flags,
-                                CONST D3DXWELDEPSILONS *epsilons,
-                                CONST DWORD *adjacency,
-                                DWORD *adjacency_out,
-                                DWORD *face_remap_out,
-                                LPD3DXBUFFER *vertex_remap_out)
+HRESULT WINAPI D3DXWeldVertices(ID3DXMesh *mesh, DWORD flags, const D3DXWELDEPSILONS *epsilons,
+        const DWORD *adjacency, DWORD *adjacency_out, DWORD *face_remap_out, ID3DXBuffer **vertex_remap_out)
 {
     DWORD *adjacency_generated = NULL;
     const DWORD *adjacency_ptr;

dlls/d3dx9_36/skin.c

@@ -388,10 +388,10 @@ static HRESULT WINAPI ID3DXSkinInfoImpl_UpdateSkinnedMesh(ID3DXSkinInfo *iface,
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI ID3DXSkinInfoImpl_ConvertToBlendedMesh(ID3DXSkinInfo *iface, LPD3DXMESH mesh_in,
-        DWORD options, CONST DWORD *adjacency_in, LPDWORD adjacency_out, DWORD *face_remap,
-        LPD3DXBUFFER *vertex_remap, DWORD *max_face_infl, DWORD *num_bone_combinations,
-        LPD3DXBUFFER *bone_combination_table, LPD3DXMESH *mesh_out)
+static HRESULT WINAPI ID3DXSkinInfoImpl_ConvertToBlendedMesh(ID3DXSkinInfo *iface, ID3DXMesh *mesh_in,
+        DWORD options, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap,
+        ID3DXBuffer **vertex_remap, DWORD *max_face_infl, DWORD *num_bone_combinations,
+        ID3DXBuffer **bone_combination_table, ID3DXMesh **mesh_out)
 {
     ID3DXSkinInfoImpl *This = impl_from_ID3DXSkinInfo(iface);
 
@@ -402,10 +402,10 @@ static HRESULT WINAPI ID3DXSkinInfoImpl_ConvertToBlendedMesh(ID3DXSkinInfo *ifac
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI ID3DXSkinInfoImpl_ConvertToIndexedBlendedMesh(ID3DXSkinInfo *iface, LPD3DXMESH mesh_in,
-        DWORD options, CONST DWORD *adjacency_in, LPDWORD adjacency_out, DWORD *face_remap,
-        LPD3DXBUFFER *vertex_remap, DWORD *max_face_infl, DWORD *num_bone_combinations,
-        LPD3DXBUFFER *bone_combination_table, LPD3DXMESH *mesh_out)
+static HRESULT WINAPI ID3DXSkinInfoImpl_ConvertToIndexedBlendedMesh(ID3DXSkinInfo *iface, ID3DXMesh *mesh_in,
+        DWORD options, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap,
+        ID3DXBuffer **vertex_remap, DWORD *max_face_infl, DWORD *num_bone_combinations,
+        ID3DXBuffer **bone_combination_table, ID3DXMesh **mesh_out)
 {
     ID3DXSkinInfoImpl *This = impl_from_ID3DXSkinInfo(iface);
 

include/d3dx9anim.h

@@ -84,7 +84,7 @@ typedef struct _D3DXMESHDATA
 
     union
     {
-        LPD3DXMESH pMesh;
+        ID3DXMesh *pMesh;
         ID3DXPMesh *pPMesh;
         ID3DXPatchMesh *pPatchMesh;
     } DUMMYUNIONNAME;