Skip to content

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

ddraw: Avoid LPDDPIXELFORMAT.

parent c1c970e0
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
include/d3dtypes.h
View file @ 9a7bb01a
...@@ -73,7 +73,7 @@ typedef LONG D3DFIXED; ...@@ -73,7 +73,7 @@ typedef LONG D3DFIXED;
typedef HRESULT (CALLBACK *LPD3DVALIDATECALLBACK)(LPVOID lpUserArg, DWORD dwOffset); typedef HRESULT (CALLBACK *LPD3DVALIDATECALLBACK)(LPVOID lpUserArg, DWORD dwOffset);
typedef HRESULT (CALLBACK *LPD3DENUMTEXTUREFORMATSCALLBACK)(LPDDSURFACEDESC lpDdsd, LPVOID lpContext); typedef HRESULT (CALLBACK *LPD3DENUMTEXTUREFORMATSCALLBACK)(LPDDSURFACEDESC lpDdsd, LPVOID lpContext);
typedef HRESULT (CALLBACK *LPD3DENUMPIXELFORMATSCALLBACK)(LPDDPIXELFORMAT lpDDPixFmt, LPVOID lpContext); typedef HRESULT (CALLBACK *LPD3DENUMPIXELFORMATSCALLBACK)(DDPIXELFORMAT *format, void *ctx);
#ifndef DX_SHARED_DEFINES #ifndef DX_SHARED_DEFINES
......
include/ddraw.h
View file @ 9a7bb01a
...@@ -1891,7 +1891,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown) ...@@ -1891,7 +1891,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown)
/*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;
/*50*/ STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; /*50*/ STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE;
/*54*/ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; /*54*/ STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE;
/*58*/ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; /*58*/ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
/*5c*/ STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE; /*5c*/ STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE;
/*60*/ STDMETHOD(IsLost)(THIS) PURE; /*60*/ STDMETHOD(IsLost)(THIS) PURE;
...@@ -2025,7 +2025,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown) ...@@ -2025,7 +2025,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown)
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;
STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE;
STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE;
STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE;
STDMETHOD(IsLost)(THIS) PURE; STDMETHOD(IsLost)(THIS) PURE;
...@@ -2171,7 +2171,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown) ...@@ -2171,7 +2171,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown)
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;
STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE;
STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE;
STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE;
STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE;
STDMETHOD(IsLost)(THIS) PURE; STDMETHOD(IsLost)(THIS) PURE;
...@@ -2322,7 +2322,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) ...@@ -2322,7 +2322,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown)
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;
STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE;
STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE;
STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) PURE;
STDMETHOD(IsLost)(THIS) PURE; STDMETHOD(IsLost)(THIS) PURE;
...@@ -2489,7 +2489,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown) ...@@ -2489,7 +2489,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown)
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;
STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE;
STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE;
STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE;
STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) PURE;
STDMETHOD(IsLost)(THIS) PURE; STDMETHOD(IsLost)(THIS) PURE;
......
include/ddrawi.h
View file @ 9a7bb01a
...@@ -820,7 +820,7 @@ typedef struct _DDRAWI_DIRECTDRAW_GBL { ...@@ -820,7 +820,7 @@ typedef struct _DDRAWI_DIRECTDRAW_GBL {
/* DirectX 6.0 */ /* DirectX 6.0 */
ULONG_PTR lpD3DHALCallbacks3; ULONG_PTR lpD3DHALCallbacks3;
DWORD dwNumZPixelFormats; DWORD dwNumZPixelFormats;
LPDDPIXELFORMAT lpZPixelFormats; DDPIXELFORMAT *lpZPixelFormats;
LPDDRAWI_DDMOTIONCOMP_INT mcList; LPDDRAWI_DDMOTIONCOMP_INT mcList;
DWORD hDDVxd; DWORD hDDVxd;
DDSCAPSEX ddsCapsMore; DDSCAPSEX ddsCapsMore;
......
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