From 7ed02aabd1ffe4c684bd893c0393f389a8f24643 Mon Sep 17 00:00:00 2001 From: Luke Dunstan Date: Fri, 23 Apr 2004 18:24:03 +0000 Subject: [PATCH] 2004-04-24 Luke Dunstan * include/winuser.h (SM_IMMENABLED, SM_CXFOCUSBORDER, SM_CYFOCUSBORDER, SM_TABLETPC, SM_MEDIACENTER): Add defines. (SM_CMETRICS): Adjust value. * include/winnt.h (PROCESSOR_ARCHITECTURE_MSIL): Correct define. (PROCESSOR_ARCHITECTURE_AMD64, PROCESSOR_ARCHITECTURE_IA32_ON_WIN64): Add defines. Thanks to Benoit Blanchon --- winsup/w32api/ChangeLog | 10 ++++++++++ winsup/w32api/include/winnt.h | 4 +++- winsup/w32api/include/winuser.h | 7 ++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 1befa44b2..46f9857e4 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,13 @@ +2004-04-24 Luke Dunstan + + * include/winuser.h (SM_IMMENABLED, SM_CXFOCUSBORDER, + SM_CYFOCUSBORDER, SM_TABLETPC, SM_MEDIACENTER): Add defines. + (SM_CMETRICS): Adjust value. + * include/winnt.h (PROCESSOR_ARCHITECTURE_MSIL): Correct define. + (PROCESSOR_ARCHITECTURE_AMD64, PROCESSOR_ARCHITECTURE_IA32_ON_WIN64): + Add defines. + Thanks to Benoit Blanchon + 2004-04-24 Justin Forest * include/winsock2.h (LUP_DEEP, LUP_CONTAINERS, diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index 3cfa2667a..df156b825 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -699,7 +699,9 @@ typedef DWORD FLONG; #define PROCESSOR_ARCHITECTURE_ARM 5 #define PROCESSOR_ARCHITECTURE_IA64 6 #define PROCESSOR_ARCHITECTURE_ALPHA64 7 -#define PROCESSOR_ARCHITECTURE_MSIL8 +#define PROCESSOR_ARCHITECTURE_MSIL 8 +#define PROCESSOR_ARCHITECTURE_AMD64 9 +#define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 10 #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF #define PF_FLOATING_POINT_PRECISION_ERRATA 0 #define PF_FLOATING_POINT_EMULATED 1 diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index 3b174a083..dcb55a852 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -936,10 +936,15 @@ extern "C" { #define SM_CYVIRTUALSCREEN 79 #define SM_CMONITORS 80 #define SM_SAMEDISPLAYFORMAT 81 +#define SM_IMMENABLED 82 +#define SM_CXFOCUSBORDER 83 +#define SM_CYFOCUSBORDER 84 +#define SM_TABLETPC 86 +#define SM_MEDIACENTER 87 #if (_WIN32_WINNT < 0x0400) #define SM_CMETRICS 76 #else -#define SM_CMETRICS 83 +#define SM_CMETRICS 88 #endif #define SM_REMOTESESSION 0X1000 #define ARW_BOTTOMLEFT 0