Skip to content

W
wine-winehq
Commit 581a8edd authored by Lionel Ulmer's avatar Lionel Ulmer Committed by Alexandre Julliard
Browse files
Options

- added definition of DirectDrawCreateClipper.

- more versatile support of surfaces / better surface description support.
parent 07e0d947
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
include/ddraw.h
View file @ 581a8edd
...@@ -985,8 +985,8 @@ struct _common_directdrawsurface { ...@@ -985,8 +985,8 @@ struct _common_directdrawsurface {
LPDIRECTDRAWPALETTE palette; LPDIRECTDRAWPALETTE palette;
LPDIRECTDRAW2 ddraw; LPDIRECTDRAW2 ddraw;
LPDIRECTDRAWSURFACE3 backbuffer; LPDIRECTDRAWSURFACE3 backbuffer;
LPVOID surface;
DWORD lpitch,width,height; DDSURFACEDESC surface_desc;
}; };
struct _dga_directdrawsurface { struct _dga_directdrawsurface {
...@@ -995,7 +995,6 @@ struct _dga_directdrawsurface { ...@@ -995,7 +995,6 @@ struct _dga_directdrawsurface {
struct _xlib_directdrawsurface { struct _xlib_directdrawsurface {
XImage *image; XImage *image;
int on_screen;
#ifdef HAVE_LIBXXSHM #ifdef HAVE_LIBXXSHM
XShmSegmentInfo shminfo; XShmSegmentInfo shminfo;
#endif #endif
...@@ -1013,7 +1012,8 @@ typedef struct IDirectDrawSurface_VTable { ...@@ -1013,7 +1012,8 @@ typedef struct IDirectDrawSurface_VTable {
STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH, DWORD, DWORD ) PURE; STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH, DWORD, DWORD ) PURE;
STDMETHOD(BltFast)(THIS_ DWORD,DWORD,LPDIRECTDRAWSURFACE, LPRECT32,DWORD) PURE; STDMETHOD(BltFast)(THIS_ DWORD,DWORD,LPDIRECTDRAWSURFACE, LPRECT32,DWORD) PURE;
STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD,LPDIRECTDRAWSURFACE) PURE; STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD,LPDIRECTDRAWSURFACE) PURE;
STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID,LPDDENUMSURFACESCALLBACK) PURE; STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD,LPVOID,LPDDENUMSURFACESCALLBACK) PURE; STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID,LPDDENUMSURFACESCALLBACK) PURE;
STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD,LPVOID,LPDDENUMSURFACESCALLBACK) PURE;
STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE, DWORD) PURE; STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE, DWORD) PURE;
STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS, LPDIRECTDRAWSURFACE FAR *) PURE; STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS, LPDIRECTDRAWSURFACE FAR *) PURE;
STDMETHOD(GetBltStatus)(THIS_ DWORD) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD) PURE;
...@@ -1196,5 +1196,6 @@ struct IDirectDrawColorControl { ...@@ -1196,5 +1196,6 @@ struct IDirectDrawColorControl {
HRESULT WINAPI DirectDrawCreate(LPGUID,LPDIRECTDRAW*,LPUNKNOWN); HRESULT WINAPI DirectDrawCreate(LPGUID,LPDIRECTDRAW*,LPUNKNOWN);
HRESULT WINAPI DirectDrawEnumerate32A(LPDDENUMCALLBACK32A,LPVOID); HRESULT WINAPI DirectDrawEnumerate32A(LPDDENUMCALLBACK32A,LPVOID);
HRESULT WINAPI DirectDrawEnumerate32W(LPDDENUMCALLBACK32W,LPVOID); HRESULT WINAPI DirectDrawEnumerate32W(LPDDENUMCALLBACK32W,LPVOID);
HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,LPUNKNOWN);
#define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate) #define DirectDrawEnumerate WINELIB_NAME_AW(DirectDrawEnumerate)
#endif #endif
relay32/ddraw.spec
View file @ 581a8edd
...@@ -7,7 +7,7 @@ type win32 ...@@ -7,7 +7,7 @@ type win32
4 stub DDInternalUnlock 4 stub DDInternalUnlock
5 stdcall DSoundHelp(long long long) DSoundHelp 5 stdcall DSoundHelp(long long long) DSoundHelp
6 stdcall DirectDrawCreate(ptr ptr ptr) DirectDrawCreate 6 stdcall DirectDrawCreate(ptr ptr ptr) DirectDrawCreate
7 stub DirectDrawCreateClipper 7 stdcall DirectDrawCreateClipper(long ptr ptr) DirectDrawCreateClipper
8 stdcall DirectDrawEnumerateA(ptr ptr) DirectDrawEnumerate32A 8 stdcall DirectDrawEnumerateA(ptr ptr) DirectDrawEnumerate32A
9 stub DirectDrawEnumerateW 9 stub DirectDrawEnumerateW
10 stub DllCanUnloadNow 10 stub DllCanUnloadNow
......
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