diff options
| -rw-r--r-- | winsup/w32api/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/w32api/include/ddk/ndis.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/ddk/ntpoapi.h | 26 | ||||
| -rw-r--r-- | winsup/w32api/include/ddk/winddk.h | 16 | ||||
| -rw-r--r-- | winsup/w32api/include/winnt.h | 26 |
5 files changed, 35 insertions, 43 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 21ed314..82ea046 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,11 @@ +2003-06-02 Danny Smith <dannysmith@users.sourceforge.net> + + * include/ddk/ntpoapi.h (POWER_INFORMATION_LEVEL): Remove. + * include/winnt.h (POWER_INFORMATION_LEVEL): Add. + * include/ddk/winddk.h (SINGLE_LIST_ENTRY,SLIST_HEADER): + Remove. + * include/ddk/ndis.h (NdisAllocateSpinLock): Add missing '\'. + 2003-05-30 Mattia Barbon <mbarbon@dsi.unive.it> * lib/oleacc.def: New file. diff --git a/winsup/w32api/include/ddk/ndis.h b/winsup/w32api/include/ddk/ndis.h index a1133f9..d1d4651 100644 --- a/winsup/w32api/include/ddk/ndis.h +++ b/winsup/w32api/include/ddk/ndis.h @@ -2524,7 +2524,7 @@ NdisUnicodeStringToAnsiString( * NdisAllocateSpinLock( * IN PNDIS_SPIN_LOCK SpinLock); */ -#define NdisAllocateSpinLock(_SpinLock) +#define NdisAllocateSpinLock(_SpinLock) \ KeInitializeSpinLock(&(_SpinLock)->SpinLock) /* diff --git a/winsup/w32api/include/ddk/ntpoapi.h b/winsup/w32api/include/ddk/ntpoapi.h index d1cdc64..d33de71 100644 --- a/winsup/w32api/include/ddk/ntpoapi.h +++ b/winsup/w32api/include/ddk/ntpoapi.h @@ -36,32 +36,6 @@ extern "C" { #include "ntddk.h" #include "batclass.h" -typedef enum _POWER_INFORMATION_LEVEL { - SystemPowerPolicyAc, - SystemPowerPolicyDc, - VerifySystemPolicyAc, - VerifySystemPolicyDc, - SystemPowerCapabilities, - SystemBatteryState, - SystemPowerStateHandler, - ProcessorStateHandler, - SystemPowerPolicyCurrent, - AdministratorPowerPolicy, - SystemReserveHiberFile, - ProcessorInformation, - SystemPowerInformation, - ProcessorStateHandler2, - LastWakeTime, - LastSleepTime, - SystemExecutionState, - SystemPowerStateNotifyHandler, - ProcessorPowerPolicyAc, - ProcessorPowerPolicyDc, - VerifyProcessorPowerPolicyAc, - VerifyProcessorPowerPolicyDc, - ProcessorPowerPolicyCurrent -} POWER_INFORMATION_LEVEL; - #define POWER_PERF_SCALE 100 #define PERF_LEVEL_TO_PERCENT(x) (((x) * 1000) / (POWER_PERF_SCALE * 10)) #define PERCENT_TO_PERF_LEVEL(x) (((x) * POWER_PERF_SCALE * 10) / 1000) diff --git a/winsup/w32api/include/ddk/winddk.h b/winsup/w32api/include/ddk/winddk.h index 9863133..f724377 100644 --- a/winsup/w32api/include/ddk/winddk.h +++ b/winsup/w32api/include/ddk/winddk.h @@ -138,22 +138,6 @@ typedef enum _MODE { MaximumMode } MODE; -typedef struct _SINGLE_LIST_ENTRY { - struct _SINGLE_LIST_ENTRY *Next; -} SINGLE_LIST_ENTRY, *PSINGLE_LIST_ENTRY; - -#define SLIST_ENTRY SINGLE_LIST_ENTRY -#define PSLIST_ENTRY PSINGLE_LIST_ENTRY - -typedef union _SLIST_HEADER { - ULONGLONG Alignment; - struct { - SLIST_ENTRY Next; - USHORT Depth; - USHORT Sequence; - }; -} SLIST_HEADER, *PSLIST_HEADER; - /* Structures not exposed to drivers */ typedef struct _IO_TIMER *PIO_TIMER; diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index 4d91016..ea87f45 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -2962,6 +2962,32 @@ typedef struct _SYSTEM_BATTERY_STATE { ULONG DefaultAlert2; } SYSTEM_BATTERY_STATE, *PSYSTEM_BATTERY_STATE; +typedef enum _POWER_INFORMATION_LEVEL { + SystemPowerPolicyAc, + SystemPowerPolicyDc, + VerifySystemPolicyAc, + VerifySystemPolicyDc, + SystemPowerCapabilities, + SystemBatteryState, + SystemPowerStateHandler, + ProcessorStateHandler, + SystemPowerPolicyCurrent, + AdministratorPowerPolicy, + SystemReserveHiberFile, + ProcessorInformation, + SystemPowerInformation, + ProcessorStateHandler2, + LastWakeTime, + LastSleepTime, + SystemExecutionState, + SystemPowerStateNotifyHandler, + ProcessorPowerPolicyAc, + ProcessorPowerPolicyDc, + VerifyProcessorPowerPolicyAc, + VerifyProcessorPowerPolicyDc, + ProcessorPowerPolicyCurrent +} POWER_INFORMATION_LEVEL; + #if 1 /* (WIN32_WINNT >= 0x0500) */ typedef struct _SYSTEM_POWER_INFORMATION { ULONG MaxIdlenessAllowed; |