Move some ddk defines to winnt.h as per MSDN documentation

	* include/ddk/batclass.h (BATTERY_REPORTING_SCALE)
	Move structure from here...
	* include/winnt.h (BATTERY_REPORTING_SCALE): To here.

	* include/ddk/ntapi.h (JOBOBJECT_*):
	Remove structures and enums definitions.
  	(JOB_OBJECT*): Move defines from here...
	* include/winnt.h (JOB_OBJECT* ): To here.

	* include/ddk/ntpoapi.h (LATENCY_TIME, POWER_ACTION_POLICY,
	SYSTEM_POWER_LEVEL, SYSTEM_POWER_POLICY,
	PROCESSOR_POWER_POLICY_INFO, PROCESSOR_POWER_POLICY,
	ADMINISTRATOR_POWER_POLICY, SYSTEM_POWER_INFORMATION,
	PROCESSOR_POWER_INFORMATION, SYSTEM_BATTERY_STATE,
	SYSTEM_POWER_CAPABILITIES): Move enums, structures
	and associated defines from here ...
	* include/winnt.h: (LATENCY_TIME, POWER_ACTION_POLICY,
	SYSTEM_POWER_LEVEL, SYSTEM_POWER_POLICY,
	PROCESSOR_POWER_POLICY_INFO, PROCESSOR_POWER_POLICY,
	ADMINISTRATOR_POWER_POLICY, SYSTEM_POWER_INFORMATION,
	PROCESSOR_POWER_INFORMATION, SYSTEM_BATTERY_STATE,
	SYSTEM_POWER_CAPABILITIES):To here.

	* include/ddk/winddk.h (DEVICE_POWER_STATE,
	SYSTEM_POWER_STATE, POWER_ACTION): Move enums
	from here...
	* include/winnt.h (DEVICE_POWER_STATE,
	SYSTEM_POWER_STATE, POWER_ACTION): To here.

1 files changed, 0 insertions, 165 deletions

diff --git a/winsup/w32api/include/ddk/ntpoapi.h b/winsup/w32api/include/ddk/ntpoapi.h
index 2ae9480f8..d1cdc64c5 100644
--- a/winsup/w32api/include/ddk/ntpoapi.h
+++ b/winsup/w32api/include/ddk/ntpoapi.h
@@ -36,19 +36,6 @@ extern "C" {
 #include "ntddk.h"
 #include "batclass.h"
 
-
-#define ES_SYSTEM_REQUIRED                0x00000001
-#define ES_DISPLAY_REQUIRED               0x00000002
-#define ES_USER_PRESENT                   0x00000004
-#define ES_CONTINUOUS                     0x80000000
-
-typedef enum _LATENCY_TIME {
-	LT_DONT_CARE,
-	LT_LOWEST_LATENCY
-} LATENCY_TIME, *PLATENCY_TIME;
-
-#define POWER_SYSTEM_MAXIMUM              PowerSystemMaximum
-
 typedef enum _POWER_INFORMATION_LEVEL {
 	SystemPowerPolicyAc,
 	SystemPowerPolicyDc,
@@ -196,107 +183,6 @@ typedef struct _PROCESSOR_STATE_HANDLER2 {
 	PROCESSOR_PERF_LEVEL  PerfLevel[1];
 } PROCESSOR_STATE_HANDLER2, *PPROCESSOR_STATE_HANDLER2;
 
-/* POWER_ACTION_POLICY.Flags constants */
-#define POWER_ACTION_QUERY_ALLOWED        0x00000001
-#define POWER_ACTION_UI_ALLOWED           0x00000002
-#define POWER_ACTION_OVERRIDE_APPS        0x00000004
-#define POWER_ACTION_LIGHTEST_FIRST       0x10000000
-#define POWER_ACTION_LOCK_CONSOLE         0x20000000
-#define POWER_ACTION_DISABLE_WAKES        0x40000000
-#define POWER_ACTION_CRITICAL             0x80000000
-
-/* POWER_ACTION_POLICY.EventCode constants */
-#define POWER_LEVEL_USER_NOTIFY_TEXT      0x00000001
-#define POWER_LEVEL_USER_NOTIFY_SOUND     0x00000002
-#define POWER_LEVEL_USER_NOTIFY_EXEC      0x00000004
-#define POWER_USER_NOTIFY_BUTTON          0x00000008
-#define POWER_USER_NOTIFY_SHUTDOWN        0x00000010
-#define POWER_FORCE_TRIGGER_RESET         0x80000000
-
-typedef struct _POWER_ACTION_POLICY {
-	POWER_ACTION  Action;
-	ULONG  Flags;
-	ULONG  EventCode;
-} POWER_ACTION_POLICY, *PPOWER_ACTION_POLICY;
-
-typedef struct _SYSTEM_POWER_LEVEL {
-	BOOLEAN  Enable;
-	UCHAR  Spare[3];
-	ULONG  BatteryLevel;
-	POWER_ACTION_POLICY  PowerPolicy;
-	SYSTEM_POWER_STATE  MinSystemState;
-} SYSTEM_POWER_LEVEL, *PSYSTEM_POWER_LEVEL;
-
-#define DISCHARGE_POLICY_CRITICAL         0
-#define DISCHARGE_POLICY_LOW              1
-#define NUM_DISCHARGE_POLICIES            4
-
-#define PO_THROTTLE_NONE                  0
-#define PO_THROTTLE_CONSTANT              1
-#define PO_THROTTLE_DEGRADE               2
-#define PO_THROTTLE_ADAPTIVE              3
-#define PO_THROTTLE_MAXIMUM               4
-
-typedef struct _SYSTEM_POWER_POLICY {
-	ULONG  Revision;
-	POWER_ACTION_POLICY  PowerButton;
-	POWER_ACTION_POLICY  SleepButton;
-	POWER_ACTION_POLICY  LidClose;
-	SYSTEM_POWER_STATE  LidOpenWake;
-	ULONG  Reserved;
-	POWER_ACTION_POLICY  Idle;
-	ULONG  IdleTimeout;
-	UCHAR  IdleSensitivity;
-	UCHAR  DynamicThrottle;
-	UCHAR  Spare2[2];
-	SYSTEM_POWER_STATE  MinSleep;
-	SYSTEM_POWER_STATE  MaxSleep;
-	SYSTEM_POWER_STATE  ReducedLatencySleep;
-	ULONG  WinLogonFlags;
-	ULONG  Spare3;
-	ULONG  DozeS4Timeout;
-	ULONG  BroadcastCapacityResolution;
-	SYSTEM_POWER_LEVEL  DischargePolicy[NUM_DISCHARGE_POLICIES];
-	ULONG  VideoTimeout;
-	BOOLEAN  VideoDimDisplay;
-	ULONG  VideoReserved[3];
-	ULONG  SpindownTimeout;
-	BOOLEAN  OptimizeForPower;
-	UCHAR  FanThrottleTolerance;
-	UCHAR  ForcedThrottle;
-	UCHAR  MinThrottle;
-	POWER_ACTION_POLICY  OverThrottled;
-} SYSTEM_POWER_POLICY, *PSYSTEM_POWER_POLICY;
-
-typedef struct _PROCESSOR_POWER_POLICY_INFO {
-	ULONG  TimeCheck;
-	ULONG  DemoteLimit;
-	ULONG  PromoteLimit;
-	UCHAR  DemotePercent;
-	UCHAR  PromotePercent;
-	UCHAR  Spare[2];
-	ULONG  AllowDemotion : 1;
-	ULONG  AllowPromotion : 1;
-	ULONG  Reserved : 30;
-} PROCESSOR_POWER_POLICY_INFO, *PPROCESSOR_POWER_POLICY_INFO;
-
-typedef struct _PROCESSOR_POWER_POLICY {
-	ULONG  Revision;
-	UCHAR  DynamicThrottle;
-	UCHAR  Spare[3];
-	ULONG  Reserved;
-	ULONG  PolicyCount;
-	PROCESSOR_POWER_POLICY_INFO  Policy[3];
-} PROCESSOR_POWER_POLICY, *PPROCESSOR_POWER_POLICY;
-
-typedef struct _ADMINISTRATOR_POWER_POLICY {
-  SYSTEM_POWER_STATE  MinSleep;
-  SYSTEM_POWER_STATE  MaxSleep;
-  ULONG  MinVideoTimeout;
-  ULONG  MaxVideoTimeout;
-  ULONG  MinSpindownTimeout;
-  ULONG  MaxSpindownTimeout;
-} ADMINISTRATOR_POWER_POLICY, *PADMINISTRATOR_POWER_POLICY;
 
 NTOSAPI
 NTSTATUS
@@ -355,13 +241,6 @@ NtRequestDeviceWakeup(
 
 #define WINLOGON_LOCK_ON_SLEEP            0x00000001
 
-typedef struct _SYSTEM_POWER_INFORMATION {
-  ULONG  MaxIdlenessAllowed;
-  ULONG  Idleness;
-  ULONG  TimeRemaining;
-  UCHAR  CoolingMode;
-} SYSTEM_POWER_INFORMATION, *PSYSTEM_POWER_INFORMATION;
-
 typedef struct _PROCESSOR_POWER_INFORMATION {
   ULONG  Number;
   ULONG  MaxMhz;
@@ -371,50 +250,6 @@ typedef struct _PROCESSOR_POWER_INFORMATION {
   ULONG  CurrentIdleState;
 } PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION;
 
-typedef struct _SYSTEM_BATTERY_STATE {
-  BOOLEAN  AcOnLine;
-  BOOLEAN  BatteryPresent;
-  BOOLEAN  Charging;
-  BOOLEAN  Discharging;
-  BOOLEAN  Spare1[4];
-  ULONG  MaxCapacity;
-  ULONG  RemainingCapacity;
-  ULONG  Rate;
-  ULONG  EstimatedTime;
-  ULONG  DefaultAlert1;
-  ULONG  DefaultAlert2;
-} SYSTEM_BATTERY_STATE, *PSYSTEM_BATTERY_STATE;
-
-typedef struct _SYSTEM_POWER_CAPABILITIES {
-  BOOLEAN  PowerButtonPresent;
-  BOOLEAN  SleepButtonPresent;
-  BOOLEAN  LidPresent;
-  BOOLEAN  SystemS1;
-  BOOLEAN  SystemS2;
-  BOOLEAN  SystemS3;
-  BOOLEAN  SystemS4;
-  BOOLEAN  SystemS5;
-  BOOLEAN  HiberFilePresent;
-  BOOLEAN  FullWake;
-  BOOLEAN  VideoDimPresent;
-  BOOLEAN  ApmPresent;
-  BOOLEAN  UpsPresent;
-  BOOLEAN  ThermalControl;
-  BOOLEAN  ProcessorThrottle;
-  UCHAR  ProcessorMinThrottle;
-  UCHAR  ProcessorMaxThrottle;
-  UCHAR  spare2[4];
-  BOOLEAN  DiskSpinDown;
-  UCHAR  spare3[8];
-  BOOLEAN  SystemBatteriesPresent;
-  BOOLEAN  BatteriesAreShortTerm;
-  BATTERY_REPORTING_SCALE  BatteryScale[3];
-  SYSTEM_POWER_STATE  AcOnLineWake;
-  SYSTEM_POWER_STATE  SoftLidWake;
-  SYSTEM_POWER_STATE  RtcWake;
-  SYSTEM_POWER_STATE  MinDeviceWakeState;
-  SYSTEM_POWER_STATE  DefaultLowLatencyWake;
-} SYSTEM_POWER_CAPABILITIES, *PSYSTEM_POWER_CAPABILITIES;
 
 #pragma pack(pop)