X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=blobdiff_plain;f=basis%2Fwindows%2Fgdi32%2Fgdi32.factor;h=5711ffbee22461afd26a699711e62810633b96c2;hp=93784ea3708aaab2ab7c9e646c4031e10d65c12e;hb=943596575ad294c074dfa381b70af74dba5992b1;hpb=e738c7206c32bd9b76f3cee31e950835e1b1ee24

diff --git a/basis/windows/gdi32/gdi32.factor b/basis/windows/gdi32/gdi32.factor
index 93784ea370..5711ffbee2 100644
--- a/basis/windows/gdi32/gdi32.factor
+++ b/basis/windows/gdi32/gdi32.factor
@@ -148,77 +148,77 @@ CONSTANT: EMR_GLSRECORD 102
 CONSTANT: EMR_GLSBOUNDEDRECORD 103
 CONSTANT: EMR_PIXELFORMAT 104
 CONSTANT: ENHMETA_SIGNATURE 1179469088
-CONSTANT: EPS_SIGNATURE HEX: 46535045
-CONSTANT: FR_PRIVATE HEX: 10
-CONSTANT: FR_NOT_ENUM HEX: 20
-CONSTANT: META_SETBKCOLOR HEX: 201
-CONSTANT: META_SETBKMODE HEX: 102
-CONSTANT: META_SETMAPMODE HEX: 103
-CONSTANT: META_SETROP2 HEX: 104
-CONSTANT: META_SETRELABS HEX: 105
-CONSTANT: META_SETPOLYFILLMODE HEX: 106
-CONSTANT: META_SETSTRETCHBLTMODE HEX: 107
-CONSTANT: META_SETTEXTCHAREXTRA HEX: 108
-CONSTANT: META_SETTEXTCOLOR HEX: 209
-CONSTANT: META_SETTEXTJUSTIFICATION HEX: 20A
-CONSTANT: META_SETWINDOWORG HEX: 20B
-CONSTANT: META_SETWINDOWEXT HEX: 20C
-CONSTANT: META_SETVIEWPORTORG HEX: 20D
-CONSTANT: META_SETVIEWPORTEXT HEX: 20E
-CONSTANT: META_OFFSETWINDOWORG HEX: 20F
-CONSTANT: META_SCALEWINDOWEXT HEX: 410
-CONSTANT: META_OFFSETVIEWPORTORG HEX: 211
-CONSTANT: META_SCALEVIEWPORTEXT HEX: 412
-CONSTANT: META_LINETO HEX: 213
-CONSTANT: META_MOVETO HEX: 214
-CONSTANT: META_EXCLUDECLIPRECT HEX: 415
-CONSTANT: META_INTERSECTCLIPRECT HEX: 416
-CONSTANT: META_ARC HEX: 817
-CONSTANT: META_ELLIPSE HEX: 418
-CONSTANT: META_FLOODFILL HEX: 419
-CONSTANT: META_PIE HEX: 81A
-CONSTANT: META_RECTANGLE HEX: 41B
-CONSTANT: META_ROUNDRECT HEX: 61C
-CONSTANT: META_PATBLT HEX: 61D
-CONSTANT: META_SAVEDC HEX: 1E
-CONSTANT: META_SETPIXEL HEX: 41F
-CONSTANT: META_OFFSETCLIPRGN HEX: 220
-CONSTANT: META_TEXTOUT HEX: 521
-CONSTANT: META_BITBLT HEX: 922
-CONSTANT: META_STRETCHBLT HEX: b23
-CONSTANT: META_POLYGON HEX: 324
-CONSTANT: META_POLYLINE HEX: 325
-CONSTANT: META_ESCAPE HEX: 626
-CONSTANT: META_RESTOREDC HEX: 127
-CONSTANT: META_FILLREGION HEX: 228
-CONSTANT: META_FRAMEREGION HEX: 429
-CONSTANT: META_INVERTREGION HEX: 12A
-CONSTANT: META_PAINTREGION HEX: 12B
-CONSTANT: META_SELECTCLIPREGION HEX: 12C
-CONSTANT: META_SELECTOBJECT HEX: 12D
-CONSTANT: META_SETTEXTALIGN HEX: 12E
-CONSTANT: META_CHORD HEX: 830
-CONSTANT: META_SETMAPPERFLAGS HEX: 231
-CONSTANT: META_EXTTEXTOUT HEX: a32
-CONSTANT: META_SETDIBTODEV HEX: d33
-CONSTANT: META_SELECTPALETTE HEX: 234
-CONSTANT: META_REALIZEPALETTE HEX: 35
-CONSTANT: META_ANIMATEPALETTE HEX: 436
-CONSTANT: META_SETPALENTRIES HEX: 37
-CONSTANT: META_POLYPOLYGON HEX: 538
-CONSTANT: META_RESIZEPALETTE HEX: 139
-CONSTANT: META_DIBBITBLT HEX: 940
-CONSTANT: META_DIBSTRETCHBLT HEX: b41
-CONSTANT: META_DIBCREATEPATTERNBRUSH HEX: 142
-CONSTANT: META_STRETCHDIB HEX: f43
-CONSTANT: META_EXTFLOODFILL HEX: 548
-CONSTANT: META_DELETEOBJECT HEX: 1f0
-CONSTANT: META_CREATEPALETTE HEX: f7
-CONSTANT: META_CREATEPATTERNBRUSH HEX: 1F9
-CONSTANT: META_CREATEPENINDIRECT HEX: 2FA
-CONSTANT: META_CREATEFONTINDIRECT HEX: 2FB
-CONSTANT: META_CREATEBRUSHINDIRECT HEX: 2FC
-CONSTANT: META_CREATEREGION HEX: 6FF
+CONSTANT: EPS_SIGNATURE 0x46535045
+CONSTANT: FR_PRIVATE 0x10
+CONSTANT: FR_NOT_ENUM 0x20
+CONSTANT: META_SETBKCOLOR 0x201
+CONSTANT: META_SETBKMODE 0x102
+CONSTANT: META_SETMAPMODE 0x103
+CONSTANT: META_SETROP2 0x104
+CONSTANT: META_SETRELABS 0x105
+CONSTANT: META_SETPOLYFILLMODE 0x106
+CONSTANT: META_SETSTRETCHBLTMODE 0x107
+CONSTANT: META_SETTEXTCHAREXTRA 0x108
+CONSTANT: META_SETTEXTCOLOR 0x209
+CONSTANT: META_SETTEXTJUSTIFICATION 0x20A
+CONSTANT: META_SETWINDOWORG 0x20B
+CONSTANT: META_SETWINDOWEXT 0x20C
+CONSTANT: META_SETVIEWPORTORG 0x20D
+CONSTANT: META_SETVIEWPORTEXT 0x20E
+CONSTANT: META_OFFSETWINDOWORG 0x20F
+CONSTANT: META_SCALEWINDOWEXT 0x410
+CONSTANT: META_OFFSETVIEWPORTORG 0x211
+CONSTANT: META_SCALEVIEWPORTEXT 0x412
+CONSTANT: META_LINETO 0x213
+CONSTANT: META_MOVETO 0x214
+CONSTANT: META_EXCLUDECLIPRECT 0x415
+CONSTANT: META_INTERSECTCLIPRECT 0x416
+CONSTANT: META_ARC 0x817
+CONSTANT: META_ELLIPSE 0x418
+CONSTANT: META_FLOODFILL 0x419
+CONSTANT: META_PIE 0x81A
+CONSTANT: META_RECTANGLE 0x41B
+CONSTANT: META_ROUNDRECT 0x61C
+CONSTANT: META_PATBLT 0x61D
+CONSTANT: META_SAVEDC 0x1E
+CONSTANT: META_SETPIXEL 0x41F
+CONSTANT: META_OFFSETCLIPRGN 0x220
+CONSTANT: META_TEXTOUT 0x521
+CONSTANT: META_BITBLT 0x922
+CONSTANT: META_STRETCHBLT 0xb23
+CONSTANT: META_POLYGON 0x324
+CONSTANT: META_POLYLINE 0x325
+CONSTANT: META_ESCAPE 0x626
+CONSTANT: META_RESTOREDC 0x127
+CONSTANT: META_FILLREGION 0x228
+CONSTANT: META_FRAMEREGION 0x429
+CONSTANT: META_INVERTREGION 0x12A
+CONSTANT: META_PAINTREGION 0x12B
+CONSTANT: META_SELECTCLIPREGION 0x12C
+CONSTANT: META_SELECTOBJECT 0x12D
+CONSTANT: META_SETTEXTALIGN 0x12E
+CONSTANT: META_CHORD 0x830
+CONSTANT: META_SETMAPPERFLAGS 0x231
+CONSTANT: META_EXTTEXTOUT 0xa32
+CONSTANT: META_SETDIBTODEV 0xd33
+CONSTANT: META_SELECTPALETTE 0x234
+CONSTANT: META_REALIZEPALETTE 0x35
+CONSTANT: META_ANIMATEPALETTE 0x436
+CONSTANT: META_SETPALENTRIES 0x37
+CONSTANT: META_POLYPOLYGON 0x538
+CONSTANT: META_RESIZEPALETTE 0x139
+CONSTANT: META_DIBBITBLT 0x940
+CONSTANT: META_DIBSTRETCHBLT 0xb41
+CONSTANT: META_DIBCREATEPATTERNBRUSH 0x142
+CONSTANT: META_STRETCHDIB 0xf43
+CONSTANT: META_EXTFLOODFILL 0x548
+CONSTANT: META_DELETEOBJECT 0x1f0
+CONSTANT: META_CREATEPALETTE 0xf7
+CONSTANT: META_CREATEPATTERNBRUSH 0x1F9
+CONSTANT: META_CREATEPENINDIRECT 0x2FA
+CONSTANT: META_CREATEFONTINDIRECT 0x2FB
+CONSTANT: META_CREATEBRUSHINDIRECT 0x2FC
+CONSTANT: META_CREATEREGION 0x6FF
 CONSTANT: ELF_VENDOR_SIZE 4
 CONSTANT: ELF_VERSION 0
 CONSTANT: ELF_CULTURE_LATIN 0
@@ -236,36 +236,36 @@ CONSTANT: PFD_SUPPORT_OPENGL 32
 CONSTANT: PFD_SUPPORT_DIRECTDRAW 8192
 CONSTANT: PFD_GENERIC_FORMAT 64
 CONSTANT: PFD_NEED_PALETTE 128
-CONSTANT: PFD_NEED_SYSTEM_PALETTE HEX: 00000100
-CONSTANT: PFD_SWAP_EXCHANGE HEX: 00000200
-CONSTANT: PFD_SWAP_COPY HEX: 00000400
-CONSTANT: PFD_SWAP_LAYER_BUFFERS HEX: 00000800
-CONSTANT: PFD_GENERIC_ACCELERATED HEX: 00001000
-CONSTANT: PFD_DEPTH_DONTCARE HEX: 20000000
-CONSTANT: PFD_DOUBLEBUFFER_DONTCARE HEX: 40000000
-CONSTANT: PFD_STEREO_DONTCARE HEX: 80000000
+CONSTANT: PFD_NEED_SYSTEM_PALETTE 0x00000100
+CONSTANT: PFD_SWAP_EXCHANGE 0x00000200
+CONSTANT: PFD_SWAP_COPY 0x00000400
+CONSTANT: PFD_SWAP_LAYER_BUFFERS 0x00000800
+CONSTANT: PFD_GENERIC_ACCELERATED 0x00001000
+CONSTANT: PFD_DEPTH_DONTCARE 0x20000000
+CONSTANT: PFD_DOUBLEBUFFER_DONTCARE 0x40000000
+CONSTANT: PFD_STEREO_DONTCARE 0x80000000
 CONSTANT: SP_ERROR -1
 CONSTANT: SP_OUTOFDISK -4
 CONSTANT: SP_OUTOFMEMORY -5
 CONSTANT: SP_USERABORT -3
 CONSTANT: SP_APPABORT -2
-CONSTANT: BLACKNESS HEX: 00000042
-CONSTANT: NOTSRCERASE HEX: 001100A6
-CONSTANT: NOTSRCCOPY HEX: 00330008
-CONSTANT: SRCERASE HEX: 00440328
-CONSTANT: DSTINVERT HEX: 00550009
-CONSTANT: PATINVERT HEX: 005A0049
-CONSTANT: SRCINVERT HEX: 00660046
-CONSTANT: SRCAND HEX: 008800C6
-CONSTANT: MERGEPAINT HEX: 00BB0226
-CONSTANT: MERGECOPY HEX: 00C000CA
-CONSTANT: SRCCOPY HEX: 00CC0020
-CONSTANT: SRCPAINT HEX: 00EE0086
-CONSTANT: PATCOPY HEX: 00F00021
-CONSTANT: PATPAINT HEX: 00FB0A09
-CONSTANT: WHITENESS HEX: 00FF0062
-CONSTANT: CAPTUREBLT HEX: 40000000
-CONSTANT: NOMIRRORBITMAP HEX: 80000000
+CONSTANT: BLACKNESS 0x00000042
+CONSTANT: NOTSRCERASE 0x001100A6
+CONSTANT: NOTSRCCOPY 0x00330008
+CONSTANT: SRCERASE 0x00440328
+CONSTANT: DSTINVERT 0x00550009
+CONSTANT: PATINVERT 0x005A0049
+CONSTANT: SRCINVERT 0x00660046
+CONSTANT: SRCAND 0x008800C6
+CONSTANT: MERGEPAINT 0x00BB0226
+CONSTANT: MERGECOPY 0x00C000CA
+CONSTANT: SRCCOPY 0x00CC0020
+CONSTANT: SRCPAINT 0x00EE0086
+CONSTANT: PATCOPY 0x00F00021
+CONSTANT: PATPAINT 0x00FB0A09
+CONSTANT: WHITENESS 0x00FF0062
+CONSTANT: CAPTUREBLT 0x40000000
+CONSTANT: NOMIRRORBITMAP 0x80000000
 CONSTANT: R2_BLACK 1
 CONSTANT: R2_COPYPEN 13
 CONSTANT: R2_MASKNOTPEN 3
@@ -477,13 +477,13 @@ CONSTANT: FS_TURKISH 16
 CONSTANT: FS_HEBREW 32
 CONSTANT: FS_ARABIC 64
 CONSTANT: FS_BALTIC 128
-CONSTANT: FS_THAI HEX: 10000
-CONSTANT: FS_JISJAPAN HEX: 20000
-CONSTANT: FS_CHINESESIMP HEX: 40000
-CONSTANT: FS_WANSUNG HEX: 80000
-CONSTANT: FS_CHINESETRAD HEX: 100000
-CONSTANT: FS_JOHAB HEX: 200000
-CONSTANT: FS_SYMBOL HEX: 80000000
+CONSTANT: FS_THAI 0x10000
+CONSTANT: FS_JISJAPAN 0x20000
+CONSTANT: FS_CHINESESIMP 0x40000
+CONSTANT: FS_WANSUNG 0x80000
+CONSTANT: FS_CHINESETRAD 0x100000
+CONSTANT: FS_JOHAB 0x200000
+CONSTANT: FS_SYMBOL 0x80000000
 CONSTANT: HS_BDIAGONAL 3
 CONSTANT: HS_CROSS 4
 CONSTANT: HS_DIAGCROSS 5
@@ -560,14 +560,14 @@ CONSTANT: DCBA_FACEDOWNLEFT 258
 CONSTANT: DCBA_FACEDOWNRIGHT 259
 CONSTANT: FLOODFILLBORDER 0
 CONSTANT: FLOODFILLSURFACE 1
-CONSTANT: ETO_CLIPPED HEX: 0004
-CONSTANT: ETO_GLYPH_INDEX HEX: 0010
-CONSTANT: ETO_OPAQUE HEX: 0002
-CONSTANT: ETO_NUMERICSLATIN HEX: 0800
-CONSTANT: ETO_NUMERICSLOCAL HEX: 0400
-CONSTANT: ETO_RTLREADING HEX: 0080
-CONSTANT: ETO_IGNORELANGUAGE HEX: 1000
-CONSTANT: ETO_PDY HEX: 2000
+CONSTANT: ETO_CLIPPED 0x0004
+CONSTANT: ETO_GLYPH_INDEX 0x0010
+CONSTANT: ETO_OPAQUE 0x0002
+CONSTANT: ETO_NUMERICSLATIN 0x0800
+CONSTANT: ETO_NUMERICSLOCAL 0x0400
+CONSTANT: ETO_RTLREADING 0x0080
+CONSTANT: ETO_IGNORELANGUAGE 0x1000
+CONSTANT: ETO_PDY 0x2000
 CONSTANT: GDICOMMENT_WINDOWS_METAFILE -2147483647
 CONSTANT: GDICOMMENT_BEGINGROUP 2
 CONSTANT: GDICOMMENT_ENDGROUP 3
@@ -589,8 +589,8 @@ CONSTANT: GCPCLASS_PREBOUNDLTR 128
 CONSTANT: GCPCLASS_PREBOUNDRTL 64
 CONSTANT: GCPCLASS_POSTBOUNDLTR 32
 CONSTANT: GCPCLASS_POSTBOUNDRTL 16
-CONSTANT: GCPGLYPH_LINKBEFORE HEX: 8000
-CONSTANT: GCPGLYPH_LINKAFTER HEX: 4000
+CONSTANT: GCPGLYPH_LINKBEFORE 0x8000
+CONSTANT: GCPGLYPH_LINKAFTER 0x4000
 CONSTANT: DCB_DISABLE 8
 CONSTANT: DCB_ENABLE 4
 CONSTANT: DCB_RESET 1
@@ -651,17 +651,17 @@ CONSTANT: DESKTOPHORZRES 118
 CONSTANT: DESKTOPVERTRES 117
 CONSTANT: BLTALIGNMENT 119
 CONSTANT: SHADEBLENDCAPS 120
-CONSTANT: SB_NONE HEX: 00
-CONSTANT: SB_CONST_ALPHA HEX: 01
-CONSTANT: SB_PIXEL_ALPHA HEX: 02
-CONSTANT: SB_PREMULT_ALPHA HEX: 04
-CONSTANT: SB_GRAD_RECT HEX: 10
-CONSTANT: SB_GRAD_TRI HEX: 20
+CONSTANT: SB_NONE 0x00
+CONSTANT: SB_CONST_ALPHA 0x01
+CONSTANT: SB_PIXEL_ALPHA 0x02
+CONSTANT: SB_PREMULT_ALPHA 0x04
+CONSTANT: SB_GRAD_RECT 0x10
+CONSTANT: SB_GRAD_TRI 0x20
 CONSTANT: COLORMGMTCAPS 121
-CONSTANT: CM_NONE HEX: 00
-CONSTANT: CM_DEVICE_ICM HEX: 01
-CONSTANT: CM_GAMMA_RAMP HEX: 02
-CONSTANT: CM_CMYK_COLOR HEX: 04
+CONSTANT: CM_NONE 0x00
+CONSTANT: CM_DEVICE_ICM 0x01
+CONSTANT: CM_GAMMA_RAMP 0x02
+CONSTANT: CM_CMYK_COLOR 0x04
 CONSTANT: RASTERCAPS 38
 CONSTANT: RC_BITBLT 1
 CONSTANT: RC_BITMAP64 8
@@ -693,11 +693,11 @@ CONSTANT: LC_INTERIORS 128
 CONSTANT: POLYGONALCAPS 32
 CONSTANT: RC_BANDING 2
 CONSTANT: RC_BIGFONT 1024
-CONSTANT: RC_DEVBITS HEX: 8000
+CONSTANT: RC_DEVBITS 0x8000
 CONSTANT: RC_GDI20_OUTPUT 16
 CONSTANT: RC_GDI20_STATE 32
 CONSTANT: RC_NONE 0
-CONSTANT: RC_OP_DX_OUTPUT HEX: 4000
+CONSTANT: RC_OP_DX_OUTPUT 0x4000
 CONSTANT: RC_PALETTE 256
 CONSTANT: RC_SAVEBITMAP 64
 CONSTANT: RC_SCALING 4
@@ -732,25 +732,25 @@ CONSTANT: TC_VA_ABLE 16384
 CONSTANT: TC_RESERVED 32768
 CONSTANT: TC_SCROLLBLT 65536
 CONSTANT: GCP_DBCS 1
-CONSTANT: GCP_ERROR HEX: 8000
-CONSTANT: GCP_CLASSIN HEX: 80000
+CONSTANT: GCP_ERROR 0x8000
+CONSTANT: GCP_CLASSIN 0x80000
 CONSTANT: GCP_DIACRITIC 256
-CONSTANT: GCP_DISPLAYZWG HEX: 400000
+CONSTANT: GCP_DISPLAYZWG 0x400000
 CONSTANT: GCP_GLYPHSHAPE 16
-CONSTANT: GCP_JUSTIFY HEX: 10000
-CONSTANT: GCP_JUSTIFYIN HEX: 200000
+CONSTANT: GCP_JUSTIFY 0x10000
+CONSTANT: GCP_JUSTIFYIN 0x200000
 CONSTANT: GCP_KASHIDA 1024
 CONSTANT: GCP_LIGATE 32
-CONSTANT: GCP_MAXEXTENT HEX: 100000
-CONSTANT: GCP_NEUTRALOVERRIDE HEX: 2000000
-CONSTANT: GCP_NUMERICOVERRIDE HEX: 1000000
-CONSTANT: GCP_NUMERICSLATIN HEX: 4000000
-CONSTANT: GCP_NUMERICSLOCAL HEX: 8000000
+CONSTANT: GCP_MAXEXTENT 0x100000
+CONSTANT: GCP_NEUTRALOVERRIDE 0x2000000
+CONSTANT: GCP_NUMERICOVERRIDE 0x1000000
+CONSTANT: GCP_NUMERICSLATIN 0x4000000
+CONSTANT: GCP_NUMERICSLOCAL 0x8000000
 CONSTANT: GCP_REORDER 2
-CONSTANT: GCP_SYMSWAPOFF HEX: 800000
+CONSTANT: GCP_SYMSWAPOFF 0x800000
 CONSTANT: GCP_USEKERNING 8
-CONSTANT: FLI_GLYPHS HEX: 40000
-CONSTANT: FLI_MASK HEX: 103b
+CONSTANT: FLI_GLYPHS 0x40000
+CONSTANT: FLI_MASK 0x103b
 CONSTANT: GGO_METRICS 0
 CONSTANT: GGO_BITMAP 1
 CONSTANT: GGO_NATIVE 2
@@ -776,9 +776,9 @@ CONSTANT: RELATIVE 2
 CONSTANT: PC_EXPLICIT 2
 CONSTANT: PC_NOCOLLAPSE 4
 CONSTANT: PC_RESERVED 1
-CONSTANT: CLR_NONE HEX: ffffffff
+CONSTANT: CLR_NONE 0xffffffff
 ALIAS: CLR_INVALID CLR_NONE
-CONSTANT: CLR_DEFAULT HEX: ff000000
+CONSTANT: CLR_DEFAULT 0xff000000
 CONSTANT: PT_MOVETO 6
 CONSTANT: PT_LINETO 2
 CONSTANT: PT_BEZIERTO 4
@@ -925,7 +925,7 @@ CONSTANT: QDI_SETDIBITS 1
 CONSTANT: QDI_GETDIBITS 2
 CONSTANT: QDI_DIBTOSCREEN 4
 CONSTANT: QDI_STRETCHDIB 8
-CONSTANT: SP_NOTREPORTED HEX: 4000
+CONSTANT: SP_NOTREPORTED 0x4000
 CONSTANT: PR_JOBSTATUS 0
 CONSTANT: ASPECT_FILTERING 1
 CONSTANT: BS_SOLID 0
@@ -1113,42 +1113,42 @@ ALIAS: DM_IN_BUFFER DM_MODIFY
 ALIAS: DM_IN_PROMPT DM_PROMPT
 ALIAS: DM_OUT_BUFFER DM_COPY
 ALIAS: DM_OUT_DEFAULT DM_UPDATE
-CONSTANT: DM_ORIENTATION HEX: 00000001
-CONSTANT: DM_PAPERSIZE HEX: 00000002
-CONSTANT: DM_PAPERLENGTH HEX: 00000004
-CONSTANT: DM_PAPERWIDTH HEX: 00000008
-CONSTANT: DM_SCALE HEX: 00000010
-CONSTANT: DM_POSITION HEX: 00000020
-CONSTANT: DM_COPIES HEX: 00000100
-CONSTANT: DM_DEFAULTSOURCE HEX: 00000200
-CONSTANT: DM_PRINTQUALITY HEX: 00000400
-CONSTANT: DM_COLOR HEX: 00000800
-CONSTANT: DM_DUPLEX HEX: 00001000
-CONSTANT: DM_YRESOLUTION HEX: 00002000
-CONSTANT: DM_TTOPTION HEX: 00004000
-CONSTANT: DM_COLLATE HEX: 00008000
-CONSTANT: DM_FORMNAME HEX: 00010000
-CONSTANT: DM_LOGPIXELS HEX: 00020000
-CONSTANT: DM_BITSPERPEL HEX: 00040000
-CONSTANT: DM_PELSWIDTH HEX: 00080000
-CONSTANT: DM_PELSHEIGHT HEX: 00100000
-CONSTANT: DM_DISPLAYFLAGS HEX: 00200000
-CONSTANT: DM_DISPLAYFREQUENCY HEX: 00400000
-CONSTANT: DM_ICMMETHOD HEX: 00800000
-CONSTANT: DM_ICMINTENT HEX: 01000000
-CONSTANT: DM_MEDIATYPE HEX: 02000000
-CONSTANT: DM_DITHERTYPE HEX: 04000000
-CONSTANT: DM_PANNINGWIDTH HEX: 08000000
-CONSTANT: DM_PANNINGHEIGHT HEX: 10000000
-CONSTANT: DM_DISPLAYFIXEDOUTPUT HEX: 20000000
-CONSTANT: DM_DISPLAYORIENTATION HEX: 00000080
-CONSTANT: DMDO_DEFAULT HEX: 00000000
-CONSTANT: DMDO_90 HEX: 00000001
-CONSTANT: DMDO_180 HEX: 00000002
-CONSTANT: DMDO_270 HEX: 00000003
-CONSTANT: DMDFO_DEFAULT HEX: 00000000
-CONSTANT: DMDFO_STRETCH HEX: 00000001
-CONSTANT: DMDFO_CENTER HEX: 00000002
+CONSTANT: DM_ORIENTATION 0x00000001
+CONSTANT: DM_PAPERSIZE 0x00000002
+CONSTANT: DM_PAPERLENGTH 0x00000004
+CONSTANT: DM_PAPERWIDTH 0x00000008
+CONSTANT: DM_SCALE 0x00000010
+CONSTANT: DM_POSITION 0x00000020
+CONSTANT: DM_COPIES 0x00000100
+CONSTANT: DM_DEFAULTSOURCE 0x00000200
+CONSTANT: DM_PRINTQUALITY 0x00000400
+CONSTANT: DM_COLOR 0x00000800
+CONSTANT: DM_DUPLEX 0x00001000
+CONSTANT: DM_YRESOLUTION 0x00002000
+CONSTANT: DM_TTOPTION 0x00004000
+CONSTANT: DM_COLLATE 0x00008000
+CONSTANT: DM_FORMNAME 0x00010000
+CONSTANT: DM_LOGPIXELS 0x00020000
+CONSTANT: DM_BITSPERPEL 0x00040000
+CONSTANT: DM_PELSWIDTH 0x00080000
+CONSTANT: DM_PELSHEIGHT 0x00100000
+CONSTANT: DM_DISPLAYFLAGS 0x00200000
+CONSTANT: DM_DISPLAYFREQUENCY 0x00400000
+CONSTANT: DM_ICMMETHOD 0x00800000
+CONSTANT: DM_ICMINTENT 0x01000000
+CONSTANT: DM_MEDIATYPE 0x02000000
+CONSTANT: DM_DITHERTYPE 0x04000000
+CONSTANT: DM_PANNINGWIDTH 0x08000000
+CONSTANT: DM_PANNINGHEIGHT 0x10000000
+CONSTANT: DM_DISPLAYFIXEDOUTPUT 0x20000000
+CONSTANT: DM_DISPLAYORIENTATION 0x00000080
+CONSTANT: DMDO_DEFAULT 0x00000000
+CONSTANT: DMDO_90 0x00000001
+CONSTANT: DMDO_180 0x00000002
+CONSTANT: DMDO_270 0x00000003
+CONSTANT: DMDFO_DEFAULT 0x00000000
+CONSTANT: DMDFO_STRETCH 0x00000001
+CONSTANT: DMDFO_CENTER 0x00000002
 CONSTANT: DMICMMETHOD_NONE 1
 CONSTANT: DMICMMETHOD_SYSTEM 2
 CONSTANT: DMICMMETHOD_DRIVER 3
@@ -1173,7 +1173,7 @@ CONSTANT: DMDITHER_RESERVED8 8
 CONSTANT: DMDITHER_RESERVED9 9
 CONSTANT: DMDITHER_GRAYSCALE 10
 CONSTANT: DMDITHER_USER 256
-CONSTANT: GDI_ERROR HEX: FFFFFFFF
+CONSTANT: GDI_ERROR 0xFFFFFFFF
 : HGDI_ERROR ( -- alien ) GDI_ERROR <alien> ; inline
 CONSTANT: TMPF_FIXED_PITCH 1
 CONSTANT: TMPF_VECTOR 2
@@ -1187,7 +1187,7 @@ CONSTANT: TT_PRIM_LINE 1
 CONSTANT: TT_PRIM_QSPLINE 2
 CONSTANT: TT_PRIM_CSPLINE 3 
 CONSTANT: FONTMAPPER_MAX 10
-CONSTANT: ENHMETA_STOCK_OBJECT HEX: 80000000
+CONSTANT: ENHMETA_STOCK_OBJECT 0x80000000
 CONSTANT: WGL_FONT_LINES 0
 CONSTANT: WGL_FONT_POLYGONS 1
 CONSTANT: LPD_DOUBLEBUFFER 1
@@ -1219,53 +1219,53 @@ CONSTANT: WGL_SWAP_OVERLAY13 8192
 CONSTANT: WGL_SWAP_OVERLAY14 16384
 CONSTANT: WGL_SWAP_OVERLAY15 32768
 CONSTANT: WGL_SWAP_UNDERLAY1 65536
-CONSTANT: WGL_SWAP_UNDERLAY2 HEX: 20000
-CONSTANT: WGL_SWAP_UNDERLAY3 HEX: 40000
-CONSTANT: WGL_SWAP_UNDERLAY4 HEX: 80000
-CONSTANT: WGL_SWAP_UNDERLAY5 HEX: 100000
-CONSTANT: WGL_SWAP_UNDERLAY6 HEX: 200000
-CONSTANT: WGL_SWAP_UNDERLAY7 HEX: 400000
-CONSTANT: WGL_SWAP_UNDERLAY8 HEX: 800000
-CONSTANT: WGL_SWAP_UNDERLAY9 HEX: 1000000
-CONSTANT: WGL_SWAP_UNDERLAY10 HEX: 2000000
-CONSTANT: WGL_SWAP_UNDERLAY11 HEX: 4000000
-CONSTANT: WGL_SWAP_UNDERLAY12 HEX: 8000000
-CONSTANT: WGL_SWAP_UNDERLAY13 HEX: 10000000
-CONSTANT: WGL_SWAP_UNDERLAY14 HEX: 20000000
-CONSTANT: WGL_SWAP_UNDERLAY15 HEX: 40000000
-CONSTANT: AC_SRC_OVER HEX: 00
-CONSTANT: AC_SRC_ALPHA HEX: 01
-CONSTANT: AC_SRC_NO_PREMULT_ALPHA HEX: 01
-CONSTANT: AC_SRC_NO_ALPHA HEX: 02
-CONSTANT: AC_DST_NO_PREMULT_ALPHA HEX: 10
-CONSTANT: AC_DST_NO_ALPHA HEX: 20
+CONSTANT: WGL_SWAP_UNDERLAY2 0x20000
+CONSTANT: WGL_SWAP_UNDERLAY3 0x40000
+CONSTANT: WGL_SWAP_UNDERLAY4 0x80000
+CONSTANT: WGL_SWAP_UNDERLAY5 0x100000
+CONSTANT: WGL_SWAP_UNDERLAY6 0x200000
+CONSTANT: WGL_SWAP_UNDERLAY7 0x400000
+CONSTANT: WGL_SWAP_UNDERLAY8 0x800000
+CONSTANT: WGL_SWAP_UNDERLAY9 0x1000000
+CONSTANT: WGL_SWAP_UNDERLAY10 0x2000000
+CONSTANT: WGL_SWAP_UNDERLAY11 0x4000000
+CONSTANT: WGL_SWAP_UNDERLAY12 0x8000000
+CONSTANT: WGL_SWAP_UNDERLAY13 0x10000000
+CONSTANT: WGL_SWAP_UNDERLAY14 0x20000000
+CONSTANT: WGL_SWAP_UNDERLAY15 0x40000000
+CONSTANT: AC_SRC_OVER 0x00
+CONSTANT: AC_SRC_ALPHA 0x01
+CONSTANT: AC_SRC_NO_PREMULT_ALPHA 0x01
+CONSTANT: AC_SRC_NO_ALPHA 0x02
+CONSTANT: AC_DST_NO_PREMULT_ALPHA 0x10
+CONSTANT: AC_DST_NO_ALPHA 0x20
 CONSTANT: LAYOUT_RTL 1
 CONSTANT: LAYOUT_BITMAPORIENTATIONPRESERVED 8
-CONSTANT: CS_ENABLE HEX: 00000001
-CONSTANT: CS_DISABLE HEX: 00000002
-CONSTANT: CS_DELETE_TRANSFORM HEX: 00000003
-CONSTANT: GRADIENT_FILL_RECT_H HEX: 00
-CONSTANT: GRADIENT_FILL_RECT_V HEX: 01
-CONSTANT: GRADIENT_FILL_TRIANGLE HEX: 02
-CONSTANT: GRADIENT_FILL_OP_FLAG HEX: ff
-CONSTANT: COLORMATCHTOTARGET_EMBEDED HEX: 00000001
-CONSTANT: CREATECOLORSPACE_EMBEDED HEX: 00000001
-CONSTANT: SETICMPROFILE_EMBEDED HEX: 00000001
+CONSTANT: CS_ENABLE 0x00000001
+CONSTANT: CS_DISABLE 0x00000002
+CONSTANT: CS_DELETE_TRANSFORM 0x00000003
+CONSTANT: GRADIENT_FILL_RECT_H 0x00
+CONSTANT: GRADIENT_FILL_RECT_V 0x01
+CONSTANT: GRADIENT_FILL_TRIANGLE 0x02
+CONSTANT: GRADIENT_FILL_OP_FLAG 0xff
+CONSTANT: COLORMATCHTOTARGET_EMBEDED 0x00000001
+CONSTANT: CREATECOLORSPACE_EMBEDED 0x00000001
+CONSTANT: SETICMPROFILE_EMBEDED 0x00000001
 
-CONSTANT: DISPLAY_DEVICE_ATTACHED_TO_DESKTOP HEX: 00000001
-CONSTANT: DISPLAY_DEVICE_MULTI_DRIVER HEX: 00000002
-CONSTANT: DISPLAY_DEVICE_PRIMARY_DEVICE HEX: 00000004
-CONSTANT: DISPLAY_DEVICE_MIRRORING_DRIVER HEX: 00000008
-CONSTANT: DISPLAY_DEVICE_VGA_COMPATIBLE HEX: 00000010
-CONSTANT: DISPLAY_DEVICE_REMOVABLE HEX: 00000020
-CONSTANT: DISPLAY_DEVICE_MODESPRUNED HEX: 08000000
+CONSTANT: DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001
+CONSTANT: DISPLAY_DEVICE_MULTI_DRIVER 0x00000002
+CONSTANT: DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004
+CONSTANT: DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008
+CONSTANT: DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010
+CONSTANT: DISPLAY_DEVICE_REMOVABLE 0x00000020
+CONSTANT: DISPLAY_DEVICE_MODESPRUNED 0x08000000
 
-CONSTANT: NTM_NONNEGATIVE_AC HEX: 00010000
-CONSTANT: NTM_PS_OPENTYPE HEX: 00020000
-CONSTANT: NTM_TT_OPENTYPE HEX: 00040000
-CONSTANT: NTM_MULTIPLEMASTER HEX: 00080000
-CONSTANT: NTM_TYPE1 HEX: 00100000
-CONSTANT: NTM_DSIG HEX: 00200000
+CONSTANT: NTM_NONNEGATIVE_AC 0x00010000
+CONSTANT: NTM_PS_OPENTYPE 0x00020000
+CONSTANT: NTM_TT_OPENTYPE 0x00040000
+CONSTANT: NTM_MULTIPLEMASTER 0x00080000
+CONSTANT: NTM_TYPE1 0x00100000
+CONSTANT: NTM_DSIG 0x00200000
 
 CONSTANT: GGI_MARK_NONEXISTING_GLYPHS 1