Henri Verbeet : d3dx9: Avoid LPD3DXMATRIX.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3b4b61f03aae9fdd763bfd25e4d302909089cd2a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3b4b61f03aae9fdd763bfd25e4d302909089cd2a

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Aug 21 08:29:30 2013 +0200

d3dx9: Avoid LPD3DXMATRIX.

---

 dlls/d3dx9_36/skin.c       |    2 +-
 dlls/d3dx9_36/tests/math.c |    2 +-
 include/d3dx9mesh.h        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c
index c3857d6..85c4d64 100644
--- a/dlls/d3dx9_36/skin.c
+++ b/dlls/d3dx9_36/skin.c
@@ -285,7 +285,7 @@ static HRESULT WINAPI ID3DXSkinInfoImpl_SetBoneOffsetMatrix(ID3DXSkinInfo *iface
     return D3D_OK;
 }
 
-static LPD3DXMATRIX WINAPI ID3DXSkinInfoImpl_GetBoneOffsetMatrix(ID3DXSkinInfo *iface, DWORD bone_num)
+static D3DXMATRIX * WINAPI ID3DXSkinInfoImpl_GetBoneOffsetMatrix(ID3DXSkinInfo *iface, DWORD bone_num)
 {
     ID3DXSkinInfoImpl *This = impl_from_ID3DXSkinInfo(iface);
 
diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c
index 5f92729..9f30f52 100644
--- a/dlls/d3dx9_36/tests/math.c
+++ b/dlls/d3dx9_36/tests/math.c
@@ -234,7 +234,7 @@ static void D3DXFresnelTest(void)
 static void D3DXMatrixTest(void)
 {
     D3DXMATRIX expectedmat, gotmat, mat, mat2, mat3;
-    LPD3DXMATRIX funcpointer;
+    D3DXMATRIX *funcpointer;
     D3DXPLANE plane;
     D3DXQUATERNION q, r;
     D3DXVECTOR3 at, axis, eye, last;
diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h
index 8fee738..1347a79 100644
--- a/include/d3dx9mesh.h
+++ b/include/d3dx9mesh.h
@@ -529,7 +529,7 @@ DECLARE_INTERFACE_(ID3DXSkinInfo, IUnknown)
     STDMETHOD(SetBoneName)(THIS_ DWORD bone, LPCSTR name) PURE;
     STDMETHOD_(LPCSTR, GetBoneName)(THIS_ DWORD bone) PURE;
     STDMETHOD(SetBoneOffsetMatrix)(THIS_ DWORD bone, CONST D3DXMATRIX* bone_transform) PURE;
-    STDMETHOD_(LPD3DXMATRIX, GetBoneOffsetMatrix)(THIS_ DWORD bone) PURE;
+    STDMETHOD_(D3DXMATRIX *, GetBoneOffsetMatrix)(THIS_ DWORD bone) PURE;
     STDMETHOD(Clone)(THIS_ ID3DXSkinInfo **skin_info) PURE;
     STDMETHOD(Remap)(THIS_ DWORD num_vertices, DWORD* vertex_remap) PURE;
     STDMETHOD(SetFVF)(THIS_ DWORD FVF) PURE;