Skip to content

W
wine-winehq
Commit 71db6fd2 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

ddraw: Avoid LPDDCOLORKEY.

parent 9800ad3d
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
include/ddraw.h
View file @ 71db6fd2
...@@ -1886,7 +1886,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown) ...@@ -1886,7 +1886,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown)
/*34*/ STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; /*34*/ STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE;
/*38*/ STDMETHOD(GetCaps)(THIS_ DDSCAPS *caps) PURE; /*38*/ STDMETHOD(GetCaps)(THIS_ DDSCAPS *caps) PURE;
/*3c*/ STDMETHOD(GetClipper)(THIS_ IDirectDrawClipper **clipper) PURE; /*3c*/ STDMETHOD(GetClipper)(THIS_ IDirectDrawClipper **clipper) PURE;
/*40*/ STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; /*40*/ STDMETHOD(GetColorKey)(THIS_ DWORD flags, DDCOLORKEY *color_key) PURE;
/*44*/ STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE; /*44*/ STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;
/*48*/ STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; /*48*/ STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE;
/*4c*/ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; /*4c*/ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE;
...@@ -1899,7 +1899,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown) ...@@ -1899,7 +1899,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown)
/*68*/ STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; /*68*/ STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE;
/*6c*/ STDMETHOD(Restore)(THIS) PURE; /*6c*/ STDMETHOD(Restore)(THIS) PURE;
/*70*/ STDMETHOD(SetClipper)(THIS_ IDirectDrawClipper *clipper) PURE; /*70*/ STDMETHOD(SetClipper)(THIS_ IDirectDrawClipper *clipper) PURE;
/*74*/ STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; /*74*/ STDMETHOD(SetColorKey)(THIS_ DWORD flags, DDCOLORKEY *color_key) PURE;
/*78*/ STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; /*78*/ STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE;
/*7c*/ STDMETHOD(SetPalette)(THIS_ IDirectDrawPalette *palette) PURE; /*7c*/ STDMETHOD(SetPalette)(THIS_ IDirectDrawPalette *palette) PURE;
/*80*/ STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE; /*80*/ STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE;
...@@ -2020,7 +2020,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown) ...@@ -2020,7 +2020,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown)
STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE;
STDMETHOD(GetCaps)(THIS_ DDSCAPS *caps) PURE; STDMETHOD(GetCaps)(THIS_ DDSCAPS *caps) PURE;
STDMETHOD(GetClipper)(THIS_ IDirectDrawClipper **clipper) PURE; STDMETHOD(GetClipper)(THIS_ IDirectDrawClipper **clipper) PURE;
STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; STDMETHOD(GetColorKey)(THIS_ DWORD flags, DDCOLORKEY *color_key) PURE;
STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE; STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;
STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE;
STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE;
...@@ -2033,7 +2033,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown) ...@@ -2033,7 +2033,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown)
STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE;
STDMETHOD(Restore)(THIS) PURE; STDMETHOD(Restore)(THIS) PURE;
STDMETHOD(SetClipper)(THIS_ IDirectDrawClipper *clipper) PURE; STDMETHOD(SetClipper)(THIS_ IDirectDrawClipper *clipper) PURE;
STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; STDMETHOD(SetColorKey)(THIS_ DWORD flags, DDCOLORKEY *color_key) PURE;
STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE;
STDMETHOD(SetPalette)(THIS_ IDirectDrawPalette *palette) PURE; STDMETHOD(SetPalette)(THIS_ IDirectDrawPalette *palette) PURE;
STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE; STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE;
...@@ -2166,7 +2166,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown) ...@@ -2166,7 +2166,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown)
STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE;
STDMETHOD(GetCaps)(THIS_ DDSCAPS *caps) PURE; STDMETHOD(GetCaps)(THIS_ DDSCAPS *caps) PURE;
STDMETHOD(GetClipper)(THIS_ IDirectDrawClipper **clipper) PURE; STDMETHOD(GetClipper)(THIS_ IDirectDrawClipper **clipper) PURE;
STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; STDMETHOD(GetColorKey)(THIS_ DWORD flags, DDCOLORKEY *color_key) PURE;
STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE; STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;
STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE;
STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE;
...@@ -2179,7 +2179,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown) ...@@ -2179,7 +2179,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown)
STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE;
STDMETHOD(Restore)(THIS) PURE; STDMETHOD(Restore)(THIS) PURE;
STDMETHOD(SetClipper)(THIS_ IDirectDrawClipper *clipper) PURE; STDMETHOD(SetClipper)(THIS_ IDirectDrawClipper *clipper) PURE;
STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; STDMETHOD(SetColorKey)(THIS_ DWORD flags, DDCOLORKEY *color_key) PURE;
STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE;
STDMETHOD(SetPalette)(THIS_ IDirectDrawPalette *palette) PURE; STDMETHOD(SetPalette)(THIS_ IDirectDrawPalette *palette) PURE;
STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE; STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE;
...@@ -2317,7 +2317,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) ...@@ -2317,7 +2317,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown)
STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE;
STDMETHOD(GetCaps)(THIS_ DDSCAPS2 *caps) PURE; STDMETHOD(GetCaps)(THIS_ DDSCAPS2 *caps) PURE;
STDMETHOD(GetClipper)(THIS_ IDirectDrawClipper **clipper) PURE; STDMETHOD(GetClipper)(THIS_ IDirectDrawClipper **clipper) PURE;
STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; STDMETHOD(GetColorKey)(THIS_ DWORD flags, DDCOLORKEY *color_key) PURE;
STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE; STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;
STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE;
STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE;
...@@ -2330,7 +2330,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) ...@@ -2330,7 +2330,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown)
STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE;
STDMETHOD(Restore)(THIS) PURE; STDMETHOD(Restore)(THIS) PURE;
STDMETHOD(SetClipper)(THIS_ IDirectDrawClipper *clipper) PURE; STDMETHOD(SetClipper)(THIS_ IDirectDrawClipper *clipper) PURE;
STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; STDMETHOD(SetColorKey)(THIS_ DWORD flags, DDCOLORKEY *color_key) PURE;
STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE;
STDMETHOD(SetPalette)(THIS_ IDirectDrawPalette *palette) PURE; STDMETHOD(SetPalette)(THIS_ IDirectDrawPalette *palette) PURE;
STDMETHOD(Unlock)(THIS_ LPRECT lpSurfaceData) PURE; STDMETHOD(Unlock)(THIS_ LPRECT lpSurfaceData) PURE;
...@@ -2484,7 +2484,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown) ...@@ -2484,7 +2484,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown)
STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE;
STDMETHOD(GetCaps)(THIS_ DDSCAPS2 *caps) PURE; STDMETHOD(GetCaps)(THIS_ DDSCAPS2 *caps) PURE;
STDMETHOD(GetClipper)(THIS_ IDirectDrawClipper **clipper) PURE; STDMETHOD(GetClipper)(THIS_ IDirectDrawClipper **clipper) PURE;
STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; STDMETHOD(GetColorKey)(THIS_ DWORD flags, DDCOLORKEY *color_key) PURE;
STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE; STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;
STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE;
STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE;
...@@ -2497,7 +2497,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown) ...@@ -2497,7 +2497,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown)
STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE;
STDMETHOD(Restore)(THIS) PURE; STDMETHOD(Restore)(THIS) PURE;
STDMETHOD(SetClipper)(THIS_ IDirectDrawClipper *clipper) PURE; STDMETHOD(SetClipper)(THIS_ IDirectDrawClipper *clipper) PURE;
STDMETHOD(SetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; STDMETHOD(SetColorKey)(THIS_ DWORD flags, DDCOLORKEY *color_key) PURE;
STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE;
STDMETHOD(SetPalette)(THIS_ IDirectDrawPalette *palette) PURE; STDMETHOD(SetPalette)(THIS_ IDirectDrawPalette *palette) PURE;
STDMETHOD(Unlock)(THIS_ LPRECT lpSurfaceData) PURE; STDMETHOD(Unlock)(THIS_ LPRECT lpSurfaceData) PURE;
......
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