From 42aa24d3c3a2e2e3fda455cc211458c005e23dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 12 Oct 2013 21:10:53 +0000 Subject: [PATCH] [WINGDI] - Update the definition of DM_SPECVERSION according to the Win's PSDK. - Add the DMDISPLAYFLAGS_TEXTMODE flag for DEVMODE::dmDisplayFlags (see Wine PSDK, Win's PSDK ...) - Add DMDFO_DEFAULT, DMDFO_STRETCH and DMDFO_CENTER flags for DEVMODE::dmDisplayFixedOutput (see Wine PSDK, Win's PSDK, MSDN ...) svn path=/trunk/; revision=60633 --- reactos/include/psdk/wingdi.h | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/reactos/include/psdk/wingdi.h b/reactos/include/psdk/wingdi.h index 392cac9afec..a7ec8ea665f 100644 --- a/reactos/include/psdk/wingdi.h +++ b/reactos/include/psdk/wingdi.h @@ -1188,9 +1188,23 @@ extern "C" { #define DMTT_DOWNLOAD_OUTLINE 4 #define DMCOLLATE_FALSE 0 #define DMCOLLATE_TRUE 1 -#define DM_SPECVERSION 800 -#define DM_GRAYSCALE 1 -#define DM_INTERLACED 2 + + +#define DMDO_DEFAULT 0 +#define DMDO_90 1 +#define DMDO_180 2 +#define DMDO_270 3 + +#define DMDFO_DEFAULT 0 +#define DMDFO_STRETCH 1 +#define DMDFO_CENTER 2 + + +#define DM_GRAYSCALE 0x00000001 +#define DM_INTERLACED 0x00000002 +#define DMDISPLAYFLAGS_TEXTMODE 0x00000004 + + #define DM_UPDATE 1 #define DM_COPY 2 #define DM_PROMPT 4 @@ -1200,6 +1214,15 @@ extern "C" { #define DM_OUT_BUFFER DM_COPY #define DM_OUT_DEFAULT DM_UPDATE + +#if (WINVER >= 0x0500) || (_WIN32_WINNT >= _WIN32_WINNT_NT4) +#define DM_SPECVERSION 0x0401 +#elif (WINVER >= 0x0400) +#define DM_SPECVERSION 0x0400 +#else +#define DM_SPECVERSION 0x0320 +#endif + #define DM_ORIENTATION 0x00000001 #define DM_PAPERSIZE 0x00000002 #define DM_PAPERLENGTH 0x00000004 @@ -1233,11 +1256,6 @@ extern "C" { #define DM_DISPLAYFIXEDOUTPUT 0x20000000 #endif -#define DMDO_DEFAULT 0 -#define DMDO_90 1 -#define DMDO_180 2 -#define DMDO_270 3 - #define DMICMMETHOD_NONE 1 #define DMICMMETHOD_SYSTEM 2 #define DMICMMETHOD_DRIVER 3