Cleanup defines and constants. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@182 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/commctrl.rh b/mingw-w64-headers/include/commctrl.rh index 81b5c69..fc1be96 100755 --- a/mingw-w64-headers/include/commctrl.rh +++ b/mingw-w64-headers/include/commctrl.rh
@@ -3,157 +3,157 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#define HDS_HORZ 0x0000 -#define HDS_BUTTONS 0x0002 -#define HDS_HOTTRACK 0x0004 -#define HDS_HIDDEN 0x0008 -#define HDS_DRAGDROP 0x0040 -#define HDS_FULLDRAG 0x0080 -#define HDS_FILTERBAR 0x0100 -#define HDS_FLAT 0x0200 -#define RBS_TOOLTIPS 0x0100 -#define RBS_VARHEIGHT 0x0200 -#define RBS_BANDBORDERS 0x0400 -#define RBS_FIXEDORDER 0x0800 +#define HDS_HORZ 0x0 +#define HDS_BUTTONS 0x2 +#define HDS_HOTTRACK 0x4 +#define HDS_HIDDEN 0x8 +#define HDS_DRAGDROP 0x40 +#define HDS_FULLDRAG 0x80 +#define HDS_FILTERBAR 0x100 +#define HDS_FLAT 0x200 +#define RBS_TOOLTIPS 0x100 +#define RBS_VARHEIGHT 0x200 +#define RBS_BANDBORDERS 0x400 +#define RBS_FIXEDORDER 0x800 #define RBS_REGISTERDROP 0x1000 #define RBS_AUTOSIZE 0x2000 #define RBS_VERTICALGRIPPER 0x4000 #define RBS_DBLCLKTOGGLE 0x8000 -#define TTS_ALWAYSTIP 0x01 -#define TTS_NOPREFIX 0x02 +#define TTS_ALWAYSTIP 0x1 +#define TTS_NOPREFIX 0x2 #define TTS_NOANIMATE 0x10 #define TTS_NOFADE 0x20 #define TTS_BALLOON 0x40 #define TTS_CLOSE 0x80 -#define SBARS_SIZEGRIP 0x0100 -#define SBARS_TOOLTIPS 0x0800 -#define SBT_TOOLTIPS 0x0800 -#define TBS_AUTOTICKS 0x0001 -#define TBS_VERT 0x0002 -#define TBS_HORZ 0x0000 -#define TBS_TOP 0x0004 -#define TBS_BOTTOM 0x0000 -#define TBS_LEFT 0x0004 -#define TBS_RIGHT 0x0000 -#define TBS_BOTH 0x0008 -#define TBS_NOTICKS 0x0010 -#define TBS_ENABLESELRANGE 0x0020 -#define TBS_FIXEDLENGTH 0x0040 -#define TBS_NOTHUMB 0x0080 -#define TBS_TOOLTIPS 0x0100 -#define TBS_REVERSED 0x0200 -#define TBS_DOWNISLEFT 0x0400 -#define UDS_WRAP 0x0001 -#define UDS_SETBUDDYINT 0x0002 -#define UDS_ALIGNRIGHT 0x0004 -#define UDS_ALIGNLEFT 0x0008 -#define UDS_AUTOBUDDY 0x0010 -#define UDS_ARROWKEYS 0x0020 -#define UDS_HORZ 0x0040 -#define UDS_NOTHOUSANDS 0x0080 -#define UDS_HOTTRACK 0x0100 -#define PBS_SMOOTH 0x01 -#define PBS_VERTICAL 0x04 -#define CCS_TOP 0x00000001L -#define CCS_NOMOVEY 0x00000002L -#define CCS_BOTTOM 0x00000003L -#define CCS_NORESIZE 0x00000004L -#define CCS_NOPARENTALIGN 0x00000008L -#define CCS_ADJUSTABLE 0x00000020L -#define CCS_NODIVIDER 0x00000040L -#define CCS_VERT 0x00000080L +#define SBARS_SIZEGRIP 0x100 +#define SBARS_TOOLTIPS 0x800 +#define SBT_TOOLTIPS 0x800 +#define TBS_AUTOTICKS 0x1 +#define TBS_VERT 0x2 +#define TBS_HORZ 0x0 +#define TBS_TOP 0x4 +#define TBS_BOTTOM 0x0 +#define TBS_LEFT 0x4 +#define TBS_RIGHT 0x0 +#define TBS_BOTH 0x8 +#define TBS_NOTICKS 0x10 +#define TBS_ENABLESELRANGE 0x20 +#define TBS_FIXEDLENGTH 0x40 +#define TBS_NOTHUMB 0x80 +#define TBS_TOOLTIPS 0x100 +#define TBS_REVERSED 0x200 +#define TBS_DOWNISLEFT 0x400 +#define UDS_WRAP 0x1 +#define UDS_SETBUDDYINT 0x2 +#define UDS_ALIGNRIGHT 0x4 +#define UDS_ALIGNLEFT 0x8 +#define UDS_AUTOBUDDY 0x10 +#define UDS_ARROWKEYS 0x20 +#define UDS_HORZ 0x40 +#define UDS_NOTHOUSANDS 0x80 +#define UDS_HOTTRACK 0x100 +#define PBS_SMOOTH 0x1 +#define PBS_VERTICAL 0x4 +#define CCS_TOP 0x1L +#define CCS_NOMOVEY 0x2L +#define CCS_BOTTOM 0x3L +#define CCS_NORESIZE 0x4L +#define CCS_NOPARENTALIGN 0x8L +#define CCS_ADJUSTABLE 0x20L +#define CCS_NODIVIDER 0x40L +#define CCS_VERT 0x80L #define CCS_LEFT (CCS_VERT | CCS_TOP) #define CCS_RIGHT (CCS_VERT | CCS_BOTTOM) #define CCS_NOMOVEX (CCS_VERT | CCS_NOMOVEY) -#define LVS_ICON 0x0000 -#define LVS_REPORT 0x0001 -#define LVS_SMALLICON 0x0002 -#define LVS_LIST 0x0003 -#define LVS_TYPEMASK 0x0003 -#define LVS_SINGLESEL 0x0004 -#define LVS_SHOWSELALWAYS 0x0008 -#define LVS_SORTASCENDING 0x0010 -#define LVS_SORTDESCENDING 0x0020 -#define LVS_SHAREIMAGELISTS 0x0040 -#define LVS_NOLABELWRAP 0x0080 -#define LVS_AUTOARRANGE 0x0100 -#define LVS_EDITLABELS 0x0200 +#define LVS_ICON 0x0 +#define LVS_REPORT 0x1 +#define LVS_SMALLICON 0x2 +#define LVS_LIST 0x3 +#define LVS_TYPEMASK 0x3 +#define LVS_SINGLESEL 0x4 +#define LVS_SHOWSELALWAYS 0x8 +#define LVS_SORTASCENDING 0x10 +#define LVS_SORTDESCENDING 0x20 +#define LVS_SHAREIMAGELISTS 0x40 +#define LVS_NOLABELWRAP 0x80 +#define LVS_AUTOARRANGE 0x100 +#define LVS_EDITLABELS 0x200 #define LVS_OWNERDATA 0x1000 #define LVS_NOSCROLL 0x2000 #define LVS_TYPESTYLEMASK 0xfc00 -#define LVS_ALIGNTOP 0x0000 -#define LVS_ALIGNLEFT 0x0800 -#define LVS_ALIGNMASK 0x0c00 -#define LVS_OWNERDRAWFIXED 0x0400 +#define LVS_ALIGNTOP 0x0 +#define LVS_ALIGNLEFT 0x800 +#define LVS_ALIGNMASK 0xc00 +#define LVS_OWNERDRAWFIXED 0x400 #define LVS_NOCOLUMNHEADER 0x4000 #define LVS_NOSORTHEADER 0x8000 -#define TVS_HASBUTTONS 0x0001 -#define TVS_HASLINES 0x0002 -#define TVS_LINESATROOT 0x0004 -#define TVS_EDITLABELS 0x0008 -#define TVS_DISABLEDRAGDROP 0x0010 -#define TVS_SHOWSELALWAYS 0x0020 -#define TVS_RTLREADING 0x0040 -#define TVS_NOTOOLTIPS 0x0080 -#define TVS_CHECKBOXES 0x0100 -#define TVS_TRACKSELECT 0x0200 -#define TVS_SINGLEEXPAND 0x0400 -#define TVS_INFOTIP 0x0800 +#define TVS_HASBUTTONS 0x1 +#define TVS_HASLINES 0x2 +#define TVS_LINESATROOT 0x4 +#define TVS_EDITLABELS 0x8 +#define TVS_DISABLEDRAGDROP 0x10 +#define TVS_SHOWSELALWAYS 0x20 +#define TVS_RTLREADING 0x40 +#define TVS_NOTOOLTIPS 0x80 +#define TVS_CHECKBOXES 0x100 +#define TVS_TRACKSELECT 0x200 +#define TVS_SINGLEEXPAND 0x400 +#define TVS_INFOTIP 0x800 #define TVS_FULLROWSELECT 0x1000 #define TVS_NOSCROLL 0x2000 #define TVS_NONEVENHEIGHT 0x4000 #define TVS_NOHSCROLL 0x8000 -#define TCS_SCROLLOPPOSITE 0x0001 -#define TCS_BOTTOM 0x0002 -#define TCS_RIGHT 0x0002 -#define TCS_MULTISELECT 0x0004 -#define TCS_FLATBUTTONS 0x0008 -#define TCS_FORCEICONLEFT 0x0010 -#define TCS_FORCELABELLEFT 0x0020 -#define TCS_HOTTRACK 0x0040 -#define TCS_VERTICAL 0x0080 -#define TCS_TABS 0x0000 -#define TCS_BUTTONS 0x0100 -#define TCS_SINGLELINE 0x0000 -#define TCS_MULTILINE 0x0200 -#define TCS_RIGHTJUSTIFY 0x0000 -#define TCS_FIXEDWIDTH 0x0400 -#define TCS_RAGGEDRIGHT 0x0800 +#define TCS_SCROLLOPPOSITE 0x1 +#define TCS_BOTTOM 0x2 +#define TCS_RIGHT 0x2 +#define TCS_MULTISELECT 0x4 +#define TCS_FLATBUTTONS 0x8 +#define TCS_FORCEICONLEFT 0x10 +#define TCS_FORCELABELLEFT 0x20 +#define TCS_HOTTRACK 0x40 +#define TCS_VERTICAL 0x80 +#define TCS_TABS 0x0 +#define TCS_BUTTONS 0x100 +#define TCS_SINGLELINE 0x0 +#define TCS_MULTILINE 0x200 +#define TCS_RIGHTJUSTIFY 0x0 +#define TCS_FIXEDWIDTH 0x400 +#define TCS_RAGGEDRIGHT 0x800 #define TCS_FOCUSONBUTTONDOWN 0x1000 #define TCS_OWNERDRAWFIXED 0x2000 #define TCS_TOOLTIPS 0x4000 #define TCS_FOCUSNEVER 0x8000 -#define ACS_CENTER 0x0001 -#define ACS_TRANSPARENT 0x0002 -#define ACS_AUTOPLAY 0x0004 -#define ACS_TIMER 0x0008 +#define ACS_CENTER 0x1 +#define ACS_TRANSPARENT 0x2 +#define ACS_AUTOPLAY 0x4 +#define ACS_TIMER 0x8 -#define MCS_DAYSTATE 0x0001 -#define MCS_MULTISELECT 0x0002 -#define MCS_WEEKNUMBERS 0x0004 -#define MCS_NOTODAYCIRCLE 0x0008 -#define MCS_NOTODAY 0x0010 +#define MCS_DAYSTATE 0x1 +#define MCS_MULTISELECT 0x2 +#define MCS_WEEKNUMBERS 0x4 +#define MCS_NOTODAYCIRCLE 0x8 +#define MCS_NOTODAY 0x10 -#define DTS_UPDOWN 0x0001 -#define DTS_SHOWNONE 0x0002 -#define DTS_SHORTDATEFORMAT 0x0000 -#define DTS_LONGDATEFORMAT 0x0004 -#define DTS_SHORTDATECENTURYFORMAT 0x000C -#define DTS_TIMEFORMAT 0x0009 -#define DTS_APPCANPARSE 0x0010 -#define DTS_RIGHTALIGN 0x0020 +#define DTS_UPDOWN 0x1 +#define DTS_SHOWNONE 0x2 +#define DTS_SHORTDATEFORMAT 0x0 +#define DTS_LONGDATEFORMAT 0x4 +#define DTS_SHORTDATECENTURYFORMAT 0xc +#define DTS_TIMEFORMAT 0x9 +#define DTS_APPCANPARSE 0x10 +#define DTS_RIGHTALIGN 0x20 -#define PGS_VERT 0x00000000 -#define PGS_HORZ 0x00000001 -#define PGS_AUTOSCROLL 0x00000002 -#define PGS_DRAGNDROP 0x00000004 +#define PGS_VERT 0x0 +#define PGS_HORZ 0x1 +#define PGS_AUTOSCROLL 0x2 +#define PGS_DRAGNDROP 0x4 -#define NFS_EDIT 0x0001 -#define NFS_STATIC 0x0002 -#define NFS_LISTCOMBO 0x0004 -#define NFS_BUTTON 0x0008 -#define NFS_ALL 0x0010 -#define NFS_USEFONTASSOC 0x0020 +#define NFS_EDIT 0x1 +#define NFS_STATIC 0x2 +#define NFS_LISTCOMBO 0x4 +#define NFS_BUTTON 0x8 +#define NFS_ALL 0x10 +#define NFS_USEFONTASSOC 0x20
diff --git a/mingw-w64-headers/include/commdlg.h b/mingw-w64-headers/include/commdlg.h index 7710546..739a577 100755 --- a/mingw-w64-headers/include/commdlg.h +++ b/mingw-w64-headers/include/commdlg.h
@@ -190,33 +190,33 @@ #define GetFileTitle GetFileTitleA #endif -#define OFN_READONLY 0x00000001 -#define OFN_OVERWRITEPROMPT 0x00000002 -#define OFN_HIDEREADONLY 0x00000004 -#define OFN_NOCHANGEDIR 0x00000008 -#define OFN_SHOWHELP 0x00000010 -#define OFN_ENABLEHOOK 0x00000020 -#define OFN_ENABLETEMPLATE 0x00000040 -#define OFN_ENABLETEMPLATEHANDLE 0x00000080 -#define OFN_NOVALIDATE 0x00000100 -#define OFN_ALLOWMULTISELECT 0x00000200 -#define OFN_EXTENSIONDIFFERENT 0x00000400 -#define OFN_PATHMUSTEXIST 0x00000800 -#define OFN_FILEMUSTEXIST 0x00001000 -#define OFN_CREATEPROMPT 0x00002000 -#define OFN_SHAREAWARE 0x00004000 -#define OFN_NOREADONLYRETURN 0x00008000 -#define OFN_NOTESTFILECREATE 0x00010000 -#define OFN_NONETWORKBUTTON 0x00020000 -#define OFN_NOLONGNAMES 0x00040000 -#define OFN_EXPLORER 0x00080000 -#define OFN_NODEREFERENCELINKS 0x00100000 -#define OFN_LONGNAMES 0x00200000 -#define OFN_ENABLEINCLUDENOTIFY 0x00400000 -#define OFN_ENABLESIZING 0x00800000 -#define OFN_DONTADDTORECENT 0x02000000 +#define OFN_READONLY 0x1 +#define OFN_OVERWRITEPROMPT 0x2 +#define OFN_HIDEREADONLY 0x4 +#define OFN_NOCHANGEDIR 0x8 +#define OFN_SHOWHELP 0x10 +#define OFN_ENABLEHOOK 0x20 +#define OFN_ENABLETEMPLATE 0x40 +#define OFN_ENABLETEMPLATEHANDLE 0x80 +#define OFN_NOVALIDATE 0x100 +#define OFN_ALLOWMULTISELECT 0x200 +#define OFN_EXTENSIONDIFFERENT 0x400 +#define OFN_PATHMUSTEXIST 0x800 +#define OFN_FILEMUSTEXIST 0x1000 +#define OFN_CREATEPROMPT 0x2000 +#define OFN_SHAREAWARE 0x4000 +#define OFN_NOREADONLYRETURN 0x8000 +#define OFN_NOTESTFILECREATE 0x10000 +#define OFN_NONETWORKBUTTON 0x20000 +#define OFN_NOLONGNAMES 0x40000 +#define OFN_EXPLORER 0x80000 +#define OFN_NODEREFERENCELINKS 0x100000 +#define OFN_LONGNAMES 0x200000 +#define OFN_ENABLEINCLUDENOTIFY 0x400000 +#define OFN_ENABLESIZING 0x800000 +#define OFN_DONTADDTORECENT 0x2000000 #define OFN_FORCESHOWHIDDEN 0x10000000 -#define OFN_EX_NOPLACESBAR 0x00000001 +#define OFN_EX_NOPLACESBAR 0x1 #define OFN_SHAREFALLTHROUGH 2 #define OFN_SHARENOWARN 1 #define OFN_SHAREWARN 0 @@ -266,19 +266,19 @@ #define CDN_FIRST (0U-601U) #define CDN_LAST (0U-699U) -#define CDN_INITDONE (CDN_FIRST - 0x0000) -#define CDN_SELCHANGE (CDN_FIRST - 0x0001) -#define CDN_FOLDERCHANGE (CDN_FIRST - 0x0002) -#define CDN_SHAREVIOLATION (CDN_FIRST - 0x0003) -#define CDN_HELP (CDN_FIRST - 0x0004) -#define CDN_FILEOK (CDN_FIRST - 0x0005) -#define CDN_TYPECHANGE (CDN_FIRST - 0x0006) -#define CDN_INCLUDEITEM (CDN_FIRST - 0x0007) +#define CDN_INITDONE (CDN_FIRST) +#define CDN_SELCHANGE (CDN_FIRST - 1) +#define CDN_FOLDERCHANGE (CDN_FIRST - 2) +#define CDN_SHAREVIOLATION (CDN_FIRST - 3) +#define CDN_HELP (CDN_FIRST - 4) +#define CDN_FILEOK (CDN_FIRST - 5) +#define CDN_TYPECHANGE (CDN_FIRST - 6) +#define CDN_INCLUDEITEM (CDN_FIRST - 7) #define CDM_FIRST (WM_USER + 100) #define CDM_LAST (WM_USER + 200) -#define CDM_GETSPEC (CDM_FIRST + 0x0000) +#define CDM_GETSPEC (CDM_FIRST) #define CommDlg_OpenSave_GetSpecA(_hdlg,_psz,_cbmax) (int)SNDMSG(_hdlg,CDM_GETSPEC,(WPARAM)_cbmax,(LPARAM)(LPSTR)_psz) #define CommDlg_OpenSave_GetSpecW(_hdlg,_psz,_cbmax) (int)SNDMSG(_hdlg,CDM_GETSPEC,(WPARAM)_cbmax,(LPARAM)(LPWSTR)_psz) #ifdef UNICODE @@ -287,7 +287,7 @@ #define CommDlg_OpenSave_GetSpec CommDlg_OpenSave_GetSpecA #endif -#define CDM_GETFILEPATH (CDM_FIRST + 0x0001) +#define CDM_GETFILEPATH (CDM_FIRST + 1) #define CommDlg_OpenSave_GetFilePathA(_hdlg,_psz,_cbmax) (int)SNDMSG(_hdlg,CDM_GETFILEPATH,(WPARAM)_cbmax,(LPARAM)(LPSTR)_psz) #define CommDlg_OpenSave_GetFilePathW(_hdlg,_psz,_cbmax) (int)SNDMSG(_hdlg,CDM_GETFILEPATH,(WPARAM)_cbmax,(LPARAM)(LPWSTR)_psz) #ifdef UNICODE @@ -296,7 +296,7 @@ #define CommDlg_OpenSave_GetFilePath CommDlg_OpenSave_GetFilePathA #endif -#define CDM_GETFOLDERPATH (CDM_FIRST + 0x0002) +#define CDM_GETFOLDERPATH (CDM_FIRST + 2) #define CommDlg_OpenSave_GetFolderPathA(_hdlg,_psz,_cbmax) (int)SNDMSG(_hdlg,CDM_GETFOLDERPATH,(WPARAM)_cbmax,(LPARAM)(LPSTR)_psz) #define CommDlg_OpenSave_GetFolderPathW(_hdlg,_psz,_cbmax) (int)SNDMSG(_hdlg,CDM_GETFOLDERPATH,(WPARAM)_cbmax,(LPARAM)(LPWSTR)_psz) #ifdef UNICODE @@ -305,13 +305,13 @@ #define CommDlg_OpenSave_GetFolderPath CommDlg_OpenSave_GetFolderPathA #endif -#define CDM_GETFOLDERIDLIST (CDM_FIRST + 0x0003) +#define CDM_GETFOLDERIDLIST (CDM_FIRST + 3) #define CommDlg_OpenSave_GetFolderIDList(_hdlg,_pidl,_cbmax) (int)SNDMSG(_hdlg,CDM_GETFOLDERIDLIST,(WPARAM)_cbmax,(LPARAM)(LPVOID)_pidl) -#define CDM_SETCONTROLTEXT (CDM_FIRST + 0x0004) +#define CDM_SETCONTROLTEXT (CDM_FIRST + 4) #define CommDlg_OpenSave_SetControlText(_hdlg,_id,_text) (void)SNDMSG(_hdlg,CDM_SETCONTROLTEXT,(WPARAM)_id,(LPARAM)(LPSTR)_text) -#define CDM_HIDECONTROL (CDM_FIRST + 0x0005) +#define CDM_HIDECONTROL (CDM_FIRST + 5) #define CommDlg_OpenSave_HideControl(_hdlg,_id) (void)SNDMSG(_hdlg,CDM_HIDECONTROL,(WPARAM)_id,0) -#define CDM_SETDEFEXT (CDM_FIRST + 0x0006) +#define CDM_SETDEFEXT (CDM_FIRST + 6) #define CommDlg_OpenSave_SetDefExt(_hdlg,_pszext) (void)SNDMSG(_hdlg,CDM_SETDEFEXT,0,(LPARAM)(LPSTR)_pszext) typedef struct tagCHOOSECOLORA { @@ -352,15 +352,15 @@ #define ChooseColor ChooseColorA #endif -#define CC_RGBINIT 0x00000001 -#define CC_FULLOPEN 0x00000002 -#define CC_PREVENTFULLOPEN 0x00000004 -#define CC_SHOWHELP 0x00000008 -#define CC_ENABLEHOOK 0x00000010 -#define CC_ENABLETEMPLATE 0x00000020 -#define CC_ENABLETEMPLATEHANDLE 0x00000040 -#define CC_SOLIDCOLOR 0x00000080 -#define CC_ANYCOLOR 0x00000100 +#define CC_RGBINIT 0x1 +#define CC_FULLOPEN 0x2 +#define CC_PREVENTFULLOPEN 0x4 +#define CC_SHOWHELP 0x8 +#define CC_ENABLEHOOK 0x10 +#define CC_ENABLETEMPLATE 0x20 +#define CC_ENABLETEMPLATEHANDLE 0x40 +#define CC_SOLIDCOLOR 0x80 +#define CC_ANYCOLOR 0x100 typedef UINT_PTR (CALLBACK *LPFRHOOKPROC) (HWND,UINT,WPARAM,LPARAM); @@ -399,24 +399,24 @@ typedef LPFINDREPLACEA LPFINDREPLACE; #endif -#define FR_DOWN 0x00000001 -#define FR_WHOLEWORD 0x00000002 -#define FR_MATCHCASE 0x00000004 -#define FR_FINDNEXT 0x00000008 -#define FR_REPLACE 0x00000010 -#define FR_REPLACEALL 0x00000020 -#define FR_DIALOGTERM 0x00000040 -#define FR_SHOWHELP 0x00000080 -#define FR_ENABLEHOOK 0x00000100 -#define FR_ENABLETEMPLATE 0x00000200 -#define FR_NOUPDOWN 0x00000400 -#define FR_NOMATCHCASE 0x00000800 -#define FR_NOWHOLEWORD 0x00001000 -#define FR_ENABLETEMPLATEHANDLE 0x00002000 -#define FR_HIDEUPDOWN 0x00004000 -#define FR_HIDEMATCHCASE 0x00008000 -#define FR_HIDEWHOLEWORD 0x00010000 -#define FR_RAW 0x00020000 +#define FR_DOWN 0x1 +#define FR_WHOLEWORD 0x2 +#define FR_MATCHCASE 0x4 +#define FR_FINDNEXT 0x8 +#define FR_REPLACE 0x10 +#define FR_REPLACEALL 0x20 +#define FR_DIALOGTERM 0x40 +#define FR_SHOWHELP 0x80 +#define FR_ENABLEHOOK 0x100 +#define FR_ENABLETEMPLATE 0x200 +#define FR_NOUPDOWN 0x400 +#define FR_NOMATCHCASE 0x800 +#define FR_NOWHOLEWORD 0x1000 +#define FR_ENABLETEMPLATEHANDLE 0x2000 +#define FR_HIDEUPDOWN 0x4000 +#define FR_HIDEMATCHCASE 0x8000 +#define FR_HIDEWHOLEWORD 0x10000 +#define FR_RAW 0x20000 #define FR_MATCHDIAC 0x20000000 #define FR_MATCHKASHIDA 0x40000000 #define FR_MATCHALEFHAMZA 0x80000000 @@ -491,41 +491,41 @@ #define ChooseFont ChooseFontA #endif -#define CF_SCREENFONTS 0x00000001 -#define CF_PRINTERFONTS 0x00000002 +#define CF_SCREENFONTS 0x1 +#define CF_PRINTERFONTS 0x2 #define CF_BOTH (CF_SCREENFONTS | CF_PRINTERFONTS) -#define CF_SHOWHELP 0x00000004L -#define CF_ENABLEHOOK 0x00000008L -#define CF_ENABLETEMPLATE 0x00000010L -#define CF_ENABLETEMPLATEHANDLE 0x00000020L -#define CF_INITTOLOGFONTSTRUCT 0x00000040L -#define CF_USESTYLE 0x00000080L -#define CF_EFFECTS 0x00000100L -#define CF_APPLY 0x00000200L -#define CF_ANSIONLY 0x00000400L +#define CF_SHOWHELP 0x4L +#define CF_ENABLEHOOK 0x8L +#define CF_ENABLETEMPLATE 0x10L +#define CF_ENABLETEMPLATEHANDLE 0x20L +#define CF_INITTOLOGFONTSTRUCT 0x40L +#define CF_USESTYLE 0x80L +#define CF_EFFECTS 0x100L +#define CF_APPLY 0x200L +#define CF_ANSIONLY 0x400L #define CF_SCRIPTSONLY CF_ANSIONLY -#define CF_NOVECTORFONTS 0x00000800L +#define CF_NOVECTORFONTS 0x800L #define CF_NOOEMFONTS CF_NOVECTORFONTS -#define CF_NOSIMULATIONS 0x00001000L -#define CF_LIMITSIZE 0x00002000L -#define CF_FIXEDPITCHONLY 0x00004000L -#define CF_WYSIWYG 0x00008000L -#define CF_FORCEFONTEXIST 0x00010000L -#define CF_SCALABLEONLY 0x00020000L -#define CF_TTONLY 0x00040000L -#define CF_NOFACESEL 0x00080000L -#define CF_NOSTYLESEL 0x00100000L -#define CF_NOSIZESEL 0x00200000L -#define CF_SELECTSCRIPT 0x00400000L -#define CF_NOSCRIPTSEL 0x00800000L -#define CF_NOVERTFONTS 0x01000000L +#define CF_NOSIMULATIONS 0x1000L +#define CF_LIMITSIZE 0x2000L +#define CF_FIXEDPITCHONLY 0x4000L +#define CF_WYSIWYG 0x8000L +#define CF_FORCEFONTEXIST 0x10000L +#define CF_SCALABLEONLY 0x20000L +#define CF_TTONLY 0x40000L +#define CF_NOFACESEL 0x80000L +#define CF_NOSTYLESEL 0x100000L +#define CF_NOSIZESEL 0x200000L +#define CF_SELECTSCRIPT 0x400000L +#define CF_NOSCRIPTSEL 0x800000L +#define CF_NOVERTFONTS 0x1000000L #define SIMULATED_FONTTYPE 0x8000 #define PRINTER_FONTTYPE 0x4000 #define SCREEN_FONTTYPE 0x2000 -#define BOLD_FONTTYPE 0x0100 -#define ITALIC_FONTTYPE 0x0200 -#define REGULAR_FONTTYPE 0x0400 +#define BOLD_FONTTYPE 0x100 +#define ITALIC_FONTTYPE 0x200 +#define REGULAR_FONTTYPE 0x400 #ifdef WINNT #define PS_OPENTYPE_FONTTYPE 0x10000 @@ -731,33 +731,33 @@ #endif #endif -#define PD_ALLPAGES 0x00000000 -#define PD_SELECTION 0x00000001 -#define PD_PAGENUMS 0x00000002 -#define PD_NOSELECTION 0x00000004 -#define PD_NOPAGENUMS 0x00000008 -#define PD_COLLATE 0x00000010 -#define PD_PRINTTOFILE 0x00000020 -#define PD_PRINTSETUP 0x00000040 -#define PD_NOWARNING 0x00000080 -#define PD_RETURNDC 0x00000100 -#define PD_RETURNIC 0x00000200 -#define PD_RETURNDEFAULT 0x00000400 -#define PD_SHOWHELP 0x00000800 -#define PD_ENABLEPRINTHOOK 0x00001000 -#define PD_ENABLESETUPHOOK 0x00002000 -#define PD_ENABLEPRINTTEMPLATE 0x00004000 -#define PD_ENABLESETUPTEMPLATE 0x00008000 -#define PD_ENABLEPRINTTEMPLATEHANDLE 0x00010000 -#define PD_ENABLESETUPTEMPLATEHANDLE 0x00020000 -#define PD_USEDEVMODECOPIES 0x00040000 -#define PD_USEDEVMODECOPIESANDCOLLATE 0x00040000 -#define PD_DISABLEPRINTTOFILE 0x00080000 -#define PD_HIDEPRINTTOFILE 0x00100000 -#define PD_NONETWORKBUTTON 0x00200000 -#define PD_CURRENTPAGE 0x00400000 -#define PD_NOCURRENTPAGE 0x00800000 -#define PD_EXCLUSIONFLAGS 0x01000000 +#define PD_ALLPAGES 0x0 +#define PD_SELECTION 0x1 +#define PD_PAGENUMS 0x2 +#define PD_NOSELECTION 0x4 +#define PD_NOPAGENUMS 0x8 +#define PD_COLLATE 0x10 +#define PD_PRINTTOFILE 0x20 +#define PD_PRINTSETUP 0x40 +#define PD_NOWARNING 0x80 +#define PD_RETURNDC 0x100 +#define PD_RETURNIC 0x200 +#define PD_RETURNDEFAULT 0x400 +#define PD_SHOWHELP 0x800 +#define PD_ENABLEPRINTHOOK 0x1000 +#define PD_ENABLESETUPHOOK 0x2000 +#define PD_ENABLEPRINTTEMPLATE 0x4000 +#define PD_ENABLESETUPTEMPLATE 0x8000 +#define PD_ENABLEPRINTTEMPLATEHANDLE 0x10000 +#define PD_ENABLESETUPTEMPLATEHANDLE 0x20000 +#define PD_USEDEVMODECOPIES 0x40000 +#define PD_USEDEVMODECOPIESANDCOLLATE 0x40000 +#define PD_DISABLEPRINTTOFILE 0x80000 +#define PD_HIDEPRINTTOFILE 0x100000 +#define PD_NONETWORKBUTTON 0x200000 +#define PD_CURRENTPAGE 0x400000 +#define PD_NOCURRENTPAGE 0x800000 +#define PD_EXCLUSIONFLAGS 0x1000000 #define PD_USELARGETEMPLATE 0x10000000 #define PD_EXCL_COPIESANDCOLLATE (DM_COPIES | DM_COLLATE) @@ -774,7 +774,7 @@ WORD wDefault; } DEVNAMES,*LPDEVNAMES; -#define DN_DEFAULTPRN 0x0001 +#define DN_DEFAULTPRN 0x1 WINCOMMDLGAPI DWORD WINAPI CommDlgExtendedError(VOID); @@ -838,25 +838,25 @@ #define PageSetupDlg PageSetupDlgA #endif -#define PSD_DEFAULTMINMARGINS 0x00000000 -#define PSD_INWININIINTLMEASURE 0x00000000 -#define PSD_MINMARGINS 0x00000001 -#define PSD_MARGINS 0x00000002 -#define PSD_INTHOUSANDTHSOFINCHES 0x00000004 -#define PSD_INHUNDREDTHSOFMILLIMETERS 0x00000008 -#define PSD_DISABLEMARGINS 0x00000010 -#define PSD_DISABLEPRINTER 0x00000020 -#define PSD_NOWARNING 0x00000080 -#define PSD_DISABLEORIENTATION 0x00000100 -#define PSD_RETURNDEFAULT 0x00000400 -#define PSD_DISABLEPAPER 0x00000200 -#define PSD_SHOWHELP 0x00000800 -#define PSD_ENABLEPAGESETUPHOOK 0x00002000 -#define PSD_ENABLEPAGESETUPTEMPLATE 0x00008000 -#define PSD_ENABLEPAGESETUPTEMPLATEHANDLE 0x00020000 -#define PSD_ENABLEPAGEPAINTHOOK 0x00040000 -#define PSD_DISABLEPAGEPAINTING 0x00080000 -#define PSD_NONETWORKBUTTON 0x00200000 +#define PSD_DEFAULTMINMARGINS 0x0 +#define PSD_INWININIINTLMEASURE 0x0 +#define PSD_MINMARGINS 0x1 +#define PSD_MARGINS 0x2 +#define PSD_INTHOUSANDTHSOFINCHES 0x4 +#define PSD_INHUNDREDTHSOFMILLIMETERS 0x8 +#define PSD_DISABLEMARGINS 0x10 +#define PSD_DISABLEPRINTER 0x20 +#define PSD_NOWARNING 0x80 +#define PSD_DISABLEORIENTATION 0x100 +#define PSD_RETURNDEFAULT 0x400 +#define PSD_DISABLEPAPER 0x200 +#define PSD_SHOWHELP 0x800 +#define PSD_ENABLEPAGESETUPHOOK 0x2000 +#define PSD_ENABLEPAGESETUPTEMPLATE 0x8000 +#define PSD_ENABLEPAGESETUPTEMPLATEHANDLE 0x20000 +#define PSD_ENABLEPAGEPAINTHOOK 0x40000 +#define PSD_DISABLEPAGEPAINTING 0x80000 +#define PSD_NONETWORKBUTTON 0x200000 #ifdef __cplusplus }