From 815d320795f5d65c48980cef483c676c3d3fcee7 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sat, 26 Dec 1998 11:57:38 +0000 Subject: [PATCH] Fixed the prototype of CreateDIBPatternBrushPt --- include/wingdi.h | 11 ++++++++++- objects/brush.c | 3 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index a9d5be7e142..9a04d1965ca 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1943,14 +1943,20 @@ typedef struct _RGNDATA { char Buffer[1]; } RGNDATA,*PRGNDATA,*LPRGNDATA; +typedef BOOL16 (CALLBACK* ABORTPROC16)(HDC16, INT16); +typedef BOOL32 (CALLBACK* ABORTPROC32)(HDC32, INT32); +DECL_WINELIB_TYPE(ABORTPROC) + #pragma pack(4) /* Declarations for functions that exist only in Win32 */ BOOL32 WINAPI AngleArc32(HDC32, INT32, INT32, DWORD, FLOAT, FLOAT); +#define AngleArc WINELIB_NAME(AngleArc) BOOL32 WINAPI ArcTo32(HDC32, INT32, INT32, INT32, INT32, INT32, INT32, INT32, INT32); HENHMETAFILE32 WINAPI CloseEnhMetaFile32(HDC32); -HBRUSH32 WINAPI CreateDIBPatternBrushPt(BITMAPINFO*,UINT32); +#define CloseEnhMetaFile WINELIB_NAME(CloseEnhMetaFile) +HBRUSH32 WINAPI CreateDIBPatternBrushPt(const void*,UINT32); HDC32 WINAPI CreateEnhMetaFile32A(HDC32,LPCSTR,const RECT32*,LPCSTR); HDC32 WINAPI CreateEnhMetaFile32W(HDC32,LPCWSTR,const RECT32*,LPCWSTR); #define CreateEnhMetaFile WINELIB_NAME_AW(CreateEnhMetaFile) @@ -1960,6 +1966,7 @@ BOOL16 WINAPI FastWindowFrame(HDC16,const RECT16*,INT16,INT16,DWORD); UINT16 WINAPI GDIRealizePalette(HDC16); HPALETTE16 WINAPI GDISelectPalette(HDC16,HPALETTE16,WORD); BOOL32 WINAPI GdiComment32(HDC32,UINT32,const BYTE *); +#define GdiComment WINELIB_NAME(GdiComment) DWORD WINAPI GetBitmapDimension(HBITMAP16); DWORD WINAPI GetBrushOrg(HDC16); BOOL32 WINAPI GetCharABCWidthsFloat32A(HDC32,UINT32,UINT32,LPABCFLOAT); @@ -1969,6 +1976,7 @@ BOOL32 WINAPI GetCharWidthFloat32A(HDC32,UINT32,UINT32,PFLOAT); BOOL32 WINAPI GetCharWidthFloat32W(HDC32,UINT32,UINT32,PFLOAT); #define GetCharWidthFloat WINELIB_NAME_AW(GetCharWidthFloat) BOOL32 WINAPI GetColorAdjustment32(HDC32, LPCOLORADJUSTMENT); +#define GetColorAdjustment WINELIB_NAME(GetColorAdjustment) HFONT16 WINAPI GetCurLogFont(HDC16); DWORD WINAPI GetCurrentPosition(HDC16); DWORD WINAPI GetDCHook(HDC16,FARPROC16*); @@ -2614,6 +2622,7 @@ COLORREF WINAPI SetPixel16(HDC16,INT16,INT16,COLORREF); COLORREF WINAPI SetPixel32(HDC32,INT32,INT32,COLORREF); #define SetPixel WINELIB_NAME(SetPixel) BOOL32 WINAPI SetPixelV32(HDC32,INT32,INT32,COLORREF); +#define SetPixelV WINELIB_NAME(SetPixelV) BOOL32 WINAPI SetPixelFormat(HDC32,int,const PIXELFORMATDESCRIPTOR*); INT16 WINAPI SetPolyFillMode16(HDC16,INT16); INT32 WINAPI SetPolyFillMode32(HDC32,INT32); diff --git a/objects/brush.c b/objects/brush.c index b468f6dcd49..c46ef4e0356 100644 --- a/objects/brush.c +++ b/objects/brush.c @@ -194,10 +194,11 @@ HBRUSH32 WINAPI CreateDIBPatternBrush32( * */ HBRUSH32 WINAPI CreateDIBPatternBrushPt( - BITMAPINFO *info, /* Pointer to a BITMAPINFO structure */ + const void* data, /* Pointer to a BITMAPINFO structure followed by more data */ UINT32 coloruse /* Specifies color format, if provided */ ) { + BITMAPINFO *info=(BITMAPINFO*)data; LOGBRUSH32 logbrush = { BS_DIBPATTERN, coloruse, 0 }; BITMAPINFO *newInfo; INT32 size;