include: Make "long" numeric constants LP64/LLP64 proof (wingdi.h).

include/wingdi.h

@@ -154,13 +154,13 @@ typedef LONG LCSGAMUTMATCH;
 #define LCS_sRGB                    0x73524742  /* 'sRGB' */
 #define LCS_WINDOWS_COLOR_SPACE     0x57696e20  /* 'Win ' */
 
-#define LCS_CALIBRATED_RGB    0x00000000L
-#define LCS_DEVICE_RGB        0x00000001L
-#define LCS_DEVICE_CMYK       0x00000002L
+#define LCS_CALIBRATED_RGB    __MSABI_LONG(0x00000000)
+#define LCS_DEVICE_RGB        __MSABI_LONG(0x00000001)
+#define LCS_DEVICE_CMYK       __MSABI_LONG(0x00000002)
 
-#define LCS_GM_BUSINESS       0x00000001L
-#define LCS_GM_GRAPHICS       0x00000002L
-#define LCS_GM_IMAGES         0x00000004L
+#define LCS_GM_BUSINESS       __MSABI_LONG(0x00000001)
+#define LCS_GM_GRAPHICS       __MSABI_LONG(0x00000002)
+#define LCS_GM_IMAGES         __MSABI_LONG(0x00000004)
 
 #define CM_OUT_OF_GAMUT       255
 #define CM_IN_GAMUT           0
@@ -246,10 +246,10 @@ DECL_WINELIB_TYPE_AW(LOGCOLORSPACE)
 #define DC_MEDIATYPENAMES       34
 #define DC_MEDIATYPES           35
 
-#define DCTT_BITMAP             0x00000001L
-#define DCTT_DOWNLOAD           0x00000002L
-#define DCTT_SUBDEV             0x00000004L
-#define DCTT_DOWNLOAD_OUTLINE   0x00000008L
+#define DCTT_BITMAP             __MSABI_LONG(0x00000001)
+#define DCTT_DOWNLOAD           __MSABI_LONG(0x00000002)
+#define DCTT_SUBDEV             __MSABI_LONG(0x00000004)
+#define DCTT_DOWNLOAD_OUTLINE   __MSABI_LONG(0x00000008)
 
 #define DCBA_FACEUPNONE         0x0000
 #define DCBA_FACEUPCENTER       0x0001
@@ -757,22 +757,22 @@ typedef struct tagXFORM
 #define ISO10_CHARSET         (BYTE)245 /* iso8859-10 */
 #define CELTIC_CHARSET        (BYTE)246 /* iso8859-14 */
 
-#define FS_LATIN1              0x00000001L
-#define FS_LATIN2              0x00000002L
-#define FS_CYRILLIC            0x00000004L
-#define FS_GREEK               0x00000008L
-#define FS_TURKISH             0x00000010L
-#define FS_HEBREW              0x00000020L
-#define FS_ARABIC              0x00000040L
-#define FS_BALTIC              0x00000080L
-#define FS_VIETNAMESE          0x00000100L
-#define FS_THAI                0x00010000L
-#define FS_JISJAPAN            0x00020000L
-#define FS_CHINESESIMP         0x00040000L
-#define FS_WANSUNG             0x00080000L
-#define FS_CHINESETRAD         0x00100000L
-#define FS_JOHAB               0x00200000L
-#define FS_SYMBOL              0x80000000L
+#define FS_LATIN1              __MSABI_LONG(0x00000001)
+#define FS_LATIN2              __MSABI_LONG(0x00000002)
+#define FS_CYRILLIC            __MSABI_LONG(0x00000004)
+#define FS_GREEK               __MSABI_LONG(0x00000008)
+#define FS_TURKISH             __MSABI_LONG(0x00000010)
+#define FS_HEBREW              __MSABI_LONG(0x00000020)
+#define FS_ARABIC              __MSABI_LONG(0x00000040)
+#define FS_BALTIC              __MSABI_LONG(0x00000080)
+#define FS_VIETNAMESE          __MSABI_LONG(0x00000100)
+#define FS_THAI                __MSABI_LONG(0x00010000)
+#define FS_JISJAPAN            __MSABI_LONG(0x00020000)
+#define FS_CHINESESIMP         __MSABI_LONG(0x00040000)
+#define FS_WANSUNG             __MSABI_LONG(0x00080000)
+#define FS_CHINESETRAD         __MSABI_LONG(0x00100000)
+#define FS_JOHAB               __MSABI_LONG(0x00200000)
+#define FS_SYMBOL              __MSABI_LONG(0x80000000)
 
   /* lfOutPrecision values */
 #define OUT_DEFAULT_PRECIS	0
@@ -1148,9 +1148,9 @@ DECL_WINELIB_TYPE_AW(LPPOLYTEXT)
 
 
 /* ntmFlags field flags */
-#define NTM_REGULAR     0x00000040L
-#define NTM_BOLD        0x00000020L
-#define NTM_ITALIC      0x00000001L
+#define NTM_REGULAR     __MSABI_LONG(0x00000040)
+#define NTM_BOLD        __MSABI_LONG(0x00000020)
+#define NTM_ITALIC      __MSABI_LONG(0x00000001)
 
 #define NTM_NONNEGATIVE_AC  0x00010000
 #define NTM_PS_OPENTYPE     0x00020000
@@ -1389,17 +1389,17 @@ typedef struct
 #define GCP_KASHIDA       0x0200
 #define GCP_ERROR         0x8000
 #define FLI_MASK          0x103b
-#define GCP_JUSTIFY         0x00010000L
-#define FLI_GLYPHS          0x00040000L
-#define GCP_CLASSIN         0x00080000L
-#define GCP_MAXEXTENT       0x00100000L
-#define GCP_JUSTIFYIN       0x00200000L
-#define GCP_DISPLAYZWG      0x00400000L
-#define GCP_SYMSWAPOFF      0x00800000L
-#define GCP_NUMERICOVERRIDE 0x01000000L
-#define GCP_NEUTRALOVERRIDE 0x02000000L
-#define GCP_NUMERICSLATIN   0x04000000L
-#define GCP_NUMERICSLOCAL   0x08000000L
+#define GCP_JUSTIFY         __MSABI_LONG(0x00010000)
+#define FLI_GLYPHS          __MSABI_LONG(0x00040000)
+#define GCP_CLASSIN         __MSABI_LONG(0x00080000)
+#define GCP_MAXEXTENT       __MSABI_LONG(0x00100000)
+#define GCP_JUSTIFYIN       __MSABI_LONG(0x00200000)
+#define GCP_DISPLAYZWG      __MSABI_LONG(0x00400000)
+#define GCP_SYMSWAPOFF      __MSABI_LONG(0x00800000)
+#define GCP_NUMERICOVERRIDE __MSABI_LONG(0x01000000)
+#define GCP_NEUTRALOVERRIDE __MSABI_LONG(0x02000000)
+#define GCP_NUMERICSLATIN   __MSABI_LONG(0x04000000)
+#define GCP_NUMERICSLOCAL   __MSABI_LONG(0x08000000)
 
 #define GCPCLASS_LATIN                     1
 #define GCPCLASS_HEBREW                    2
@@ -3002,35 +3002,35 @@ DECL_WINELIB_TYPE_AW(LPDEVMODE)
 #define DM_OUT_BUFFER     DM_COPY
 #define DM_OUT_DEFAULT    DM_UPDATE
 
-#define DM_ORIENTATION		0x00000001L
-#define DM_PAPERSIZE		0x00000002L
-#define DM_PAPERLENGTH		0x00000004L
-#define DM_PAPERWIDTH		0x00000008L
-#define DM_SCALE		0x00000010L
-#define DM_POSITION             0x00000020L
-#define DM_NUP                  0x00000040L
-#define DM_DISPLAYORIENTATION   0x00000080L
-#define DM_COPIES		0x00000100L
-#define DM_DEFAULTSOURCE	0x00000200L
-#define DM_PRINTQUALITY		0x00000400L
-#define DM_COLOR		0x00000800L
-#define DM_DUPLEX		0x00001000L
-#define DM_YRESOLUTION		0x00002000L
-#define DM_TTOPTION		0x00004000L
-#define DM_COLLATE              0x00008000L
-#define DM_FORMNAME             0x00010000L
-#define DM_LOGPIXELS            0x00020000L
-#define DM_BITSPERPEL           0x00040000L
-#define DM_PELSWIDTH            0x00080000L
-#define DM_PELSHEIGHT           0x00100000L
-#define DM_DISPLAYFLAGS         0x00200000L
-#define DM_DISPLAYFREQUENCY     0x00400000L
-#define DM_ICMMETHOD            0x00800000L
-#define DM_ICMINTENT            0x01000000L
-#define DM_MEDIATYPE            0x02000000L
-#define DM_DITHERTYPE           0x04000000L
-#define DM_PANNINGWIDTH         0x08000000L
-#define DM_PANNINGHEIGHT        0x10000000L
+#define DM_ORIENTATION          __MSABI_LONG(0x00000001)
+#define DM_PAPERSIZE            __MSABI_LONG(0x00000002)
+#define DM_PAPERLENGTH          __MSABI_LONG(0x00000004)
+#define DM_PAPERWIDTH           __MSABI_LONG(0x00000008)
+#define DM_SCALE                __MSABI_LONG(0x00000010)
+#define DM_POSITION             __MSABI_LONG(0x00000020)
+#define DM_NUP                  __MSABI_LONG(0x00000040)
+#define DM_DISPLAYORIENTATION   __MSABI_LONG(0x00000080)
+#define DM_COPIES               __MSABI_LONG(0x00000100)
+#define DM_DEFAULTSOURCE        __MSABI_LONG(0x00000200)
+#define DM_PRINTQUALITY         __MSABI_LONG(0x00000400)
+#define DM_COLOR                __MSABI_LONG(0x00000800)
+#define DM_DUPLEX               __MSABI_LONG(0x00001000)
+#define DM_YRESOLUTION          __MSABI_LONG(0x00002000)
+#define DM_TTOPTION             __MSABI_LONG(0x00004000)
+#define DM_COLLATE              __MSABI_LONG(0x00008000)
+#define DM_FORMNAME             __MSABI_LONG(0x00010000)
+#define DM_LOGPIXELS            __MSABI_LONG(0x00020000)
+#define DM_BITSPERPEL           __MSABI_LONG(0x00040000)
+#define DM_PELSWIDTH            __MSABI_LONG(0x00080000)
+#define DM_PELSHEIGHT           __MSABI_LONG(0x00100000)
+#define DM_DISPLAYFLAGS         __MSABI_LONG(0x00200000)
+#define DM_DISPLAYFREQUENCY     __MSABI_LONG(0x00400000)
+#define DM_ICMMETHOD            __MSABI_LONG(0x00800000)
+#define DM_ICMINTENT            __MSABI_LONG(0x01000000)
+#define DM_MEDIATYPE            __MSABI_LONG(0x02000000)
+#define DM_DITHERTYPE           __MSABI_LONG(0x04000000)
+#define DM_PANNINGWIDTH         __MSABI_LONG(0x08000000)
+#define DM_PANNINGHEIGHT        __MSABI_LONG(0x10000000)
 
 #define DMORIENT_PORTRAIT	1
 #define DMORIENT_LANDSCAPE	2