Henri Verbeet : ddraw: Avoid LPDIRECT3DVIEWPORT2.

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Mon Nov 12 21:50:59 2012 +0100

ddraw: Avoid LPDIRECT3DVIEWPORT2.

---

 dlls/ddraw/tests/d3d.c |    2 +-
 include/d3d.h          |   13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
index f1e20fc..7968b09 100644
--- a/dlls/ddraw/tests/d3d.c
+++ b/dlls/ddraw/tests/d3d.c
@@ -925,7 +925,7 @@ static void D3D1_releaseObjects(void)
 static void ViewportTest(void)
 {
     HRESULT hr;
-    LPDIRECT3DVIEWPORT2 Viewport2;
+    IDirect3DViewport2 *Viewport2;
     IDirect3DViewport3 *Viewport3;
     D3DVIEWPORT vp1_data, ret_vp1_data;
     D3DVIEWPORT2 vp2_data, ret_vp2_data;
diff --git a/include/d3d.h b/include/d3d.h
index 2c0d102..c7c7838 100644
--- a/include/d3d.h
+++ b/include/d3d.h
@@ -261,7 +261,7 @@ DECLARE_INTERFACE_(IDirect3D2,IUnknown)
     STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE;
     STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE;
     STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial2 **material, IUnknown *outer) PURE;
-    STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT2 *lplpD3DViewport2, IUnknown *pUnkOuter) PURE;
+    STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport2 **viewport, IUnknown *outer) PURE;
     STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE;
     STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface *surface,
             struct IDirect3DDevice2 **device) PURE;
@@ -1028,16 +1028,17 @@ DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown)
     STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE;
     STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture2 *tex1, IDirect3DTexture2 *tex2) PURE;
     STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE;
-    STDMETHOD(AddViewport)(THIS_ LPDIRECT3DVIEWPORT2 lpDirect3DViewport2) PURE;
-    STDMETHOD(DeleteViewport)(THIS_ LPDIRECT3DVIEWPORT2 lpDirect3DViewport2) PURE;
-    STDMETHOD(NextViewport)(THIS_ LPDIRECT3DVIEWPORT2 lpDirect3DViewport2, LPDIRECT3DVIEWPORT2 *lplpDirect3DViewport2, DWORD dwFlags) PURE;
+    STDMETHOD(AddViewport)(THIS_ IDirect3DViewport2 *viewport) PURE;
+    STDMETHOD(DeleteViewport)(THIS_ IDirect3DViewport2 *viewport) PURE;
+    STDMETHOD(NextViewport)(THIS_ IDirect3DViewport2 *ref,
+            IDirect3DViewport2 **viewport, DWORD flags) PURE;
     STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMTEXTUREFORMATSCALLBACK lpD3DEnumTextureProc, LPVOID lpArg) PURE;
     STDMETHOD(BeginScene)(THIS) PURE;
     STDMETHOD(EndScene)(THIS) PURE;
     STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D2 *lplpDirect3D2) PURE;
     /*** DrawPrimitive API ***/
-    STDMETHOD(SetCurrentViewport)(THIS_ LPDIRECT3DVIEWPORT2 lpDirect3DViewport2) PURE;
-    STDMETHOD(GetCurrentViewport)(THIS_ LPDIRECT3DVIEWPORT2 *lplpDirect3DViewport2) PURE;
+    STDMETHOD(SetCurrentViewport)(THIS_ IDirect3DViewport2 *viewport) PURE;
+    STDMETHOD(GetCurrentViewport)(THIS_ IDirect3DViewport2 **viewport) PURE;
     STDMETHOD(SetRenderTarget)(THIS_ IDirectDrawSurface *surface, DWORD flags) PURE;
     STDMETHOD(GetRenderTarget)(THIS_ IDirectDrawSurface **surface) PURE;
     STDMETHOD(Begin)(THIS_ D3DPRIMITIVETYPE d3dpt,D3DVERTEXTYPE dwVertexTypeDesc,DWORD dwFlags) PURE;