commit b08af2f0330722badd0faee1355469859541f38e
author Ove Kaaven <ovek@transgaming.com> Wed May 09 19:44:25 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed May 09 19:44:25 2001 +0000
tree 766b8c90a9f6ad617a807c873717a769207e7564
parent 8a3f6285c76ea7f02eb6b76e0d16d934eb657865

Fixed the IDirectDrawSurface4 interface declaration to conform a bit
more with the DirectX SDK headers' idea of what the interface looks
like.

include/ddraw.h

diff --git a/include/ddraw.h b/include/ddraw.h
index 9db3a7b..ca8965e 100644
--- a/include/ddraw.h
+++ b/include/ddraw.h
@@ -1798,12 +1798,7 @@
 /*****************************************************************************
  * IDirectDrawSurface4 interface
  */
-/* Cannot inherit from IDirectDrawSurface2 because the LPDIRECTDRAWSURFACE2 parameters 
- * have been converted to LPDIRECTDRAWSURFACE3.
- */
-/* FIXME: I assumed IDirectDrawSurface4 does not inherit from IDirectDrawSurface3 but I 
- * have actually not proof of that. Can someone check and remove this comment or patch 
- * accordingly ?
+/* Cannot inherit from IDirectDrawSurface2 because DDSCAPS changed to DDSCAPS2.
  */
 #define ICOM_INTERFACE IDirectDrawSurface4
 #define IDirectDrawSurface4_METHODS \
@@ -1816,9 +1811,9 @@
     ICOM_METHOD2(HRESULT,EnumAttachedSurfaces,  LPVOID,lpContext, LPDDENUMSURFACESCALLBACK,lpEnumSurfacesCallback) \
     ICOM_METHOD3(HRESULT,EnumOverlayZOrders,    DWORD,dwFlags, LPVOID,lpContext, LPDDENUMSURFACESCALLBACK,lpfnCallback) \
     ICOM_METHOD2(HRESULT,Flip,                  LPDIRECTDRAWSURFACE4,lpDDSurfaceTargetOverride, DWORD,dwFlags) \
-    ICOM_METHOD2(HRESULT,GetAttachedSurface,    LPDDSCAPS,lpDDSCaps, LPDIRECTDRAWSURFACE4*,lplpDDAttachedSurface) \
+    ICOM_METHOD2(HRESULT,GetAttachedSurface,    LPDDSCAPS2,lpDDSCaps, LPDIRECTDRAWSURFACE4*,lplpDDAttachedSurface) \
     ICOM_METHOD1(HRESULT,GetBltStatus,          DWORD,dwFlags) \
-    ICOM_METHOD1(HRESULT,GetCaps,               LPDDSCAPS,lpDDSCaps) \
+    ICOM_METHOD1(HRESULT,GetCaps,               LPDDSCAPS2,lpDDSCaps) \
     ICOM_METHOD1(HRESULT,GetClipper,            LPDIRECTDRAWCLIPPER*,lplpDDClipper) \
     ICOM_METHOD2(HRESULT,GetColorKey,           DWORD,dwFlags, LPDDCOLORKEY,lpDDColorKey) \
     ICOM_METHOD1(HRESULT,GetDC,                 HDC*,lphDC) \