* include/wingdi.h [WINVER >= 0x0500] (DC_*): Define.

	(GGO_UNHINTED): Define.
	(DMPAPER_*): Define. Paper size newly added to the documentation.
	(DMPAPER_LAST): Value depends on DMPAPER_* variables actually defined.
	(DM_*): Cleanup.
	(DM_PANNINGWIDTH,DM_PANNINGHEIGHT,DM_DISPLAYFIXEDOUTPUT): Define.
	(DMDO_*,DMDFO_*): Define.
	(GetDCBrushColor,GetDCPenColor): Declare.
	* lib/msimg32.def (GetDCBrushColor,GetDCPenColor): Add stubs.

1 files changed, 113 insertions, 24 deletions

diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h
index c791cd7ca..e47ad9710 100644
--- a/winsup/w32api/include/wingdi.h
+++ b/winsup/w32api/include/wingdi.h
@@ -559,6 +559,21 @@ extern "C" {
 #define DC_DATATYPE_PRODUCED	21
 #define DC_MANUFACTURER	23
 #define DC_MODEL	24
+#if (WINVER >= 0x0500)
+#define DC_PERSONALITY	25
+#define DC_PRINTRATE	26
+#define DC_PRINTRATEUNIT	27
+#define DC_PRINTERMEM	28
+#define DC_MEDIAREADY	29
+#define DC_STAPLE	30
+#define DC_PRINTRATEPPM	31
+#define DC_COLORDEVICE	32
+#define DC_NUP	33
+#endif
+#if (WINVER >= 0x0501)
+#define DC_MEDIATYPENAMES	34
+#define DC_MEDIATYPES	35
+#endif
 #define DCBA_FACEUPNONE	0
 #define DCBA_FACEUPCENTER	1
 #define DCBA_FACEUPLEFT	2
@@ -784,7 +799,9 @@ extern "C" {
 #define GGO_GRAY4_BITMAP 5
 #define GGO_GRAY8_BITMAP 6
 #define GGO_GLYPH_INDEX 128
+#if (WINVER >= 0x0500)
 #define GGO_UNHINTED 256
+#endif
 #define GM_COMPATIBLE 1
 #define GM_ADVANCED 2
 #define MM_ANISOTROPIC 8
@@ -1045,7 +1062,61 @@ extern "C" {
 #define DMPAPER_A2	66
 #define DMPAPER_A3_TRANSVERSE	67
 #define DMPAPER_A3_EXTRA_TRANSVERSE	68
+#if (WINVER >= 0x0500)
+#define DMPAPER_DBL_JAPANESE_POSTCARD	69
+#define DMPAPER_A6	70
+#define DMPAPER_JENV_KAKU2	71
+#define DMPAPER_JENV_KAKU3	72
+#define DMPAPER_JENV_CHOU3	73
+#define DMPAPER_JENV_CHOU4	74
+#define DMPAPER_LETTER_ROTATED	75
+#define DMPAPER_A3_ROTATED	76
+#define DMPAPER_A4_ROTATED	77
+#define DMPAPER_A5_ROTATED	78
+#define DMPAPER_B4_JIS_ROTATED	79
+#define DMPAPER_B5_JIS_ROTATED	80
+#define DMPAPER_JAPANESE_POSTCARD_ROTATED	81
+#define DMPAPER_DBL_JAPANESE_POSTCARD_ROTATED	82
+#define DMPAPER_A6_ROTATED	83
+#define DMPAPER_JENV_KAKU2_ROTATED	84
+#define DMPAPER_JENV_KAKU3_ROTATED	85
+#define DMPAPER_JENV_CHOU3_ROTATED	86
+#define DMPAPER_JENV_CHOU4_ROTATED	87
+#define DMPAPER_B6_JIS	88
+#define DMPAPER_B6_JIS_ROTATED	89
+#define DMPAPER_12X11	90
+#define DMPAPER_JENV_YOU4	91
+#define DMPAPER_JENV_YOU4_ROTATED	92
+#define DMPAPER_P16K	93
+#define DMPAPER_P32K	94
+#define DMPAPER_P32KBIG	95
+#define DMPAPER_PENV_1	96
+#define DMPAPER_PENV_2	97
+#define DMPAPER_PENV_3	98
+#define DMPAPER_PENV_4	99
+#define DMPAPER_PENV_5	100
+#define DMPAPER_PENV_6	101
+#define DMPAPER_PENV_7	102
+#define DMPAPER_PENV_8	103
+#define DMPAPER_PENV_9	104
+#define DMPAPER_PENV_10	105
+#define DMPAPER_P16K_ROTATED	106
+#define DMPAPER_P32K_ROTATED	107
+#define DMPAPER_P32KBIG_ROTATED	108
+#define DMPAPER_PENV_1_ROTATED	109
+#define DMPAPER_PENV_2_ROTATED	110
+#define DMPAPER_PENV_3_ROTATED	111
+#define DMPAPER_PENV_4_ROTATED	112
+#define DMPAPER_PENV_5_ROTATED	113
+#define DMPAPER_PENV_6_ROTATED	114
+#define DMPAPER_PENV_7_ROTATED	115
+#define DMPAPER_PENV_8_ROTATED	116
+#define DMPAPER_PENV_9_ROTATED	117
+#define DMPAPER_PENV_10_ROTATED	118
+#define DMPAPER_LAST	118
+#else
 #define DMPAPER_LAST	68
+#endif
 #define DMPAPER_USER	256
 #define DMBIN_FIRST	1
 #define DMBIN_UPPER	1
@@ -1090,30 +1161,44 @@ extern "C" {
 #define DM_IN_PROMPT	DM_PROMPT
 #define DM_OUT_BUFFER	DM_COPY
 #define DM_OUT_DEFAULT	DM_UPDATE
-#define DM_ORIENTATION 1
-#define DM_PAPERSIZE 2
-#define DM_PAPERLENGTH 4
-#define DM_PAPERWIDTH 8
-#define DM_SCALE 16
-#define DM_COPIES 256
-#define DM_DEFAULTSOURCE 512
-#define DM_PRINTQUALITY 1024
-#define DM_COLOR 2048
-#define DM_DUPLEX 4096
-#define DM_YRESOLUTION 8192
-#define DM_TTOPTION 16384
-#define DM_COLLATE 32768
-#define DM_FORMNAME 65536
-#define DM_LOGPIXELS 0x20000
-#define DM_BITSPERPEL 0x40000
-#define DM_PELSWIDTH 0x80000
-#define DM_PELSHEIGHT 0x100000
-#define DM_DISPLAYFLAGS 0x200000
-#define DM_DISPLAYFREQUENCY 0x400000
-#define DM_ICMMETHOD 0x800000
-#define DM_ICMINTENT 0x1000000
-#define DM_MEDIATYPE 0x2000000
-#define DM_DITHERTYPE 0x4000000
+#define DM_ORIENTATION 0x00000001
+#define DM_PAPERSIZE 0x00000002
+#define DM_PAPERLENGTH 0x00000004
+#define DM_PAPERWIDTH 0x00000008
+#define DM_SCALE 0x00000010
+#define DM_COPIES 0x00000100
+#define DM_DEFAULTSOURCE 0x00000200
+#define DM_PRINTQUALITY 0x00000400
+#define DM_COLOR 0x00000800
+#define DM_DUPLEX 0x00001000
+#define DM_YRESOLUTION 0x00002000
+#define DM_TTOPTION 0x00004000
+#define DM_COLLATE 0x00008000
+#define DM_FORMNAME 0x00010000
+#define DM_LOGPIXELS 0x00020000
+#define DM_BITSPERPEL 0x00040000
+#define DM_PELSWIDTH 0x00080000
+#define DM_PELSHEIGHT 0x00100000
+#define DM_DISPLAYFLAGS 0x00200000
+#define DM_DISPLAYFREQUENCY 0x00400000
+#define DM_ICMMETHOD 0x00800000
+#define DM_ICMINTENT 0x01000000
+#define DM_MEDIATYPE 0x02000000
+#define DM_DITHERTYPE 0x04000000
+#if(WINVER >= 0x0500)
+#define DM_PANNINGWIDTH 0x08000000
+#define DM_PANNINGHEIGHT 0x10000000
+#endif
+#if(WINVER >= 0x0501)
+#define DM_DISPLAYFIXEDOUTPUT 0x20000000
+#define DMDO_DEFAULT 0x00000000
+#define DMDO_90 0x00000001
+#define DMDO_180 0x00000002
+#define DMDO_270 0x00000003
+#define DMDFO_DEFAULT 0x00000000
+#define DMDFO_STRETCH 0x00000001
+#define DMDFO_CENTER 0x00000002
+#endif
 #define DMICMMETHOD_NONE	1
 #define DMICMMETHOD_SYSTEM	2
 #define DMICMMETHOD_DRIVER	3
@@ -2730,6 +2815,10 @@ WINGDIAPI HANDLE WINAPI GetColorSpace(HDC);
 WINGDIAPI HGDIOBJ WINAPI GetCurrentObject(HDC,UINT);
 WINGDIAPI BOOL WINAPI GetCurrentPositionEx(HDC,LPPOINT);
 WINGDIAPI HCURSOR WINAPI GetCursor(void);
+#if (WINVER >= 0x0500)
+WINGDIAPI COLORREF WINAPI GetDCBrushColor(HDC);
+WINGDIAPI COLORREF WINAPI GetDCPenColor(HDC);
+#endif
 WINGDIAPI BOOL WINAPI GetDCOrgEx(HDC,LPPOINT);
 WINGDIAPI int WINAPI GetDeviceCaps(HDC,int);
 WINGDIAPI BOOL WINAPI GetDeviceGammaRamp(HDC,PVOID);