[fireball] 42010: - Update wingdi.h with new stuff from Wine.

Author: fireball
Date: Fri Jul 17 20:23:48 2009
New Revision: 42010

URL: http://svn.reactos.org/svn/reactos?rev=42010&view=rev
Log:
- Update wingdi.h with new stuff from Wine.

Modified:
    branches/arwinss/reactos/include/psdk/wingdi.h

Modified: branches/arwinss/reactos/include/psdk/wingdi.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi…
==============================================================================
--- branches/arwinss/reactos/include/psdk/wingdi.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/psdk/wingdi.h [iso-8859-1] Fri Jul 17 20:23:48 2009
@@ -190,6 +190,11 @@
 #define EMR_SETLINKEDUFIS 119
 #define EMR_SETTEXTJUSTIFICATION 120
 #define EMR_COLORMATCHTOTARGETW 121
+#define EMR_CREATECOLORSPACEW	122
+
+#define EMR_MIN 1
+#define EMR_MAX 122
+
 #endif
 #define ENHMETA_SIGNATURE 1179469088
 #define EPS_SIGNATURE 0x46535045
@@ -265,6 +270,16 @@
 #define META_CREATEFONTINDIRECT	0x2FB
 #define META_CREATEBRUSHINDIRECT	0x2FC
 #define META_CREATEREGION	0x6FF
+#define META_DRAWTEXT                0x062F
+#define META_RESETDC                 0x014C
+#define META_STARTDOC                0x014D
+#define META_STARTPAGE               0x004F
+#define META_ENDPAGE                 0x0050
+#define META_ABORTDOC                0x0052
+#define META_ENDDOC                  0x005E
+#define META_CREATEBRUSH             0x00F8
+#define META_CREATEBITMAPINDIRECT    0x02FD
+#define META_CREATEBITMAP            0x06FE
 #define PT_MOVETO	6
 #define PT_LINETO	2
 #define PT_BEZIERTO	4
@@ -379,6 +394,17 @@
 #define JOHAB_CHARSET	130
 #define VIETNAMESE_CHARSET	163
 #define MAC_CHARSET 77
+/* I don't know if the values of *_CHARSET macros are defined in Windows
+ * or if we can choose them as we want. -- srtxg
+ */
+#define VISCII_CHARSET        (BYTE)240 /* viscii1.1-1 */
+#define TCVN_CHARSET          (BYTE)241 /* tcvn-0 */
+#define KOI8_CHARSET          (BYTE)242 /* koi8-{r,u,ru} */
+#define ISO3_CHARSET          (BYTE)243 /* iso8859-3 */
+#define ISO4_CHARSET          (BYTE)244 /* iso8859-4 */
+#define ISO10_CHARSET         (BYTE)245 /* iso8859-10 */
+#define CELTIC_CHARSET        (BYTE)246 /* iso8859-14 */
+
 #define OUT_DEFAULT_PRECIS	0
 #define OUT_STRING_PRECIS	1
 #define OUT_CHARACTER_PRECIS	2
@@ -562,6 +588,7 @@
 #define PS_TYPE_MASK	983040
 #define ALTERNATE	1
 #define WINDING	2
+#define POLYFILL_LAST	2
 #define DC_BINNAMES	12
 #define DC_BINS	6
 #define DC_COPIES	18
@@ -601,6 +628,7 @@
 #define DCBA_FACEDOWNRIGHT	259
 #define FLOODFILLBORDER 0
 #define FLOODFILLSURFACE 1
+#define ETO_GRAYED            0x00001
 #define ETO_OPAQUE            0x00002
 #define ETO_CLIPPED           0x00004
 #if (WINVER >= 0x0400)
@@ -813,6 +841,7 @@
 #define GGO_UNHINTED 256
 #define GM_COMPATIBLE 1
 #define GM_ADVANCED 2
+#define GM_LAST     2
 #define MM_ANISOTROPIC 8
 #define MM_HIENGLISH 5
 #define MM_HIMETRIC 3
@@ -889,6 +918,7 @@
 #define MWT_MAX MWT_RIGHTMULTIPLY
 #define OPAQUE 2
 #define TRANSPARENT 1
+#define BKMODE_LAST  2
 #define BLACKONWHITE 1
 #define WHITEONBLACK 2
 #define COLORONCOLOR 3
@@ -1015,6 +1045,7 @@
 #define BS_DIBPATTERNPT	6
 #define BS_PATTERN8X8	7
 #define BS_DIBPATTERN8X8	8
+#define BS_MONOPATTERN  9
 #define LCS_CALIBRATED_RGB	0
 #define LCS_DEVICE_RGB	1
 #define LCS_DEVICE_CMYK	2
@@ -2151,6 +2182,26 @@
 	LONG cxSrc;
 	LONG cySrc;
 } EMRSTRETCHBLT,*PEMRSTRETCHBLT;
+typedef struct tagEMRALPHABLEND {
+    EMR      emr;
+    RECTL    rclBounds;
+    LONG     xDest;
+    LONG     yDest;
+    LONG     cxDest;
+    LONG     cyDest;
+    DWORD    dwRop;
+    LONG     xSrc;
+    LONG     ySrc;
+    XFORM    xformSrc;
+    COLORREF crBkColorSrc;
+    DWORD    iUsageSrc;
+    DWORD    offBmiSrc;
+    DWORD    cbBmiSrc;
+    DWORD    offBitsSrc;
+    DWORD    cbBitsSrc;
+    LONG     cxSrc;
+    LONG     cySrc;
+} EMRALPHABLEND, *PEMRALPHABLEND;
 typedef struct tagEMRSTRETCHDIBITS {
 	EMR emr;
 	RECTL rclBounds;
@@ -2904,11 +2955,14 @@
 BOOL WINAPI FixBrushOrgEx(HDC,int,int,LPPOINT);
 BOOL WINAPI FlattenPath(HDC);
 BOOL WINAPI FloodFill(HDC,int,int,COLORREF);
+BOOL WINAPI FrameRgn(HDC,HRGN,HBRUSH,INT,INT);
 BOOL WINAPI GdiAlphaBlend(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
 BOOL WINAPI GdiComment(HDC,UINT,const BYTE*);
+DEVMODEW * WINAPI GdiConvertToDevmodeW(const DEVMODEA *);
 BOOL WINAPI GdiFlush(void);
 DWORD WINAPI GdiGetBatchLimit(void);
 DWORD WINAPI GdiSetBatchLimit(DWORD);
+BOOL WINAPI GdiIsMetaFileDC(HDC);
 #define GetCValue(cmyk) ((BYTE)(cmyk))
 #define GetMValue(cmyk) ((BYTE)((cmyk)>> 8))
 #define GetYValue(cmyk) ((BYTE)((cmyk)>>16))
@@ -3004,8 +3058,8 @@
 UINT WINAPI GetSystemPaletteUse(HDC);
 UINT WINAPI GetTextAlign(HDC);
 int WINAPI GetTextCharacterExtra(HDC);
-int WINAPI GetTextCharset(HDC);
-int WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD);
+UINT WINAPI GetTextCharset(HDC);
+UINT WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD);
 COLORREF WINAPI GetTextColor(HDC);
 BOOL WINAPI GetTextExtentExPointA(HDC,LPCSTR,int,int,LPINT,LPINT,LPSIZE);
 BOOL WINAPI GetTextExtentExPointW( HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE );
@@ -3046,11 +3100,11 @@
 BOOL WINAPI PlgBlt(HDC,const POINT*,HDC,int,int,int,int,HBITMAP,int,int);
 BOOL WINAPI PolyBezier(HDC,const POINT*,DWORD);
 BOOL WINAPI PolyBezierTo(HDC,const POINT*,DWORD);
-BOOL WINAPI PolyDraw(HDC,const POINT*,const BYTE*,int);
+BOOL WINAPI PolyDraw(HDC,const POINT*,const BYTE*,DWORD);
 BOOL WINAPI Polygon(HDC,const POINT*,int);
 BOOL WINAPI Polyline(HDC,const POINT*,int);
 BOOL WINAPI PolylineTo(HDC,const POINT*,DWORD);
-BOOL WINAPI PolyPolygon(HDC,const POINT*,const INT*,int);
+BOOL WINAPI PolyPolygon(HDC,const POINT*,const INT*,DWORD);
 BOOL WINAPI PolyPolyline(HDC,const POINT*,const DWORD*,DWORD);
 BOOL WINAPI PolyTextOutA(HDC,const POLYTEXTA*,int);
 BOOL WINAPI PolyTextOutW(HDC,const POLYTEXTW*,int);
@@ -3081,7 +3135,7 @@
 HPALETTE WINAPI SelectPalette(HDC,HPALETTE,BOOL);
 int WINAPI SetAbortProc(HDC,ABORTPROC);
 int WINAPI SetArcDirection(HDC,int);
-LONG WINAPI SetBitmapBits(HBITMAP,DWORD,PCVOID);
+LONG WINAPI SetBitmapBits(HBITMAP,LONG,PCVOID);
 BOOL WINAPI SetBitmapDimensionEx(HBITMAP,int,int,LPSIZE);
 COLORREF WINAPI SetBkColor(HDC,COLORREF);
 int WINAPI SetBkMode(HDC,int);
@@ -3117,6 +3171,7 @@
 BOOL WINAPI SetPixelV(HDC,int,int,COLORREF);
 int WINAPI SetPolyFillMode(HDC,int);
 BOOL WINAPI SetRectRgn(HRGN,int,int,int,int);
+INT WINAPI SetRelAbs(HDC,INT);
 int WINAPI SetROP2(HDC,int);
 int WINAPI SetStretchBltMode(HDC,int);
 UINT WINAPI SetSystemPaletteUse(HDC,UINT);
@@ -3336,6 +3391,22 @@
 #endif
 #endif
 
+#ifdef __WINESRC__
+/* the DC hook support is only exported on Win16, the 32-bit version is a Wine extension
*/
+
+#define DCHC_INVALIDVISRGN      0x0001
+#define DCHC_DELETEDC           0x0002
+#define DCHF_INVALIDATEVISRGN   0x0001
+#define DCHF_VALIDATEVISRGN     0x0002
+
+typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM);
+
+WINGDIAPI DWORD_PTR WINAPI GetDCHook(HDC,DCHOOKPROC*);
+WINGDIAPI BOOL      WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD_PTR);
+WINGDIAPI WORD      WINAPI SetHookFlags(HDC,WORD);
+WINGDIAPI INT       WINAPI SelectVisRgn(HDC,HRGN);
+#endif /* __WINESRC__ */
+
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif