diff options
| -rw-r--r-- | winsup/w32api/ChangeLog | 13 | ||||
| -rw-r--r-- | winsup/w32api/include/pbt.h | 8 | ||||
| -rw-r--r-- | winsup/w32api/include/winuser.h | 31 |
3 files changed, 36 insertions, 16 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 67aad5014..50a2ad69e 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,7 +1,18 @@ 2007-07-12 Danny Smith <dannysmith@users.sourceforge.net> + * include/pbt.h (PBT_APMRESUMEAUTOMATIC) Define. + * include/winuser.h: (PBT_APMQUERYSUSPEND, PBT_APMQUERYSTANDBY, + PBT_APMQUERYSUSPENDFAILED, PBT_APMQUERYSTANDBYFAILED, + PBT_APMSUSPEND, PBT_APMSTANDBY, PBT_APMRESUMECRITICAL, + PBT_APMRESUMESUSPEND, PBT_APMRESUMESTANDBY, PBT_APMBATTERYLOW, + PBT_APMPOWERSTATUSCHANGE, PBT_APMOEMEVENT, PBT_APMRESUMEAUTOMATIC): + Sync with include/pbt.h. + +2007-07-12 Danny Smith <dannysmith@users.sourceforge.net> + [mingw-Bugs-1751518] - * include/mshtml.h (IHTMLDocument2): Correct spelling of put_URL, get_URL. + * include/mshtml.h (IHTMLDocument2): Correct spelling of put_URL, + get_URL. [mingw-Bugs-1751565] * include/basetyps.h (IID); Guard with __IID_DEFINED__. diff --git a/winsup/w32api/include/pbt.h b/winsup/w32api/include/pbt.h index 2001e1b29..21cb1cd41 100644 --- a/winsup/w32api/include/pbt.h +++ b/winsup/w32api/include/pbt.h @@ -1,9 +1,10 @@ #ifndef _PBT_H #define _PBT_H -#if __GNUC__ >=3 +#if __GNUC__ >= 3 #pragma GCC system_header #endif +/* Also in winuser.h */ #define PBT_APMQUERYSUSPEND 0 #define PBT_APMQUERYSTANDBY 1 #define PBT_APMQUERYSUSPENDFAILED 2 @@ -13,8 +14,11 @@ #define PBT_APMRESUMECRITICAL 6 #define PBT_APMRESUMESUSPEND 7 #define PBT_APMRESUMESTANDBY 8 -#define PBTF_APMRESUMEFROMFAILURE 1 #define PBT_APMBATTERYLOW 9 #define PBT_APMPOWERSTATUSCHANGE 10 #define PBT_APMOEMEVENT 11 +#define PBT_APMRESUMEAUTOMATIC 18 + +#define PBTF_APMRESUMEFROMFAILURE 1 + #endif diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index 4a0145787..9be3dd878 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -1085,21 +1085,26 @@ extern "C" { #define MOUSEEVENTF_XDOWN 0x00000080 #define MOUSEEVENTF_XUP 0x00000100 #endif +/* Also in pbt.h */ #if (_WIN32_WINNT >= 0x0400) -#define PBT_APMQUERYSUSPEND 0x0000 -#define PBT_APMQUERYSTANDBY 0x0001 -#define PBT_APMQUERYSUSPENDFAILED 0x0002 -#define PBT_APMQUERYSTANDBYFAILED 0x0003 -#define PBT_APMSUSPEND 0x0004 -#define PBT_APMSTANDBY 0x0005 -#define PBT_APMRESUMECRITICAL 0x0006 -#define PBT_APMRESUMESUSPEND 0x0007 -#define PBT_APMRESUMESTANDBY 0x0008 -#define PBT_APMBATTERYLOW 0x0009 -#define PBT_APMPOWERSTATUSCHANGE 0x000A -#define PBT_APMOEMEVENT 0x000B -#define PBT_APMRESUMEAUTOMATIC 0x0012 +#define PBT_APMQUERYSUSPEND 0 +#define PBT_APMQUERYSTANDBY 1 +#define PBT_APMQUERYSUSPENDFAILED 2 +#define PBT_APMQUERYSTANDBYFAILED 3 +#define PBT_APMSUSPEND 4 +#define PBT_APMSTANDBY 5 +#define PBT_APMRESUMECRITICAL 6 +#define PBT_APMRESUMESUSPEND 7 +#define PBT_APMRESUMESTANDBY 8 +#define PBT_APMBATTERYLOW 9 +#define PBT_APMPOWERSTATUSCHANGE 10 +#define PBT_APMOEMEVENT 11 +#define PBT_APMRESUMEAUTOMATIC 18 + +#define PBTF_APMRESUMEFROMFAILURE 1 #endif +/* end pbt.h */ + #define PM_NOREMOVE 0 #define PM_REMOVE 1 #define PM_NOYIELD 2 |