2007-03-06 Brandon Sneed <brandon@oqo.com>

        * include/setupapi.h: Added SetupConfigureWmiFromInfSectionA
        Added SetupConfigureWmiFromInfSectionW
        Added SetupConfigureWmiFromInfSection define to unicode and non-unicode sections

        * lib/setupapi.def: Added exports for SetupConfigureWmiFromInfSectionA and W

        * include/winuser.h: Added PBT_APMQUERYSUSPEND
        Added PBT_APMQUERYSTANDBY
        Added PBT_APMQUERYSUSPENDFAILED
        Added PBT_APMQUERYSTANDBYFAILED
        Added PBT_APMSUSPEND
        Added PBT_APMSTANDBY
        Added PBT_APMRESUMECRITICAL
        Added PBT_APMRESUMESUSPEND
        Added PBT_APMRESUMESTANDBY
        Added PBT_APMBATTERYLOW
        Added PBT_APMPOWERSTATUSCHANGE
        Added PBT_APMOEMEVENT
        Added PBT_APMRESUMEAUTOMATIC

        * include/wtsapi32.h: New file

        * include/wingdi.h: Added DM_DISPLAYORIENTATION define for use with DMDO_* defines

6 files changed, 117 insertions, 0 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 9469a7aa5..2c37292b1 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,29 @@
+2007-03-06  Brandon Sneed <brandon@oqo.com>
+
+	* include/setupapi.h: Added SetupConfigureWmiFromInfSectionA
+	Added SetupConfigureWmiFromInfSectionW
+	Added SetupConfigureWmiFromInfSection define to unicode and non-unicode sections
+
+	* lib/setupapi.def: Added exports for SetupConfigureWmiFromInfSectionA and W
+
+	* include/winuser.h: Added PBT_APMQUERYSUSPEND
+	Added PBT_APMQUERYSTANDBY
+	Added PBT_APMQUERYSUSPENDFAILED
+	Added PBT_APMQUERYSTANDBYFAILED
+	Added PBT_APMSUSPEND
+	Added PBT_APMSTANDBY
+	Added PBT_APMRESUMECRITICAL
+	Added PBT_APMRESUMESUSPEND
+	Added PBT_APMRESUMESTANDBY
+	Added PBT_APMBATTERYLOW
+	Added PBT_APMPOWERSTATUSCHANGE
+	Added PBT_APMOEMEVENT
+	Added PBT_APMRESUMEAUTOMATIC
+
+	* include/wtsapi32.h: New file
+
+	* include/wingdi.h: Added DM_DISPLAYORIENTATION define for use with DMDO_* defines
+
 2007-03-05  Jan Nijtmans  <nijtmans@users.sourceforge.net>
 
 	* include/ddeml.h (DdeCreateStringHandleA, DdeCreateStringHandleW): Switch
diff --git a/winsup/w32api/include/setupapi.h b/winsup/w32api/include/setupapi.h
index 4b2ed1e0b..ef38852a2 100644
--- a/winsup/w32api/include/setupapi.h
+++ b/winsup/w32api/include/setupapi.h
@@ -413,6 +413,9 @@ extern "C" {
 #define NDW_INSTALLFLAG_KNOWNCLASS	0x00080000
 #define NDW_INSTALLFLAG_NEEDRESTART	0x00000080
 #define NDW_INSTALLFLAG_NEEDREBOOT	0x00000100
+#if (_SETUPAPI_VER >= 0x0502)
+#define SCWMI_CLOBBER_SECURITY  0x00000001
+#endif
 #define SETDIRID_NOT_FULL_PATH	0x00000001
 #define SP_COPY_DELETESOURCE	0x0000001
 #define SP_COPY_REPLACEONLY	0x0000002
@@ -1049,6 +1052,10 @@ WINSETUPAPI VOID WINAPI SetupCloseInfFile(HINF);
 WINSETUPAPI VOID WINAPI SetupCloseLog(VOID);
 WINSETUPAPI BOOL WINAPI SetupCommitFileQueueA(HWND,HSPFILEQ,PSP_FILE_CALLBACK_A,PVOID);
 WINSETUPAPI BOOL WINAPI SetupCommitFileQueueW(HWND,HSPFILEQ,PSP_FILE_CALLBACK_W,PVOID);
+#if (_SETUPAPI_VER >= 0x502)
+WINSETUPAPI BOOL WINAPI SetupConfigureWmiFromInfSectionA(HINF,PCSTR,DWORD);
+WINSETUPAPI BOOL WINAPI SetupConfigureWmiFromInfSectionW(HINF,PCWSTR,DWORD);
+#endif
 WINSETUPAPI UINT WINAPI SetupCopyErrorA(HWND,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,UINT,DWORD,PSTR,DWORD,PDWORD);
 WINSETUPAPI UINT WINAPI SetupCopyErrorW(HWND,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,UINT,DWORD,PWSTR,DWORD,PDWORD);
 WINSETUPAPI BOOL WINAPI SetupCopyOEMInfA(PCSTR,PCSTR,DWORD,DWORD,PSTR,DWORD,PDWORD,PSTR*);
@@ -1336,6 +1343,9 @@ WINSETUPAPI BOOL WINAPI SetupTerminateFileLog(HSPFILELOG);
 #define SetupAdjustDiskSpaceList	SetupAdjustDiskSpaceListW
 #define SetupBackupError	SetupBackupErrorW
 #define SetupCommitFileQueue	SetupCommitFileQueueW
+#if (_SETUPAPI_VER >= 0x0502)
+#define SetupConfigureWmiFromInfSection SetupConfigureWmiFromInfSectionW
+#endif
 #define SetupCopyError	SetupCopyErrorW
 #define SetupCopyOEMInf	SetupCopyOEMInfW
 #define SetupCreateDiskSpaceList	SetupCreateDiskSpaceListW
@@ -1455,6 +1465,9 @@ WINSETUPAPI BOOL WINAPI SetupTerminateFileLog(HSPFILELOG);
 #define SetupAdjustDiskSpaceList	SetupAdjustDiskSpaceListA
 #define SetupBackupError	SetupBackupErrorA
 #define SetupCommitFileQueue	SetupCommitFileQueueA
+#if (_SETUPAPI_VER >= 0x0502)
+#define SetupConfigureWmiFromInfSection SetupConfigureWmiFromInfSectionW
+#endif
 #define SetupCopyError	SetupCopyErrorA
 #define SetupCopyOEMInf	SetupCopyOEMInfA
 #define SetupCreateDiskSpaceList	SetupCreateDiskSpaceListA
diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h
index f50e69888..6bb2fd620 100644
--- a/winsup/w32api/include/wingdi.h
+++ b/winsup/w32api/include/wingdi.h
@@ -1192,6 +1192,7 @@ extern "C" {
 #endif
 #if(WINVER >= 0x0501)
 #define DM_DISPLAYFIXEDOUTPUT 0x20000000
+#define DM_DISPLAYORIENTATION 0x00000080
 #define DMDO_DEFAULT 0x00000000
 #define DMDO_90 0x00000001
 #define DMDO_180 0x00000002
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 7a3885e1f..4a0145787 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -1085,6 +1085,21 @@ extern "C" {
 #define MOUSEEVENTF_XDOWN 0x00000080
 #define MOUSEEVENTF_XUP 0x00000100
 #endif
+#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
+#endif
 #define PM_NOREMOVE 0
 #define PM_REMOVE 1
 #define PM_NOYIELD 2
diff --git a/winsup/w32api/include/wtsapi32.h b/winsup/w32api/include/wtsapi32.h
new file mode 100644
index 000000000..a7213b882
--- /dev/null
+++ b/winsup/w32api/include/wtsapi32.h
@@ -0,0 +1,60 @@
+#ifndef _WTSAPI32_H
+#define _WTSAPI32_H
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+	
+#if (_WIN32_WINNT >= 0x0501)
+// session notification message
+#define WM_WTSSESSION_CHANGE		0x02B1
+
+// session notification message flags
+#define WTS_CONSOLE_CONNECT			0x1
+#define WTS_CONSOLE_DISCONNECT		0x2
+#define WTS_REMOTE_CONNECT			0x3
+#define WTS_REMOTE_DISCONNECT		0x4
+#define WTS_SESSION_LOGON			0x5
+#define WTS_SESSION_LOGOFF			0x6
+#define WTS_SESSION_LOCK			0x7
+#define WTS_SESSION_UNLOCK			0x8
+#define WTS_SESSION_REMOTE_CONTROL	0x9
+
+// WTSRegisterSessionNotifiction flags
+#define NOTIFY_FOR_THIS_SESSION		0
+#define NOTIFY_FOR_ALL_SESSIONS		1
+
+BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags);
+BOOL WINAPI WTSUnRegisterSessionNotification(HWND hWnd);
+#endif /* _WIN32_WINNT >= 0x0501 */
+
+#if (_WIN32_WINNT >= 0x0500)
+
+// WTSWaitSystemEvent local server handle
+#define WTS_CURRENT_SERVER_HANDLE	0
+
+// WTSWaitSystemEvent flags
+#define WTS_EVENT_NONE				0x00000000
+#define WTS_EVENT_CREATE			0x00000001
+#define WTS_EVENT_DELETE			0x00000002
+#define WTS_EVENT_RENAME			0x00000004
+#define WTS_EVENT_CONNECT			0x00000008
+#define WTS_EVENT_DISCONNECT		0x00000010
+#define WTS_EVENT_LOGON				0x00000020
+#define WTS_EVENT_LOGOFF			0x00000040
+#define WTS_EVENT_STATECHANGE		0x00000080
+#define WTS_EVENT_LICENSE			0x00000100
+#define WTS_EVENT_ALL				0x7FFFFFFF
+#define WTS_EVENT_FLUSH				0x80000000
+
+BOOL WINAPI WTSWaitSystemEvent(HANDLE hServer, DWORD EventMask, DWORD* pEventFlags);
+#endif /* _WIN32_WINNT >= 0x0500 */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _WTSAPI32_H */
diff --git a/winsup/w32api/lib/setupapi.def b/winsup/w32api/lib/setupapi.def
index 0ba3ebbf2..a48cfc19d 100644
--- a/winsup/w32api/lib/setupapi.def
+++ b/winsup/w32api/lib/setupapi.def
@@ -155,6 +155,8 @@ SetupCopyErrorA@44
 SetupCopyErrorW@44
 SetupCopyOEMInfA@32
 SetupCopyOEMInfW@32
+SetupConfigureWmiFromInfSectionA@12
+SetupConfigureWmiFromInfSectionW@12
 SetupCreateDiskSpaceListA@12
 SetupCreateDiskSpaceListW@12
 SetupDecompressOrCopyFileA@12