Skip to content

W
wine-cw
Commit b08af2f0 authored by Ove Kaaven's avatar Ove Kaaven Committed by Alexandre Julliard
Browse files
Options

Fixed the IDirectDrawSurface4 interface declaration to conform a bit

more with the DirectX SDK headers' idea of what the interface looks like.
parent 8a3f6285
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 8 deletions
include/ddraw.h
View file @ b08af2f0
...@@ -1798,12 +1798,7 @@ ICOM_DEFINE(IDirectDrawSurface3,IUnknown) ...@@ -1798,12 +1798,7 @@ ICOM_DEFINE(IDirectDrawSurface3,IUnknown)
/***************************************************************************** /*****************************************************************************
* IDirectDrawSurface4 interface * IDirectDrawSurface4 interface
*/ */
/* Cannot inherit from IDirectDrawSurface2 because the LPDIRECTDRAWSURFACE2 parameters /* Cannot inherit from IDirectDrawSurface2 because DDSCAPS changed to DDSCAPS2.
* 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 ?
*/ */
#define ICOM_INTERFACE IDirectDrawSurface4 #define ICOM_INTERFACE IDirectDrawSurface4
#define IDirectDrawSurface4_METHODS \ #define IDirectDrawSurface4_METHODS \
...@@ -1816,9 +1811,9 @@ ICOM_DEFINE(IDirectDrawSurface3,IUnknown) ...@@ -1816,9 +1811,9 @@ ICOM_DEFINE(IDirectDrawSurface3,IUnknown)
ICOM_METHOD2(HRESULT,EnumAttachedSurfaces, LPVOID,lpContext, LPDDENUMSURFACESCALLBACK,lpEnumSurfacesCallback) \ ICOM_METHOD2(HRESULT,EnumAttachedSurfaces, LPVOID,lpContext, LPDDENUMSURFACESCALLBACK,lpEnumSurfacesCallback) \
ICOM_METHOD3(HRESULT,EnumOverlayZOrders, DWORD,dwFlags, LPVOID,lpContext, LPDDENUMSURFACESCALLBACK,lpfnCallback) \ ICOM_METHOD3(HRESULT,EnumOverlayZOrders, DWORD,dwFlags, LPVOID,lpContext, LPDDENUMSURFACESCALLBACK,lpfnCallback) \
ICOM_METHOD2(HRESULT,Flip, LPDIRECTDRAWSURFACE4,lpDDSurfaceTargetOverride, DWORD,dwFlags) \ 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,GetBltStatus, DWORD,dwFlags) \
ICOM_METHOD1(HRESULT,GetCaps, LPDDSCAPS,lpDDSCaps) \ ICOM_METHOD1(HRESULT,GetCaps, LPDDSCAPS2,lpDDSCaps) \
ICOM_METHOD1(HRESULT,GetClipper, LPDIRECTDRAWCLIPPER*,lplpDDClipper) \ ICOM_METHOD1(HRESULT,GetClipper, LPDIRECTDRAWCLIPPER*,lplpDDClipper) \
ICOM_METHOD2(HRESULT,GetColorKey, DWORD,dwFlags, LPDDCOLORKEY,lpDDColorKey) \ ICOM_METHOD2(HRESULT,GetColorKey, DWORD,dwFlags, LPDDCOLORKEY,lpDDColorKey) \
ICOM_METHOD1(HRESULT,GetDC, HDC*,lphDC) \ ICOM_METHOD1(HRESULT,GetDC, HDC*,lphDC) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment