[tkreuzer] 42965: Update DM_XXX constants and move some from winuser.h to wingdi.h where they belong, sort COLOR_XXX constants by number
Author: tkreuzer Date: Sun Aug 30 02:08:21 2009 New Revision: 42965
URL: http://svn.reactos.org/svn/reactos?rev=42965&view=rev Log: Update DM_XXX constants and move some from winuser.h to wingdi.h where they belong, sort COLOR_XXX constants by number
Modified: trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/psdk/winuser.h
Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=4... ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sun Aug 30 02:08:21 2009 @@ -1144,31 +1144,40 @@ #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_POSITION 32 -#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_POSITION 0x00000020 +#define DM_NUP 0x00000040 +#define DM_DISPLAYORIENTATION 0x00000080 +#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 +#define DM_PANNINGWIDTH 0x08000000 +#define DM_PANNINGHEIGHT 0x10000000 +#if (WINVER >= 0x0501) +#define DM_DISPLAYFIXEDOUTPUT 0x20000000 +#endif + #define DMICMMETHOD_NONE 1 #define DMICMMETHOD_SYSTEM 2 #define DMICMMETHOD_DRIVER 3
Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev=... ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Aug 30 02:08:21 2009 @@ -180,11 +180,6 @@ #define BROADCAST_QUERY_DENY 1112363332 #define ENUM_CURRENT_SETTINGS ((DWORD)-1) #define ENUM_REGISTRY_SETTINGS ((DWORD)-2) -#define DM_BITSPERPEL 0x40000 -#define DM_PELSWIDTH 0x80000 -#define DM_PELSHEIGHT 0x100000 -#define DM_DISPLAYFLAGS 0x200000 -#define DM_DISPLAYFREQUENCY 0x400000 #define CDS_UPDATEREGISTRY 1 #define CDS_TEST 2 #define CDS_FULLSCREEN 4 @@ -876,37 +871,38 @@ #define MWMO_WAITALL 1 #define MWMO_ALERTABLE 2 #define MWMO_INPUTAVAILABLE 4 -#define COLOR_3DDKSHADOW 21 -#define COLOR_3DFACE 15 -#define COLOR_3DHILIGHT 20 -#define COLOR_3DHIGHLIGHT 20 -#define COLOR_3DLIGHT 22 -#define COLOR_BTNHILIGHT 20 -#define COLOR_3DSHADOW 16 + +#define COLOR_SCROLLBAR 0 +#define COLOR_BACKGROUND 1 +#define COLOR_DESKTOP COLOR_BACKGROUND +#define COLOR_ACTIVECAPTION 2 +#define COLOR_INACTIVECAPTION 3 +#define COLOR_MENU 4 +#define COLOR_WINDOW 5 +#define COLOR_WINDOWFRAME 6 +#define COLOR_MENUTEXT 7 +#define COLOR_WINDOWTEXT 8 +#define COLOR_CAPTIONTEXT 9 #define COLOR_ACTIVEBORDER 10 -#define COLOR_ACTIVECAPTION 2 +#define COLOR_INACTIVEBORDER 11 #define COLOR_APPWORKSPACE 12 -#define COLOR_BACKGROUND 1 -#define COLOR_DESKTOP 1 -#define COLOR_BTNFACE 15 -#define COLOR_BTNHIGHLIGHT 20 -#define COLOR_BTNSHADOW 16 -#define COLOR_BTNTEXT 18 -#define COLOR_CAPTIONTEXT 9 -#define COLOR_GRAYTEXT 17 #define COLOR_HIGHLIGHT 13 #define COLOR_HIGHLIGHTTEXT 14 -#define COLOR_INACTIVEBORDER 11 -#define COLOR_INACTIVECAPTION 3 +#define COLOR_BTNFACE 15 +#define COLOR_3DFACE COLOR_BTNFACE +#define COLOR_BTNSHADOW 16 +#define COLOR_3DSHADOW COLOR_BTNSHADOW +#define COLOR_GRAYTEXT 17 +#define COLOR_BTNTEXT 18 #define COLOR_INACTIVECAPTIONTEXT 19 +#define COLOR_BTNHIGHLIGHT 20 +#define COLOR_3DHIGHLIGHT COLOR_BTNHIGHLIGHT +#define COLOR_3DHILIGHT COLOR_BTNHIGHLIGHT +#define COLOR_BTNHILIGHT COLOR_BTNHIGHLIGHT +#define COLOR_3DDKSHADOW 21 +#define COLOR_3DLIGHT 22 +#define COLOR_INFOTEXT 23 #define COLOR_INFOBK 24 -#define COLOR_INFOTEXT 23 -#define COLOR_MENU 4 -#define COLOR_MENUTEXT 7 -#define COLOR_SCROLLBAR 0 -#define COLOR_WINDOW 5 -#define COLOR_WINDOWFRAME 6 -#define COLOR_WINDOWTEXT 8 #define COLOR_HOTLIGHT 26 #define COLOR_GRADIENTACTIVECAPTION 27 #define COLOR_GRADIENTINACTIVECAPTION 28 @@ -914,6 +910,7 @@ #define COLOR_MENUHILIGHT 29 #define COLOR_MENUBAR 30 #endif + #define CTLCOLOR_MSGBOX 0 #define CTLCOLOR_EDIT 1 #define CTLCOLOR_LISTBOX 2
-
tkreuzer＠svn.reactos.org