Henri Verbeet : d3drm: Avoid LPDIRECT3DVIEWPORT.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Tue Nov 20 22:40:18 2012 +0100

d3drm: Avoid LPDIRECT3DVIEWPORT.

---

dlls/d3drm/viewport.c |    8 ++++----
 include/d3drmobj.h    |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c
index fb93dc6..75eb225 100644
--- a/dlls/d3drm/viewport.c
+++ b/dlls/d3drm/viewport.c
@@ -448,8 +448,8 @@ static D3DRMPROJECTIONTYPE WINAPI IDirect3DRMViewportImpl_GetProjection(IDirect3
     return IDirect3DRMViewport2_GetProjection(&This->IDirect3DRMViewport2_iface);
 }

-static HRESULT WINAPI IDirect3DRMViewportImpl_GetDirect3DViewport(IDirect3DRMViewport* iface,
-                                                                  LPDIRECT3DVIEWPORT * viewport)
+static HRESULT WINAPI IDirect3DRMViewportImpl_GetDirect3DViewport(IDirect3DRMViewport *iface,
+        IDirect3DViewport **viewport)
 {
     IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface);

@@ -883,8 +883,8 @@ static D3DRMPROJECTIONTYPE WINAPI IDirect3DRMViewport2Impl_GetProjection(IDirect
     return This->projection;
 }

-static HRESULT WINAPI IDirect3DRMViewport2Impl_GetDirect3DViewport(IDirect3DRMViewport2* iface,
-                                                                  LPDIRECT3DVIEWPORT * viewport)
+static HRESULT WINAPI IDirect3DRMViewport2Impl_GetDirect3DViewport(IDirect3DRMViewport2 *iface,
+        IDirect3DViewport **viewport)
 {
     IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface);

diff --git a/include/d3drmobj.h b/include/d3drmobj.h
index 3bafd9d..2265b56 100644
--- a/include/d3drmobj.h
+++ b/include/d3drmobj.h
@@ -835,7 +835,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport,IDirect3DRMObject)
     STDMETHOD_(D3DVALUE, GetBack)(THIS) PURE;
     STDMETHOD_(D3DVALUE, GetFront)(THIS) PURE;
     STDMETHOD_(D3DRMPROJECTIONTYPE, GetProjection)(THIS) PURE;
-    STDMETHOD(GetDirect3DViewport)(THIS_ LPDIRECT3DVIEWPORT *) PURE;
+    STDMETHOD(GetDirect3DViewport)(THIS_ IDirect3DViewport **viewport) PURE;
 };
 #undef INTERFACE

@@ -975,7 +975,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject)
     STDMETHOD_(D3DVALUE, GetBack)(THIS) PURE;
     STDMETHOD_(D3DVALUE, GetFront)(THIS) PURE;
     STDMETHOD_(D3DRMPROJECTIONTYPE, GetProjection)(THIS) PURE;
-    STDMETHOD(GetDirect3DViewport)(THIS_ LPDIRECT3DVIEWPORT *) PURE;
+    STDMETHOD(GetDirect3DViewport)(THIS_ IDirect3DViewport **viewport) PURE;
     STDMETHOD(TransformVectors)(THIS_ DWORD NumVectors, LPD3DRMVECTOR4D pDstVectors,
         LPD3DVECTOR pSrcVectors) PURE;
     STDMETHOD(InverseTransformVectors)(THIS_ DWORD NumVectors, LPD3DVECTOR pDstVectors,