Lots of new defines and stubs.
diff --git a/include/wingdi.h b/include/wingdi.h
index 14595af..68216c09b 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -5,6 +5,12 @@
#pragma pack(1)
+typedef struct _ABCFLOAT {
+ FLOAT abcfA;
+ FLOAT abcfB;
+ FLOAT abcfC;
+} ABCFLOAT, *PABCFLOAT, *LPABCFLOAT;
+
typedef struct
{
WORD wFirst;
@@ -75,6 +81,22 @@
DWORD dwDamageMask;
} PIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR;
+typedef struct tagCOLORADJUSTMENT
+{
+ WORD caSize;
+ WORD caFlags;
+ WORD caIlluminantIndex;
+ WORD caRedGamma;
+ WORD caGreenGamma;
+ WORD caBlueGamma;
+ WORD caReferenceBlack;
+ WORD caReferenceWhite;
+ SHORT caContrast;
+ SHORT caBrightness;
+ SHORT caColorfulness;
+ SHORT caRedGreenTint;
+} COLORADJUSTMENT, *PCOLORADJUSTMENT, *LPCOLORADJUSTMENT;
+
/* Raster operations */
#define R2_BLACK 1
@@ -1019,6 +1041,16 @@
DECL_WINELIB_TYPE(LOGPEN)
DECL_WINELIB_TYPE(LPLOGPEN)
+typedef struct tagEXTLOGPEN
+{
+ DWORD elpPenStyle;
+ DWORD elpWidth;
+ DWORD elpBrushStyle;
+ DWORD elpColor;
+ DWORD elpNumEntries;
+ DWORD elpStyleEntry[1];
+} EXTLOGPEN, *PEXTLOGPEN, *NPEXTLOGPEN, *LPEXTLOGPEN;
+
#define PS_SOLID 0x00000000
#define PS_DASH 0x00000001
#define PS_DOT 0x00000002
@@ -1895,12 +1927,30 @@
#pragma pack(4)
+/* Declarations for functions that exist only in Win32 */
+
+BOOL32 WINAPI AngleArc32(HDC32, INT32, INT32, DWORD, FLOAT, FLOAT);
+BOOL32 WINAPI ArcTo32(HDC32, INT32, INT32, INT32, INT32, INT32, INT32, INT32, INT32);
+HENHMETAFILE32 WINAPI CloseEnhMetaFile32(HDC32);
+HBRUSH32 WINAPI CreateDIBPatternBrushPt(BITMAPINFO*,UINT32);
+HDC32 WINAPI CreateEnhMetaFile32A(HDC32,LPCSTR,const RECT32*,LPCSTR);
+HDC32 WINAPI CreateEnhMetaFile32W(HDC32,LPCWSTR,const RECT32*,LPCWSTR);
+#define CreateEnhMetaFile WINELIB_NAME_AW(CreateEnhMetaFile)
+INT32 WINAPI DrawEscape32(HDC32,INT32,INT32,LPCSTR);
INT16 WINAPI ExcludeVisRect(HDC16,INT16,INT16,INT16,INT16);
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 *);
DWORD WINAPI GetBitmapDimension(HBITMAP16);
DWORD WINAPI GetBrushOrg(HDC16);
+BOOL32 WINAPI GetCharABCWidthsFloat32A(HDC32,UINT32,UINT32,LPABCFLOAT);
+BOOL32 WINAPI GetCharABCWidthsFloat32W(HDC32,UINT32,UINT32,LPABCFLOAT);
+#define GetCharABCWidthsFloat WINELIB_NAME_AW(GetCharABCWidthsFloat)
+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);
HFONT16 WINAPI GetCurLogFont(HDC16);
DWORD WINAPI GetCurrentPosition(HDC16);
DWORD WINAPI GetDCHook(HDC16,FARPROC16*);
@@ -1908,6 +1958,7 @@
HDC16 WINAPI GetDCState(HDC16);
INT16 WINAPI GetEnvironment(LPCSTR,LPDEVMODE16,UINT16);
HGLOBAL16 WINAPI GetMetaFileBits(HMETAFILE16);
+BOOL32 WINAPI GetMiterLimit(HDC32, PFLOAT);
DWORD WINAPI GetTextExtent(HDC16,LPCSTR,INT16);
DWORD WINAPI GetViewportExt(HDC16);
DWORD WINAPI GetViewportOrg(HDC16);
@@ -1918,10 +1969,13 @@
BOOL16 WINAPI IsDCCurrentPalette(HDC16);
BOOL16 WINAPI IsGDIObject(HGDIOBJ16);
BOOL16 WINAPI IsValidMetaFile(HMETAFILE16);
+BOOL32 WINAPI MaskBlt(HDC32,INT32,INT32,INT32,INT32,HDC32,INT32,INT32,HBITMAP32,INT32,INT32,DWORD);
DWORD WINAPI MoveTo(HDC16,INT16,INT16);
DWORD WINAPI OffsetViewportOrg(HDC16,INT16,INT16);
INT16 WINAPI OffsetVisRgn(HDC16,INT16,INT16);
DWORD WINAPI OffsetWindowOrg(HDC16,INT16,INT16);
+BOOL32 WINAPI PlgBlt(HDC32,const POINT32*,HDC32,INT32,INT32,INT32,INT32,HBITMAP32,INT32,INT32);
+BOOL32 WINAPI PolyDraw32(HDC32,const POINT32*,const BYTE*,DWORD);
UINT16 WINAPI RealizeDefaultPalette(HDC16);
INT16 WINAPI RestoreVisRgn(HDC16);
HRGN16 WINAPI SaveVisRgn(HDC16);
@@ -1930,12 +1984,14 @@
INT16 WINAPI SelectVisRgn(HDC16,HRGN16);
DWORD WINAPI SetBitmapDimension(HBITMAP16,INT16,INT16);
DWORD WINAPI SetBrushOrg(HDC16,INT16,INT16);
+BOOL32 WINAPI SetColorAdjustment32(HDC32,const COLORADJUSTMENT*);
BOOL16 WINAPI SetDCHook(HDC16,FARPROC16,DWORD);
DWORD WINAPI SetDCOrg(HDC16,INT16,INT16);
VOID WINAPI SetDCState(HDC16,HDC16);
INT16 WINAPI SetEnvironment(LPCSTR,LPDEVMODE16,UINT16);
WORD WINAPI SetHookFlags(HDC16,WORD);
HMETAFILE16 WINAPI SetMetaFileBits(HGLOBAL16);
+BOOL32 WINAPI SetMiterLimit(HDC32, FLOAT, PFLOAT);
DWORD WINAPI SetViewportExt(HDC16,INT16,INT16);
DWORD WINAPI SetViewportOrg(HDC16,INT16,INT16);
DWORD WINAPI SetWindowExt(HDC16,INT16,INT16);
@@ -2186,6 +2242,9 @@
BOOL16 WINAPI FillRgn16(HDC16,HRGN16,HBRUSH16);
BOOL32 WINAPI FillRgn32(HDC32,HRGN32,HBRUSH32);
#define FillRgn WINELIB_NAME(FillRgn)
+BOOL16 WINAPI FlattenPath16(HDC16);
+BOOL32 WINAPI FlattenPath32(HDC32);
+#define FlattenPath WINELIB_NAME(FlattenPath)
BOOL16 WINAPI FloodFill16(HDC16,INT16,INT16,COLORREF);
BOOL32 WINAPI FloodFill32(HDC32,INT32,INT32,COLORREF);
#define FloodFill WINELIB_NAME(FloodFill)
@@ -2433,6 +2492,7 @@
BOOL16 WINAPI Polyline16(HDC16,const POINT16*,INT16);
BOOL32 WINAPI Polyline32(HDC32,const POINT32*,INT32);
#define Polyline WINELIB_NAME(Polyline)
+BOOL32 WINAPI PolylineTo32(HDC32,const POINT32*,DWORD);
BOOL16 WINAPI PtInRegion16(HRGN16,INT16,INT16);
BOOL32 WINAPI PtInRegion32(HRGN32,INT32,INT32);
#define PtInRegion WINELIB_NAME(PtInRegion)
@@ -2600,6 +2660,12 @@
INT32 WINAPI StretchDIBits32(HDC32,INT32,INT32,INT32,INT32,INT32,INT32,
INT32,INT32,const VOID*,const BITMAPINFO*,UINT32,DWORD);
#define StretchDIBits WINELIB_NAME(StretchDIBits)
+BOOL16 WINAPI StrokeAndFillPath16(HDC16);
+BOOL32 WINAPI StrokeAndFillPath32(HDC32);
+#define StrokeAndFillPath WINELIB_NAME(StrokeAndFillPath)
+BOOL16 WINAPI StrokePath16(HDC16);
+BOOL32 WINAPI StrokePath32(HDC32);
+#define StrokePath WINELIB_NAME(StrokePath)
BOOL32 WINAPI SwapBuffers(HDC32);
BOOL16 WINAPI TextOut16(HDC16,INT16,INT16,LPCSTR,INT16);
BOOL32 WINAPI TextOut32A(HDC32,INT32,INT32,LPCSTR,INT32);
@@ -2611,5 +2677,8 @@
INT16 WINAPI UpdateColors16(HDC16);
BOOL32 WINAPI UpdateColors32(HDC32);
#define UpdateColors WINELIB_NAME(UpdateColors)
+BOOL16 WINAPI WidenPath16(HDC16);
+BOOL32 WINAPI WidenPath32(HDC32);
+#define WidenPath WINELIB_NAME(WidenPath)
#endif /* __WINE_WINGDI_H */
