Henri Verbeet : d3dx8: Correct some ID3DXMatrixStack prototypes.

Alexandre Julliard julliard at winehq.org
Thu Oct 30 10:10:28 CDT 2008


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Oct 29 16:34:21 2008 +0100

d3dx8: Correct some ID3DXMatrixStack prototypes.

---

 dlls/d3dx8/math.c   |   10 +++++-----
 include/d3dx8math.h |   10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c
index 58f8166..54a17c2 100644
--- a/dlls/d3dx8/math.c
+++ b/dlls/d3dx8/math.c
@@ -643,21 +643,21 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_LoadIdentity(ID3DXMatrixStack *iface)
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, LPD3DXMATRIX pm)
+static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm)
 {
     ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface;
     FIXME("(%p) : stub\n",This);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, LPD3DXMATRIX pm)
+static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm)
 {
     ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface;
     FIXME("(%p) : stub\n",This);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *iface, LPD3DXMATRIX pm)
+static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm)
 {
     ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface;
     FIXME("(%p) : stub\n",This);
@@ -678,14 +678,14 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Push(ID3DXMatrixStack *iface)
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxis(ID3DXMatrixStack *iface, LPD3DXVECTOR3 pv, FLOAT angle)
+static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxis(ID3DXMatrixStack *iface, CONST D3DXVECTOR3 *pv, FLOAT angle)
 {
     ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface;
     FIXME("(%p) : stub\n",This);
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxisLocal(ID3DXMatrixStack *iface, LPD3DXVECTOR3 pv, FLOAT angle)
+static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxisLocal(ID3DXMatrixStack *iface, CONST D3DXVECTOR3 *pv, FLOAT angle)
 {
     ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface;
     FIXME("(%p) : stub\n",This);
diff --git a/include/d3dx8math.h b/include/d3dx8math.h
index 2ee783f..88da2b0 100644
--- a/include/d3dx8math.h
+++ b/include/d3dx8math.h
@@ -359,11 +359,11 @@ DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown)
     STDMETHOD(Pop)(THIS) PURE;
     STDMETHOD(Push)(THIS) PURE;
     STDMETHOD(LoadIdentity)(THIS) PURE;
-    STDMETHOD(LoadMatrix)(THIS_ CONST LPD3DXMATRIX) PURE;
-    STDMETHOD(MultMatrix)(THIS_ CONST LPD3DXMATRIX) PURE;
-    STDMETHOD(MultMatrixLocal)(THIS_ CONST LPD3DXMATRIX) PURE;
-    STDMETHOD(RotateAxis)(THIS_ CONST LPD3DXVECTOR3, FLOAT) PURE;
-    STDMETHOD(RotateAxisLocal)(THIS_ CONST LPD3DXVECTOR3, FLOAT) PURE;
+    STDMETHOD(LoadMatrix)(THIS_ CONST D3DXMATRIX *) PURE;
+    STDMETHOD(MultMatrix)(THIS_ CONST D3DXMATRIX *) PURE;
+    STDMETHOD(MultMatrixLocal)(THIS_ CONST D3DXMATRIX *) PURE;
+    STDMETHOD(RotateAxis)(THIS_ CONST D3DXVECTOR3 *, FLOAT) PURE;
+    STDMETHOD(RotateAxisLocal)(THIS_ CONST D3DXVECTOR3 *, FLOAT) PURE;
     STDMETHOD(RotateYawPitchRoll)(THIS_ FLOAT, FLOAT, FLOAT) PURE;
     STDMETHOD(RotateYawPitchRollLocal)(THIS_ FLOAT, FLOAT, FLOAT) PURE;
     STDMETHOD(Scale)(THIS_ FLOAT, FLOAT, FLOAT) PURE;




More information about the wine-cvs mailing list