[ros-diffs] [fireball] 48382: - Merge 44999:48380 of psdk/wingdi.h

Author: fireball
Date: Sat Jul 31 12:20:50 2010
New Revision: 48382

URL: http://svn.reactos.org/svn/reactos?rev=48382&view=rev
Log:
- Merge 44999:48380 of psdk/wingdi.h

Modified:
    branches/arwinss/reactos/include/psdk/wingdi.h   (contents, props changed)

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] Sat Jul 31 12:20:50 2010
@@ -69,7 +69,7 @@
 #define DI_MASK	1
 #define DI_NORMAL	3
 #define DI_APPBANDING 1
-#define DI_NOMIRROR             0x0010
+#define DI_NOMIRROR	16
 #define EMR_HEADER	1
 #define EMR_POLYBEZIER 2
 #define EMR_POLYGON	3
@@ -185,15 +185,15 @@
 #define EMR_SETICMPROFILEW 113
 #define EMR_ALPHABLEND 114
 #define EMR_ALPHADIBBLEND 115
-#define EMR_SETLAYOUT	115
+#define EMR_SETLAYOUT 115
 #define EMR_TRANSPARENTBLT 116
 #define EMR_TRANSPARENTDIB 117
-#define EMR_RESERVED_117	117
+#define EMR_RESERVED_117 117
 #define EMR_GRADIENTFILL 118
-#define EMR_SETLINKEDUFI 119
+#define EMR_SETLINKEDUFIS 119
 #define EMR_SETTEXTJUSTIFICATION 120
 #define EMR_COLORMATCHTOTARGETW 121
-#define EMR_CREATECOLORSPACEW	122
+#define EMR_CREATECOLORSPACEW 122
 
 #define EMR_MIN 1
 #define EMR_MAX 122
@@ -273,16 +273,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 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
@@ -429,8 +429,8 @@
 #define PROOF_QUALITY	2
 #define NONANTIALIASED_QUALITY 3
 #define ANTIALIASED_QUALITY 4
-#define CLEARTYPE_QUALITY          5
-#define CLEARTYPE_NATURAL_QUALITY  6
+#define CLEARTYPE_QUALITY 5
+#define CLEARTYPE_NATURAL_QUALITY 6
 #define DEFAULT_PITCH	0
 #define FIXED_PITCH	1
 #define VARIABLE_PITCH	2
@@ -1065,7 +1065,7 @@
 #define BS_DIBPATTERNPT	6
 #define BS_PATTERN8X8	7
 #define BS_DIBPATTERN8X8	8
-#define BS_MONOPATTERN  9
+#define BS_MONOPATTERN	9
 #define LCS_CALIBRATED_RGB	0
 #define LCS_DEVICE_RGB	1
 #define LCS_DEVICE_CMYK	2
@@ -1715,7 +1715,7 @@
 typedef struct tagEMRCREATEBRUSHINDIRECT {
 	EMR emr;
 	DWORD ihBrush;
-	LOGBRUSH lb;
+	LOGBRUSH32 lb;
 } EMRCREATEBRUSHINDIRECT,*PEMRCREATEBRUSHINDIRECT;
 typedef LONG LCSCSTYPE;
 typedef LONG LCSGAMUTMATCH;
@@ -1897,11 +1897,11 @@
 	EXTLOGFONTW elfw;
 } EMREXTCREATEFONTINDIRECTW,*PEMREXTCREATEFONTINDIRECTW;
 typedef struct tagEXTLOGPEN {
-	UINT elpPenStyle;
-	UINT elpWidth;
+	DWORD elpPenStyle;
+	DWORD elpWidth;
 	UINT elpBrushStyle;
 	COLORREF elpColor;
-	LONG elpHatch;
+	ULONG_PTR elpHatch;
 	DWORD elpNumEntries;
 	DWORD elpStyleEntry[1];
 } EXTLOGPEN,*PEXTLOGPEN,*LPEXTLOGPEN,*NPEXTLOGPEN;
@@ -2212,24 +2212,24 @@
 	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;
+	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;
@@ -2900,7 +2900,7 @@
 HENHMETAFILE WINAPI CopyEnhMetaFileW(HENHMETAFILE,LPCWSTR);
 HMETAFILE WINAPI CopyMetaFileA(HMETAFILE,LPCSTR);
 HMETAFILE WINAPI CopyMetaFileW(HMETAFILE,LPCWSTR);
-HBITMAP WINAPI CreateBitmap(int,int,UINT,UINT,PCVOID);
+HBITMAP WINAPI CreateBitmap(int,int,UINT,UINT,CONST VOID*);
 HBITMAP WINAPI CreateBitmapIndirect(const BITMAP*);
 HBRUSH WINAPI CreateBrushIndirect(const LOGBRUSH*);
 HCOLORSPACE WINAPI CreateColorSpaceA(LPLOGCOLORSPACEA);
@@ -2909,9 +2909,9 @@
 HDC WINAPI CreateCompatibleDC(HDC);
 HDC WINAPI CreateDCA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*);
 HDC WINAPI CreateDCW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
-HBITMAP WINAPI CreateDIBitmap(HDC,const BITMAPINFOHEADER*,DWORD,PCVOID,const
BITMAPINFO*,UINT);
+HBITMAP WINAPI CreateDIBitmap(HDC,CONST BITMAPINFOHEADER*,DWORD,CONST VOID*,CONST
BITMAPINFO*,UINT);
 HBRUSH WINAPI CreateDIBPatternBrush(HGLOBAL,UINT);
-HBRUSH WINAPI CreateDIBPatternBrushPt(PCVOID,UINT);
+HBRUSH WINAPI CreateDIBPatternBrushPt(CONST VOID*,UINT);
 HBITMAP WINAPI CreateDIBSection(HDC,const BITMAPINFO*,UINT,PVOID*,HANDLE,DWORD);
 HBITMAP WINAPI CreateDiscardableBitmap(HDC,int,int);
 HRGN WINAPI CreateEllipticRgn(int,int,int,int);
@@ -3050,7 +3050,9 @@
 UINT WINAPI GetEnhMetaFilePixelFormat(HENHMETAFILE,UINT,PIXELFORMATDESCRIPTOR*);
 DWORD WINAPI GetFontData(HDC,DWORD,DWORD,PVOID,DWORD);
 DWORD WINAPI GetFontLanguageInfo(HDC);
+#if (_WIN32_WINNT >= 0x0500)
 DWORD WINAPI GetFontUnicodeRanges(HDC,LPGLYPHSET);
+#endif
 DWORD WINAPI GetGlyphIndicesA(HDC,LPCSTR,INT,LPWORD,DWORD);
 DWORD WINAPI GetGlyphIndicesW(HDC,LPCWSTR,INT,LPWORD,DWORD);
 DWORD WINAPI GetGlyphOutlineA(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*);
@@ -3091,8 +3093,8 @@
 UINT WINAPI GetSystemPaletteUse(HDC);
 UINT WINAPI GetTextAlign(HDC);
 int WINAPI GetTextCharacterExtra(HDC);
-UINT WINAPI GetTextCharset(HDC);
-UINT WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD);
+int WINAPI GetTextCharset(HDC);
+int 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 );
@@ -3133,11 +3135,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*,DWORD);
+BOOL WINAPI PolyDraw(HDC,const POINT*,const BYTE*,int);
 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*,DWORD);
+BOOL WINAPI PolyPolygon(HDC,const POINT*,const INT*,int);
 BOOL WINAPI PolyPolyline(HDC,const POINT*,const DWORD*,DWORD);
 BOOL WINAPI PolyTextOutA(HDC,const POLYTEXTA*,int);
 BOOL WINAPI PolyTextOutW(HDC,const POLYTEXTW*,int);
@@ -3168,7 +3170,7 @@
 HPALETTE WINAPI SelectPalette(HDC,HPALETTE,BOOL);
 int WINAPI SetAbortProc(HDC,ABORTPROC);
 int WINAPI SetArcDirection(HDC,int);
-LONG WINAPI SetBitmapBits(HBITMAP,LONG,PCVOID);
+LONG WINAPI SetBitmapBits(HBITMAP,DWORD,CONST VOID*);
 BOOL WINAPI SetBitmapDimensionEx(HBITMAP,int,int,LPSIZE);
 COLORREF WINAPI SetBkColor(HDC,COLORREF);
 int WINAPI SetBkMode(HDC,int);
@@ -3182,8 +3184,8 @@
 #endif
 BOOL WINAPI SetDeviceGammaRamp(HDC,PVOID);
 UINT WINAPI SetDIBColorTable(HDC,UINT,UINT,const RGBQUAD*);
-int WINAPI SetDIBits(HDC,HBITMAP,UINT,UINT,PCVOID,const BITMAPINFO*,UINT);
-int WINAPI SetDIBitsToDevice(HDC,int,int,DWORD,DWORD,int,int,UINT,UINT,PCVOID,const
BITMAPINFO*,UINT);
+int WINAPI SetDIBits(HDC,HBITMAP,UINT,UINT,CONST VOID*,CONST BITMAPINFO*,UINT);
+int WINAPI SetDIBitsToDevice(HDC,int,int,DWORD,DWORD,int,int,UINT,UINT,CONST VOID*,CONST
BITMAPINFO*,UINT);
 HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT,const BYTE*);
 int WINAPI SetGraphicsMode(HDC,int);
 int WINAPI SetICMMode(HDC,int);

Propchange: branches/arwinss/reactos/include/psdk/wingdi.h
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Jul 31 12:20:50 2010
@@ -1,0 +1,2 @@
+/branches/ros-amd64-bringup/reactos/include/psdk/wingdi.h:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454
+/trunk/reactos/include/psdk/wingdi.h:42000-48381