Module: wine Branch: master Commit: e650f49f0e61032ce2daea3311e4944bc0e50663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e650f49f0e61032ce2daea3311...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Wed Jan 23 08:50:09 2013 +0100
d3drm: Avoid LPD3DVALUE.
---
dlls/d3drm/frame.c | 10 ++++------ include/d3drmobj.h | 10 +++++----- 2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index fdcf714..258da3a 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -766,9 +766,8 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_GetPosition(IDirect3DRMFrame2* iface return E_NOTIMPL; }
-static HRESULT WINAPI IDirect3DRMFrame2Impl_GetRotation(IDirect3DRMFrame2* iface, - LPDIRECT3DRMFRAME reference, - LPD3DVECTOR axis, LPD3DVALUE return_theta) +static HRESULT WINAPI IDirect3DRMFrame2Impl_GetRotation(IDirect3DRMFrame2 *iface, + IDirect3DRMFrame *reference, D3DVECTOR *axis, D3DVALUE *return_theta) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface);
@@ -1854,9 +1853,8 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_GetPosition(IDirect3DRMFrame3* iface return E_NOTIMPL; }
-static HRESULT WINAPI IDirect3DRMFrame3Impl_GetRotation(IDirect3DRMFrame3* iface, - LPDIRECT3DRMFRAME3 reference, - LPD3DVECTOR axis, LPD3DVALUE return_theta) +static HRESULT WINAPI IDirect3DRMFrame3Impl_GetRotation(IDirect3DRMFrame3 *iface, + IDirect3DRMFrame3 *reference, D3DVECTOR *axis, D3DVALUE *return_theta) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface);
diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 69ab35d..bcfd724 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -1110,7 +1110,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) STDMETHOD_(D3DRMMATERIALMODE, GetMaterialMode)(THIS) PURE; STDMETHOD(GetParent)(THIS_ LPDIRECT3DRMFRAME *) PURE; STDMETHOD(GetPosition)(THIS_ LPDIRECT3DRMFRAME reference, LPD3DVECTOR return_position) PURE; - STDMETHOD(GetRotation)(THIS_ LPDIRECT3DRMFRAME reference, LPD3DVECTOR axis, LPD3DVALUE return_theta) PURE; + STDMETHOD(GetRotation)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *axis, D3DVALUE *return_theta) PURE; STDMETHOD(GetScene)(THIS_ LPDIRECT3DRMFRAME *) PURE; STDMETHOD_(D3DRMSORTMODE, GetSortMode)(THIS) PURE; STDMETHOD(GetTexture)(THIS_ LPDIRECT3DRMTEXTURE *) PURE; @@ -1341,7 +1341,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD_(D3DRMMATERIALMODE, GetMaterialMode)(THIS) PURE; STDMETHOD(GetParent)(THIS_ LPDIRECT3DRMFRAME *) PURE; STDMETHOD(GetPosition)(THIS_ LPDIRECT3DRMFRAME reference, LPD3DVECTOR return_position) PURE; - STDMETHOD(GetRotation)(THIS_ LPDIRECT3DRMFRAME reference, LPD3DVECTOR axis, LPD3DVALUE return_theta) PURE; + STDMETHOD(GetRotation)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *axis, D3DVALUE *return_theta) PURE; STDMETHOD(GetScene)(THIS_ LPDIRECT3DRMFRAME *) PURE; STDMETHOD_(D3DRMSORTMODE, GetSortMode)(THIS) PURE; STDMETHOD(GetTexture)(THIS_ LPDIRECT3DRMTEXTURE *) PURE; @@ -1621,7 +1621,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) STDMETHOD_(D3DRMMATERIALMODE, GetMaterialMode)(THIS) PURE; STDMETHOD(GetParent)(THIS_ LPDIRECT3DRMFRAME3 *) PURE; STDMETHOD(GetPosition)(THIS_ LPDIRECT3DRMFRAME3 reference, LPD3DVECTOR return_position) PURE; - STDMETHOD(GetRotation)(THIS_ LPDIRECT3DRMFRAME3 reference, LPD3DVECTOR axis, LPD3DVALUE return_theta) PURE; + STDMETHOD(GetRotation)(THIS_ IDirect3DRMFrame3 *reference, D3DVECTOR *axis, D3DVALUE *return_theta) PURE; STDMETHOD(GetScene)(THIS_ LPDIRECT3DRMFRAME3 *) PURE; STDMETHOD_(D3DRMSORTMODE, GetSortMode)(THIS) PURE; STDMETHOD(GetTexture)(THIS_ LPDIRECT3DRMTEXTURE3 *) PURE; @@ -2196,8 +2196,8 @@ DECLARE_INTERFACE_(IDirect3DRMShadow2,IDirect3DRMVisual) STDMETHOD(SetVisual)(THIS_ LPUNKNOWN pUNK, DWORD) PURE; STDMETHOD(GetLight)(THIS_ LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(SetLight)(THIS_ LPDIRECT3DRMLIGHT, DWORD) PURE; - STDMETHOD(GetPlane)(THIS_ LPD3DVALUE px, LPD3DVALUE py, LPD3DVALUE pz, - LPD3DVALUE nx, LPD3DVALUE ny, LPD3DVALUE nz) PURE; + STDMETHOD(GetPlane)(THIS_ D3DVALUE *px, D3DVALUE *py, D3DVALUE *pz, + D3DVALUE *nx, D3DVALUE *ny, D3DVALUE *nz) PURE; STDMETHOD(SetPlane)(THIS_ D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz, DWORD) PURE; STDMETHOD(GetOptions)(THIS_ LPDWORD) PURE;
-
Alexandre Julliard