From 1557d2e4ff6e919ff252e5affd77781cf5eb3141 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Fri, 25 Jan 2013 10:57:16 +0100 Subject: [PATCH] d3drm: Avoid LPD3DRMBOX. --- dlls/d3drm/frame.c | 12 +++++------- include/d3drmobj.h | 14 +++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 09dfea4b6f8..03f018459ae 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -1260,7 +1260,7 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddMoveCallback2(IDirect3DRMFrame2* return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame2Impl_GetBox(IDirect3DRMFrame2* iface, LPD3DRMBOX box) +static HRESULT WINAPI IDirect3DRMFrame2Impl_GetBox(IDirect3DRMFrame2 *iface, D3DRMBOX *box) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); @@ -1307,8 +1307,7 @@ static BOOL WINAPI IDirect3DRMFrame2Impl_GetInheritAxes(IDirect3DRMFrame2* iface return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame2Impl_GetHierarchyBox(IDirect3DRMFrame2* iface, - LPD3DRMBOX box) +static HRESULT WINAPI IDirect3DRMFrame2Impl_GetHierarchyBox(IDirect3DRMFrame2 *iface, D3DRMBOX *box) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); @@ -2336,7 +2335,7 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_Transform(IDirect3DRMFrame3* iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_GetBox(IDirect3DRMFrame3* iface, LPD3DRMBOX box) +static HRESULT WINAPI IDirect3DRMFrame3Impl_GetBox(IDirect3DRMFrame3 *iface, D3DRMBOX *box) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); @@ -2382,8 +2381,7 @@ static BOOL WINAPI IDirect3DRMFrame3Impl_GetInheritAxes(IDirect3DRMFrame3* iface return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_GetHierarchyBox(IDirect3DRMFrame3* iface, - LPD3DRMBOX box) +static HRESULT WINAPI IDirect3DRMFrame3Impl_GetHierarchyBox(IDirect3DRMFrame3* iface, D3DRMBOX *box) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); @@ -2392,7 +2390,7 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_GetHierarchyBox(IDirect3DRMFrame3* i return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_SetBox(IDirect3DRMFrame3* iface, LPD3DRMBOX box) +static HRESULT WINAPI IDirect3DRMFrame3Impl_SetBox(IDirect3DRMFrame3 *iface, D3DRMBOX *box) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 71bc005b0c8..4fef2d411cf 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -1389,13 +1389,13 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(Transform)(THIS_ D3DVECTOR *d, D3DVECTOR *s) PURE; /*** IDirect3DRMFrame2 methods ***/ STDMETHOD(AddMoveCallback2)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg, DWORD flags) PURE; - STDMETHOD(GetBox)(THIS_ LPD3DRMBOX) PURE; + STDMETHOD(GetBox)(THIS_ D3DRMBOX *box) PURE; STDMETHOD_(BOOL, GetBoxEnable)(THIS) PURE; STDMETHOD(GetAxes)(THIS_ D3DVECTOR *dir, D3DVECTOR *up); STDMETHOD(GetMaterial)(THIS_ LPDIRECT3DRMMATERIAL *) PURE; STDMETHOD_(BOOL, GetInheritAxes)(THIS); - STDMETHOD(GetHierarchyBox)(THIS_ LPD3DRMBOX) PURE; - STDMETHOD(SetBox)(THIS_ LPD3DRMBOX) PURE; + STDMETHOD(GetHierarchyBox)(THIS_ D3DRMBOX *box) PURE; + STDMETHOD(SetBox)(THIS_ D3DRMBOX *box) PURE; STDMETHOD(SetBoxEnable)(THIS_ BOOL) PURE; STDMETHOD(SetAxes)(THIS_ D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz); STDMETHOD(SetInheritAxes)(THIS_ BOOL inherit_from_parent); @@ -1668,13 +1668,13 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) BOOL with_rotation) PURE; STDMETHOD(SetZbufferMode)(THIS_ D3DRMZBUFFERMODE) PURE; STDMETHOD(Transform)(THIS_ D3DVECTOR *d, D3DVECTOR *s) PURE; - STDMETHOD(GetBox)(THIS_ LPD3DRMBOX) PURE; + STDMETHOD(GetBox)(THIS_ D3DRMBOX *box) PURE; STDMETHOD_(BOOL, GetBoxEnable)(THIS) PURE; STDMETHOD(GetAxes)(THIS_ D3DVECTOR *dir, D3DVECTOR *up); STDMETHOD(GetMaterial)(THIS_ LPDIRECT3DRMMATERIAL2 *) PURE; STDMETHOD_(BOOL, GetInheritAxes)(THIS); - STDMETHOD(GetHierarchyBox)(THIS_ LPD3DRMBOX) PURE; - STDMETHOD(SetBox)(THIS_ LPD3DRMBOX) PURE; + STDMETHOD(GetHierarchyBox)(THIS_ D3DRMBOX *box) PURE; + STDMETHOD(SetBox)(THIS_ D3DRMBOX *box) PURE; STDMETHOD(SetBoxEnable)(THIS_ BOOL) PURE; STDMETHOD(SetAxes)(THIS_ D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz); STDMETHOD(SetInheritAxes)(THIS_ BOOL inherit_from_parent); @@ -2035,7 +2035,7 @@ DECLARE_INTERFACE_(IDirect3DRMProgressiveMesh,IDirect3DRMVisual) STDMETHOD(RegisterEvents) (THIS_ HANDLE event, DWORD flags, DWORD reserved) PURE; STDMETHOD(CreateMesh) (THIS_ LPDIRECT3DRMMESH *ppD3DRMMesh) PURE; STDMETHOD(Duplicate) (THIS_ LPDIRECT3DRMPROGRESSIVEMESH *ppD3DRMPMesh) PURE; - STDMETHOD(GetBox) (THIS_ LPD3DRMBOX pBBox) PURE; + STDMETHOD(GetBox) (THIS_ D3DRMBOX *box) PURE; STDMETHOD(SetQuality) (THIS_ D3DRMRENDERQUALITY) PURE; STDMETHOD(GetQuality) (THIS_ LPD3DRMRENDERQUALITY pQuality) PURE; }; -- 2.11.4.GIT