2003-06-06 Danny Smith <dannysmith@users.sourceforge.net>

	* lib/test.c: #include <powerprof.h>.

2003-06-06  James E. Lucas  <xelloss@sourceforge.net>

	* include/powerprof.h: New file.
	* lib/powerprof.def: New file.

2003-06-06  Danny Smith  <dannysmith@users.sourceforge.net>

	* include/winnt (SLIST_HEADER): Add C90 anonymous struct
	protection.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index ed98ee238fa0e6ceba8d46507a8d6d8393f22983..7d2d7333b4fa368300683cb8b9ce92e6024121e9 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,17 @@
+003-06-06  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * lib/test.c: #include <powerprof.h>.
+
+2003-06-06  James E. Lucas  <xelloss@sourceforge.net>
+
+       * include/powerprof.h: New file.
+       * lib/powerprof.def: New file.
+
+2003-06-06  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/winnt (SLIST_HEADER): Add C90 anonymous struct
+       protection.
+
 2003-06-05  Luke Dunstan  <infidel@users.sourceforge.net>
 
        * include/winuser.h (WNDCLASS[AW], WNDCLASSEX[AW]): Change type of

diff --git a/winsup/w32api/include/powrprof.h b/winsup/w32api/include/powrprof.h
new file mode 100644 (file)
index 0000000..dc7d1f3
--- /dev/null
+++ b/winsup/w32api/include/powrprof.h
@@ -0,0 +1,120 @@
+#ifndef _POWRPROF_H
+#define _POWRPROF_H
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define EnableMultiBatteryDisplay 2
+#define EnablePasswordLogon 4
+#define EnableSysTrayBatteryMeter 1
+#define EnableWakeOnRing 8
+#define EnableVideoDimDisplay 16
+#define NEWSCHEME (UINT)-1
+
+#ifndef RC_INVOKED
+#include <ntdef.h>  /* for NTSTATUS */
+typedef struct _GLOBAL_MACHINE_POWER_POLICY{
+   ULONG Revision;
+   SYSTEM_POWER_STATE LidOpenWakeAc;
+   SYSTEM_POWER_STATE LidOpenWakeDc;
+   ULONG BroadcastCapacityResolution;
+} GLOBAL_MACHINE_POWER_POLICY, *PGLOBAL_MACHINE_POWER_POLICY;
+typedef struct _GLOBAL_USER_POWER_POLICY{
+   ULONG Revision;
+   POWER_ACTION_POLICY PowerButtonAc;
+   POWER_ACTION_POLICY PowerButtonDc;
+   POWER_ACTION_POLICY SleepButtonAc;
+   POWER_ACTION_POLICY SleepButtonDc;
+   POWER_ACTION_POLICY LidCloseAc;
+   POWER_ACTION_POLICY LidCloseDc;
+   SYSTEM_POWER_LEVEL DischargePolicy[NUM_DISCHARGE_POLICIES];
+   ULONG GlobalFlags;
+} GLOBAL_USER_POWER_POLICY, *PGLOBAL_USER_POWER_POLICY;
+typedef struct _GLOBAL_POWER_POLICY{
+   GLOBAL_USER_POWER_POLICY user;
+   GLOBAL_MACHINE_POWER_POLICY mach;
+} GLOBAL_POWER_POLICY, *PGLOBAL_POWER_POLICY;
+typedef struct _MACHINE_POWER_POLICY{
+   ULONG Revision;
+   SYSTEM_POWER_STATE MinSleepAc;
+   SYSTEM_POWER_STATE MinSleepDc;
+   SYSTEM_POWER_STATE ReducedLatencySleepAc;
+   SYSTEM_POWER_STATE ReducedLatencySleepDc;
+   ULONG DozeTimeoutAc;
+   ULONG DozeTimeoutDc;
+   ULONG DozeS4TimeoutAc;
+   ULONG DozeS4TimeoutDc;
+   UCHAR MinThrottleAc;
+   UCHAR MinThrottleDc;
+   UCHAR pad1[2];
+   POWER_ACTION_POLICY OverThrottledAc;
+   POWER_ACTION_POLICY OverThrottledDc;
+} MACHINE_POWER_POLICY, *PMACHINE_POWER_POLICY;
+typedef struct _MACHINE_PROCESSOR_POWER_POLICY {
+   ULONG Revision;
+   PROCESSOR_POWER_POLICY ProcessorPolicyAc;    
+   PROCESSOR_POWER_POLICY ProcessorPolicyDc;    
+} MACHINE_PROCESSOR_POWER_POLICY, *PMACHINE_PROCESSOR_POWER_POLICY;
+typedef struct _USER_POWER_POLICY{
+   ULONG Revision;
+   POWER_ACTION_POLICY IdleAc;
+   POWER_ACTION_POLICY IdleDc;
+   ULONG IdleTimeoutAc;
+   ULONG IdleTimeoutDc;
+   UCHAR IdleSensitivityAc;
+   UCHAR IdleSensitivityDc;
+   UCHAR ThrottlePolicyAc;
+   UCHAR ThrottlePolicyDc;
+   SYSTEM_POWER_STATE MaxSleepAc;
+   SYSTEM_POWER_STATE MaxSleepDc;
+   ULONG Reserved[2];
+   ULONG VideoTimeoutAc;
+   ULONG VideoTimeoutDc;
+   ULONG SpindownTimeoutAc;
+   ULONG SpindownTimeoutDc;
+   BOOLEAN OptimizeForPowerAc;
+   BOOLEAN OptimizeForPowerDc;
+   UCHAR FanThrottleToleranceAc;
+   UCHAR FanThrottleToleranceDc;
+   UCHAR ForcedThrottleAc;
+   UCHAR ForcedThrottleDc;
+} USER_POWER_POLICY, *PUSER_POWER_POLICY;
+typedef struct _POWER_POLICY{
+   USER_POWER_POLICY user;
+   MACHINE_POWER_POLICY mach;
+} POWER_POLICY, *PPOWER_POLICY;
+typedef BOOLEAN (CALLBACK* PWRSCHEMESENUMPROC)(UINT, DWORD, LPTSTR, DWORD, LPTSTR, PPOWER_POLICY, LPARAM);
+typedef BOOLEAN (CALLBACK* PFNNTINITIATEPWRACTION)(POWER_ACTION, SYSTEM_POWER_STATE, ULONG, BOOLEAN);
+NTSTATUS WINAPI CallNtPowerInformation(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG);
+BOOLEAN WINAPI CanUserWritePwrScheme(VOID);
+BOOLEAN WINAPI DeletePwrScheme(UINT);
+BOOLEAN WINAPI EnumPwrSchemes(PWRSCHEMESENUMPROC, LPARAM);
+BOOLEAN WINAPI GetActivePwrScheme(PUINT);
+BOOLEAN WINAPI GetCurrentPowerPolicies(PGLOBAL_POWER_POLICY, PPOWER_POLICY);
+BOOLEAN WINAPI GetPwrCapabilities(PSYSTEM_POWER_CAPABILITIES);
+BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT, PUINT);
+BOOLEAN WINAPI IsAdminOverrideActive(PADMINISTRATOR_POWER_POLICY);
+BOOLEAN WINAPI IsPwrHibernateAllowed(VOID);
+BOOLEAN WINAPI IsPwrShutdownAllowed(VOID);
+BOOLEAN WINAPI IsPwrSuspendAllowed(VOID);
+BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY);
+BOOLEAN WINAPI ReadProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY);
+BOOLEAN WINAPI ReadPwrScheme(UINT, PPOWER_POLICY);
+BOOLEAN WINAPI SetActivePwrScheme(UINT, PGLOBAL_POWER_POLICY, PPOWER_POLICY);
+BOOLEAN WINAPI SetSuspendState(BOOLEAN, BOOLEAN, BOOLEAN);
+BOOLEAN WINAPI WriteGlobalPwrPolicy(PGLOBAL_POWER_POLICY);
+BOOLEAN WINAPI WriteProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY);
+BOOLEAN WINAPI ValidatePowerPolicies(PGLOBAL_POWER_POLICY, PPOWER_POLICY);
+BOOLEAN WINAPI WritePwrScheme(PUINT, LPTSTR, LPTSTR, PPOWER_POLICY);
+
+#endif /* RC_INVOKED */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _POWRPROF_H */

diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index ea87f453c8e260b64dc9bf70c7e41a605bd464eb..496529513575eab6c7b5518dd225cf5c25ae2d9a 100644 (file)
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -2058,11 +2058,11 @@ typedef struct _SINGLE_LIST_ENTRY {
 #define PSLIST_ENTRY PSINGLE_LIST_ENTRY
 typedef union _SLIST_HEADER {
        ULONGLONG Alignment;
-       struct {
+       _ANONYMOUS_STRUCT struct {
                SLIST_ENTRY Next;
                WORD Depth;
                WORD Sequence;
-       };
+       } DUMMYSTRUCTNAME;
 } SLIST_HEADER,*PSLIST_HEADER;
 #endif /* !_SLIST_HEADER_ */
 

diff --git a/winsup/w32api/lib/powrprof.def b/winsup/w32api/lib/powrprof.def
new file mode 100644 (file)
index 0000000..d2ad939
--- /dev/null
+++ b/winsup/w32api/lib/powrprof.def
@@ -0,0 +1,25 @@
+LIBRARY POWRPROF.dll
+EXPORTS
+CallNtPowerInformation@20
+CanUserWritePwrScheme@0
+DeletePwrScheme@4
+EnumPwrSchemes@8
+GetActivePwrScheme@4
+GetCurrentPowerPolicies@8
+GetPwrCapabilities@4
+GetPwrDiskSpindownRange@8
+IsAdminOverrideActive@4
+IsPwrHibernateAllowed@0
+IsPwrShutdownAllowed@0
+IsPwrSuspendAllowed@0
+LoadCurrentPwrScheme@16
+MergeLegacyPwrScheme@16
+ReadGlobalPwrPolicy@4
+ReadProcessorPwrScheme@8
+ReadPwrScheme@8
+SetActivePwrScheme@12
+SetSuspendState@12
+ValidatePowerPolicies@8
+WriteGlobalPwrPolicy@4
+WriteProcessorPwrScheme@8
+WritePwrScheme@16

diff --git a/winsup/w32api/lib/test.c b/winsup/w32api/lib/test.c
index 808981c4340a565de8a694ed934c948f13acd4b8..f9d4f561e739406f62e487b0e37023e9a8183915 100644 (file)
--- a/winsup/w32api/lib/test.c
+++ b/winsup/w32api/lib/test.c
@@ -43,6 +43,7 @@
 #include <ntdef.h>
 #include <ntsecapi.h>
 #include <odbcinst.h>
+#include <powrprof.h>
 #include <psapi.h>
 #include <ras.h>
 #include <rasdlg.h>