Fix indentation, remove trailing whitespace and sort prototypes. Modified: trunk/reactos/include/ndk/dbgktypes.h Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/halfuncs.h Modified: trunk/reactos/include/ndk/haltypes.h Modified: trunk/reactos/include/ndk/kdtypes.h Modified: trunk/reactos/include/ndk/kefuncs.h Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/ldrfuncs.h Modified: trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/include/ndk/lpctypes.h Modified: trunk/reactos/include/ndk/mmfuncs.h Modified: trunk/reactos/include/ndk/obtypes.h Modified: trunk/reactos/include/ndk/potypes.h Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/sefuncs.h Modified: trunk/reactos/include/ndk/setypes.h Modified: trunk/reactos/include/ndk/umfuncs.h Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/include/ndk/zwtypes.h _____
Modified: trunk/reactos/include/ndk/dbgktypes.h --- trunk/reactos/include/ndk/dbgktypes.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/dbgktypes.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -23,15 +23,15 @@
typedef enum _DEBUGOBJECTINFOCLASS { - DebugObjectUnusedInformation, - DebugObjectKillProcessOnExitInformation -} DEBUGOBJECTINFOCLASS, * PDEBUGOBJECTINFOCLASS; + DebugObjectUnusedInformation, + DebugObjectKillProcessOnExitInformation +} DEBUGOBJECTINFOCLASS, *PDEBUGOBJECTINFOCLASS;
/* TYPES *********************************************************************/
typedef struct _DEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION { - ULONG KillProcessOnExit; + ULONG KillProcessOnExit; } DEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION, * PDEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION;
@@ -134,6 +134,6 @@ DBGKM_LOAD_DLL LoadDll; DBGKM_UNLOAD_DLL UnloadDll; } StateInfo; -} DBGUI_WAIT_STATE_CHANGE, * PDBGUI_WAIT_STATE_CHANGE; +} DBGUI_WAIT_STATE_CHANGE, *PDBGUI_WAIT_STATE_CHANGE;
#endif _____
Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/extypes.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -42,7 +42,7 @@
/* You'll need the IFS for these, so let's not force everyone to have it */ #ifdef _NTIFS_ -typedef struct _EX_QUEUE_WORKER_INFO +typedef struct _EX_QUEUE_WORKER_INFO { UCHAR QueueDisabled:1; UCHAR MakeThreadsAsNecessary:1; @@ -50,14 +50,14 @@ ULONG WorkerCount:29; } EX_QUEUE_WORKER_INFO, *PEX_QUEUE_WORKER_INFO;
-typedef struct _EX_WORK_QUEUE +typedef struct _EX_WORK_QUEUE { KQUEUE WorkerQueue; ULONG DynamicThreadCount; ULONG WorkItemsProcessed; ULONG WorkItemsProcessedLastPass; ULONG QueueDepthLastPass; - EX_QUEUE_WORKER_INFO Info; + EX_QUEUE_WORKER_INFO Info; } EX_WORK_QUEUE, *PEX_WORK_QUEUE; #endif
@@ -71,11 +71,11 @@ }; } EX_FAST_REF, *PEX_FAST_REF;
-typedef struct _EX_PUSH_LOCK +typedef struct _EX_PUSH_LOCK { - union + union { - struct + struct { ULONG Waiting:1; ULONG Exclusive:1; @@ -86,12 +86,12 @@ }; } EX_PUSH_LOCK, *PEX_PUSH_LOCK;
-typedef struct _HANDLE_TABLE_ENTRY_INFO +typedef struct _HANDLE_TABLE_ENTRY_INFO { ULONG AuditMask; } HANDLE_TABLE_ENTRY_INFO, *PHANDLE_TABLE_ENTRY_INFO;
-typedef struct _RUNDOWN_DESCRIPTOR +typedef struct _RUNDOWN_DESCRIPTOR { ULONG_PTR References; KEVENT RundownEvent; @@ -105,16 +105,16 @@ ULONG AllowMultipleCallbacks; } CALLBACK_OBJECT , *PCALLBACK_OBJECT;
-typedef struct _HANDLE_TABLE_ENTRY +typedef struct _HANDLE_TABLE_ENTRY { - union + union { PVOID Object; ULONG_PTR ObAttributes; PHANDLE_TABLE_ENTRY_INFO InfoTable; ULONG_PTR Value; } u1; - union + union { ULONG GrantedAccess; USHORT GrantedAccessIndex; _____
Modified: trunk/reactos/include/ndk/halfuncs.h --- trunk/reactos/include/ndk/halfuncs.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/halfuncs.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -35,7 +35,7 @@
IN PDRIVER_CONTROL ExecutionRoutine );
-BOOLEAN +BOOLEAN STDCALL HalBeginSystemInterrupt( ULONG Vector, @@ -136,7 +136,7 @@ ULONG Unknown1, ULONG Unknown2 ); - + VOID STDCALL IoAssignDriveLetters( _____
Modified: trunk/reactos/include/ndk/haltypes.h --- trunk/reactos/include/ndk/haltypes.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/haltypes.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -34,12 +34,12 @@
/* ENUMERATIONS **************************************************************/ typedef enum _FIRMWARE_ENTRY { - HalHaltRoutine, - HalPowerDownRoutine, - HalRestartRoutine, - HalRebootRoutine, - HalInteractiveModeRoutine, - HalMaximumRoutine + HalHaltRoutine, + HalPowerDownRoutine, + HalRestartRoutine, + HalRebootRoutine, + HalInteractiveModeRoutine, + HalMaximumRoutine } FIRMWARE_REENTRY, *PFIRMWARE_REENTRY;
/* TYPES *********************************************************************/ @@ -55,35 +55,35 @@ extern NTOSAPI PHAL_PRIVATE_DISPATCH HalPrivateDispatchTable; #endif
-#define HAL_PRIVATE_DISPATCH_VERSION 1 +#define HAL_PRIVATE_DISPATCH_VERSION 1
-typedef struct _LOADER_MODULE +typedef struct _LOADER_MODULE { - ULONG ModStart; - ULONG ModEnd; - ULONG String; - ULONG Reserved; + ULONG ModStart; + ULONG ModEnd; + ULONG String; + ULONG Reserved; } LOADER_MODULE, *PLOADER_MODULE;
typedef struct _LOADER_PARAMETER_BLOCK { - ULONG Flags; - ULONG MemLower; - ULONG MemHigher; - ULONG BootDevice; - ULONG CommandLine; - ULONG ModsCount; - ULONG ModsAddr; - UCHAR Syms[12]; - ULONG MmapLength; - ULONG MmapAddr; - ULONG DrivesCount; - ULONG DrivesAddr; - ULONG ConfigTable; - ULONG BootLoaderName; - ULONG PageDirectoryStart; - ULONG PageDirectoryEnd; - ULONG KernelBase; + ULONG Flags; + ULONG MemLower; + ULONG MemHigher; + ULONG BootDevice; + ULONG CommandLine; + ULONG ModsCount; + ULONG ModsAddr; + UCHAR Syms[12]; + ULONG MmapLength; + ULONG MmapAddr; + ULONG DrivesCount; + ULONG DrivesAddr; + ULONG ConfigTable; + ULONG BootLoaderName; + ULONG PageDirectoryStart; + ULONG PageDirectoryEnd; + ULONG KernelBase; } LOADER_PARAMETER_BLOCK, *PLOADER_PARAMETER_BLOCK;
#endif _____
Modified: trunk/reactos/include/ndk/kdtypes.h --- trunk/reactos/include/ndk/kdtypes.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/kdtypes.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -19,18 +19,18 @@
typedef enum _DEBUG_CONTROL_CODE { - DebugGetTraceInformation = 1, - DebugSetInternalBreakpoint, - DebugSetSpecialCall, - DebugClearSpecialCalls, - DebugQuerySpecialCalls, - DebugDbgBreakPoint, - DebugDbgLoadSymbols + DebugGetTraceInformation = 1, + DebugSetInternalBreakpoint, + DebugSetSpecialCall, + DebugClearSpecialCalls, + DebugQuerySpecialCalls, + DebugDbgBreakPoint, + DebugDbgLoadSymbols } DEBUG_CONTROL_CODE;
/* TYPES *********************************************************************/
-typedef struct _KD_PORT_INFORMATION +typedef struct _KD_PORT_INFORMATION { ULONG ComPort; ULONG BaudRate; _____
Modified: trunk/reactos/include/ndk/kefuncs.h --- trunk/reactos/include/ndk/kefuncs.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/kefuncs.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -16,7 +16,7 @@
/* PROTOTYPES ****************************************************************/
-VOID +VOID STDCALL KeInitializeApc( IN PKAPC Apc, @@ -27,7 +27,7 @@ IN PKNORMAL_ROUTINE NormalRoutine, IN KPROCESSOR_MODE Mode, IN PVOID Context -); +);
VOID STDCALL @@ -48,9 +48,9 @@ VOID STDCALL KiDeliverApc( - IN KPROCESSOR_MODE PreviousMode, - IN PVOID Reserved, - IN PKTRAP_FRAME TrapFrame + IN KPROCESSOR_MODE PreviousMode, + IN PVOID Reserved, + IN PKTRAP_FRAME TrapFrame );
VOID @@ -81,7 +81,7 @@ KeQueryRuntimeThread( IN PKTHREAD Thread, OUT PULONG UserTime - ); + );
BOOLEAN STDCALL @@ -104,10 +104,10 @@ IN PUCHAR Component );
-VOID +VOID STDCALL KeTerminateThread( - IN KPRIORITY Increment + IN KPRIORITY Increment );
BOOLEAN @@ -127,7 +127,7 @@ IN PKTHREAD *Thread OPTIONAL );
-PCONFIGURATION_COMPONENT_DATA +PCONFIGURATION_COMPONENT_DATA STDCALL KeFindConfigurationNextEntry( IN PCONFIGURATION_COMPONENT_DATA Child, @@ -136,8 +136,8 @@ IN PULONG ComponentKey OPTIONAL, IN PCONFIGURATION_COMPONENT_DATA *NextLink ); - -PCONFIGURATION_COMPONENT_DATA + +PCONFIGURATION_COMPONENT_DATA STDCALL KeFindConfigurationEntry( IN PCONFIGURATION_COMPONENT_DATA Child, @@ -189,7 +189,7 @@ PKTHREAD Thread, KAFFINITY Affinity ); - + VOID STDCALL KeSetSystemAffinityThread( @@ -199,11 +199,11 @@ NTSTATUS STDCALL KeUserModeCallback( - IN ULONG FunctionID, - IN PVOID InputBuffer, - IN ULONG InputLength, - OUT PVOID *OutputBuffer, - OUT PULONG OutputLength + IN ULONG FunctionID, + IN PVOID InputBuffer, + IN ULONG InputLength, + OUT PVOID *OutputBuffer, + OUT PULONG OutputLength );
VOID @@ -228,15 +228,15 @@ CHAR ProcessorNumber, BOOLEAN FloatingSave ); - + BOOLEAN -STDCALL +STDCALL KeConnectInterrupt( PKINTERRUPT InterruptObject );
BOOLEAN -STDCALL +STDCALL KeDisconnectInterrupt( PKINTERRUPT InterruptObject ); @@ -266,7 +266,7 @@ IN PKMUTANT Mutant, IN BOOLEAN InitialOwner ); - + LONG STDCALL KeReleaseMutant( @@ -282,8 +282,8 @@ IN NTSTATUS ExceptionCode );
-VOID +VOID STDCALL KeFlushWriteBuffer(VOID); - + #endif _____
Modified: trunk/reactos/include/ndk/ketypes.h --- trunk/reactos/include/ndk/ketypes.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/ketypes.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -40,7 +40,7 @@
/* TYPES *********************************************************************/
-typedef struct _CONFIGURATION_COMPONENT_DATA +typedef struct _CONFIGURATION_COMPONENT_DATA { struct _CONFIGURATION_COMPONENT_DATA *Parent; struct _CONFIGURATION_COMPONENT_DATA *Child; @@ -48,14 +48,14 @@ CONFIGURATION_COMPONENT Component; } CONFIGURATION_COMPONENT_DATA, *PCONFIGURATION_COMPONENT_DATA;
-typedef enum _KAPC_ENVIRONMENT +typedef enum _KAPC_ENVIRONMENT { OriginalApcEnvironment, AttachedApcEnvironment, CurrentApcEnvironment } KAPC_ENVIRONMENT;
-typedef struct _KDPC_DATA +typedef struct _KDPC_DATA { LIST_ENTRY DpcListHead; ULONG DpcLock; @@ -76,7 +76,7 @@ #endif
/* FIXME: Most of these should go to i386 directory */ -typedef struct _FNSAVE_FORMAT +typedef struct _FNSAVE_FORMAT { ULONG ControlWord; ULONG StatusWord; @@ -117,7 +117,7 @@ ULONG Cr0NpxState; } FX_SAVE_AREA, *PFX_SAVE_AREA;
-typedef struct _KTRAP_FRAME +typedef struct _KTRAP_FRAME { PVOID DebugEbp; PVOID DebugEip; @@ -167,29 +167,33 @@
/* FIXME: Win32k uses windows.h! */ #ifndef __WIN32K__ -typedef struct _LDT_ENTRY { - WORD LimitLow; - WORD BaseLow; - union { - struct { - BYTE BaseMid; - BYTE Flags1; - BYTE Flags2; - BYTE BaseHi; - } Bytes; - struct { - DWORD BaseMid : 8; - DWORD Type : 5; - DWORD Dpl : 2; - DWORD Pres : 1; - DWORD LimitHi : 4; - DWORD Sys : 1; - DWORD Reserved_0 : 1; - DWORD Default_Big : 1; - DWORD Granularity : 1; - DWORD BaseHi : 8; - } Bits; - } HighWord; +typedef struct _LDT_ENTRY +{ + WORD LimitLow; + WORD BaseLow; + union + { + struct + { + BYTE BaseMid; + BYTE Flags1; + BYTE Flags2; + BYTE BaseHi; + } Bytes; + struct + { + DWORD BaseMid : 8; + DWORD Type : 5; + DWORD Dpl : 2; + DWORD Pres : 1; + DWORD LimitHi : 4; + DWORD Sys : 1; + DWORD Reserved_0 : 1; + DWORD Default_Big : 1; + DWORD Granularity : 1; + DWORD BaseHi : 8; + } Bits; + } HighWord; } LDT_ENTRY, *PLDT_ENTRY, *LPLDT_ENTRY; #endif
@@ -197,14 +201,17 @@ { USHORT LimitLow; USHORT BaseLow; - union { - struct { + union + { + struct + { UCHAR BaseMid; UCHAR Flags1; UCHAR Flags2; UCHAR BaseHi; } Bytes; - struct { + struct + { ULONG BaseMid : 8; ULONG Type : 5; ULONG Dpl : 2; @@ -249,14 +256,14 @@ /* Fixme: Use correct types? */ typedef struct _KPROCESSOR_STATE { - PCONTEXT ContextFrame; - PVOID SpecialRegisters; + PCONTEXT ContextFrame; + PVOID SpecialRegisters; } KPROCESSOR_STATE;
/* Processor Control Block */ typedef struct _KPRCB { - USHORT MinorVersion; + USHORT MinorVersion; USHORT MajorVersion; struct _KTHREAD *CurrentThread; struct _KTHREAD *NextThread; @@ -387,33 +394,34 @@ /* * This is the complete, internal KPCR structure */ -typedef struct _KIPCR { - KPCR_TIB Tib; /* 00 */ - struct _KPCR *Self; /* 1C */ - struct _KPRCB *Prcb; /* 20 */ - KIRQL Irql; /* 24 */ - ULONG IRR; /* 28 */ - ULONG IrrActive; /* 2C */ - ULONG IDR; /* 30 */ - PVOID KdVersionBlock; /* 34 */ - PUSHORT IDT; /* 38 */ - PUSHORT GDT; /* 3C */ - struct _KTSS *TSS; /* 40 */ - USHORT MajorVersion; /* 44 */ - USHORT MinorVersion; /* 46 */ - KAFFINITY SetMember; /* 48 */ - ULONG StallScaleFactor; /* 4C */ - UCHAR SparedUnused; /* 50 */ - UCHAR Number; /* 51 */ - UCHAR Reserved; /* 52 */ - UCHAR L2CacheAssociativity; /* 53 */ - ULONG VdmAlert; /* 54 */ - ULONG KernelReserved[14]; /* 58 */ - ULONG L2CacheSize; /* 90 */ - ULONG HalReserved[16]; /* 94 */ - ULONG InterruptMode; /* D4 */ - UCHAR KernelReserved2[0x48]; /* D8 */ - KPRCB PrcbData; /* 120 */ +typedef struct _KIPCR +{ + KPCR_TIB Tib; /* 00 */ + struct _KPCR *Self; /* 1C */ + struct _KPRCB *Prcb; /* 20 */ + KIRQL Irql; /* 24 */ + ULONG IRR; /* 28 */ + ULONG IrrActive; /* 2C */ + ULONG IDR; /* 30 */ + PVOID KdVersionBlock; /* 34 */ + PUSHORT IDT; /* 38 */ + PUSHORT GDT; /* 3C */ + struct _KTSS *TSS; /* 40 */ + USHORT MajorVersion; /* 44 */ + USHORT MinorVersion; /* 46 */ + KAFFINITY SetMember; /* 48 */ + ULONG StallScaleFactor; /* 4C */ + UCHAR SparedUnused; /* 50 */ + UCHAR Number; /* 51 */ + UCHAR Reserved; /* 52 */ + UCHAR L2CacheAssociativity; /* 53 */ + ULONG VdmAlert; /* 54 */ + ULONG KernelReserved[14]; /* 58 */ + ULONG L2CacheSize; /* 90 */ + ULONG HalReserved[16]; /* 94 */ + ULONG InterruptMode; /* D4 */ + UCHAR KernelReserved2[0x48]; /* D8 */ + KPRCB PrcbData; /* 120 */ } KIPCR, *PKIPCR;
#pragma pack(pop) @@ -511,7 +519,8 @@ #include <poppack.h>
/* i386 Doesn't have Exception Frames */ -typedef struct _KEXCEPTION_FRAME { +typedef struct _KEXCEPTION_FRAME +{
} KEXCEPTION_FRAME, *PKEXCEPTION_FRAME;
@@ -544,7 +553,7 @@ struct _KPROCESS *Process; } KPROFILE, *PKPROFILE;
-typedef struct _KINTERRUPT +typedef struct _KINTERRUPT { CSHORT Type; CSHORT Size; @@ -621,94 +630,97 @@
typedef struct _KTHREAD { - /* For waiting on thread exit */ - DISPATCHER_HEADER DispatcherHeader; /* 00 */ + /* For waiting on thread exit */ + DISPATCHER_HEADER DispatcherHeader; /* 00 */
- /* List of mutants owned by the thread */ - LIST_ENTRY MutantListHead; /* 10 */ - PVOID InitialStack; /* 18 */ - ULONG_PTR StackLimit; /* 1C */ + /* List of mutants owned by the thread */ + LIST_ENTRY MutantListHead; /* 10 */ + PVOID InitialStack; /* 18 */ + ULONG_PTR StackLimit; /* 1C */
- /* Pointer to the thread's environment block in user memory */ - struct _TEB *Teb; /* 20 */ + /* Pointer to the thread's environment block in user memory */ + struct _TEB *Teb; /* 20 */
- /* Pointer to the thread's TLS array */ - PVOID TlsArray; /* 24 */ - PVOID KernelStack; /* 28 */ - UCHAR DebugActive; /* 2C */ + /* Pointer to the thread's TLS array */ + PVOID TlsArray; /* 24 */ + PVOID KernelStack; /* 28 */ + UCHAR DebugActive; /* 2C */
- /* Thread state (one of THREAD_STATE_xxx constants below) */ - UCHAR State; /* 2D */ - BOOLEAN Alerted[2]; /* 2E */ - UCHAR Iopl; /* 30 */ - UCHAR NpxState; /* 31 */ - CHAR Saturation; /* 32 */ - CHAR Priority; /* 33 */ - KAPC_STATE ApcState; /* 34 */ - ULONG ContextSwitches; /* 4C */ - LONG WaitStatus; /* 50 */ - KIRQL WaitIrql; /* 54 */ - CHAR WaitMode; /* 55 */ - UCHAR WaitNext; /* 56 */ - UCHAR WaitReason; /* 57 */ - union { /* 58 */ - PKWAIT_BLOCK WaitBlockList; /* 58 */ - PKGATE GateObject; /* 58 */ - }; /* 58 */ - LIST_ENTRY WaitListEntry; /* 5C */ - ULONG WaitTime; /* 64 */ - CHAR BasePriority; /* 68 */ - UCHAR DecrementCount; /* 69 */ - UCHAR PriorityDecrement; /* 6A */ - CHAR Quantum; /* 6B */ - KWAIT_BLOCK WaitBlock[4]; /* 6C */ - PVOID LegoData; /* CC */ - union { - struct { - USHORT KernelApcDisable; - USHORT SpecialApcDisable; - }; - ULONG CombinedApcDisable; /* D0 */ - }; - KAFFINITY UserAffinity; /* D4 */ - UCHAR SystemAffinityActive;/* D8 */ - UCHAR PowerState; /* D9 */ - UCHAR NpxIrql; /* DA */ - UCHAR Pad[1]; /* DB */ - PVOID ServiceTable; /* DC */ - struct _KQUEUE *Queue; /* E0 */ - KSPIN_LOCK ApcQueueLock; /* E4 */ - KTIMER Timer; /* E8 */ - LIST_ENTRY QueueListEntry; /* 110 */ - KAFFINITY Affinity; /* 118 */ - UCHAR Preempted; /* 11C */ - UCHAR ProcessReadyQueue; /* 11D */ - UCHAR KernelStackResident; /* 11E */ - UCHAR NextProcessor; /* 11F */ - PVOID CallbackStack; /* 120 */ - struct _W32THREAD *Win32Thread; /* 124 */ - struct _KTRAP_FRAME *TrapFrame; /* 128 */ - PKAPC_STATE ApcStatePointer[2]; /* 12C */ - UCHAR EnableStackSwap; /* 134 */ - UCHAR LargeStack; /* 135 */ - UCHAR ResourceIndex; /* 136 */ - UCHAR PreviousMode; /* 137 */ - ULONG KernelTime; /* 138 */ - ULONG UserTime; /* 13C */ - KAPC_STATE SavedApcState; /* 140 */ - UCHAR Alertable; /* 158 */ - UCHAR ApcStateIndex; /* 159 */ - UCHAR ApcQueueable; /* 15A */ - UCHAR AutoAlignment; /* 15B */ - PVOID StackBase; /* 15C */ - KAPC SuspendApc; /* 160 */ - KSEMAPHORE SuspendSemaphore; /* 190 */ - LIST_ENTRY ThreadListEntry; /* 1A4 */ - CHAR FreezeCount; /* 1AC */ - UCHAR SuspendCount; /* 1AD */ - UCHAR IdealProcessor; /* 1AE */ - UCHAR DisableBoost; /* 1AF */ - UCHAR QuantumReset; /* 1B0 */ + /* Thread state (one of THREAD_STATE_xxx constants below) */ + UCHAR State; /* 2D */ + BOOLEAN Alerted[2]; /* 2E */ + UCHAR Iopl; /* 30 */ + UCHAR NpxState; /* 31 */ + CHAR Saturation; /* 32 */ + CHAR Priority; /* 33 */ + KAPC_STATE ApcState; /* 34 */ + ULONG ContextSwitches; /* 4C */ + LONG WaitStatus; /* 50 */ + KIRQL WaitIrql; /* 54 */ + CHAR WaitMode; /* 55 */ + UCHAR WaitNext; /* 56 */ + UCHAR WaitReason; /* 57 */ + union /* 58 */ + { + PKWAIT_BLOCK WaitBlockList; /* 58 */ + PKGATE GateObject; /* 58 */ + }; /* 58 */ + LIST_ENTRY WaitListEntry; /* 5C */ + ULONG WaitTime; /* 64 */ + CHAR BasePriority; /* 68 */ + UCHAR DecrementCount; /* 69 */ + UCHAR PriorityDecrement; /* 6A */ + CHAR Quantum; /* 6B */ + KWAIT_BLOCK WaitBlock[4]; /* 6C */ + PVOID LegoData; /* CC */ + union + { + struct + { + USHORT KernelApcDisable; + USHORT SpecialApcDisable; + }; + ULONG CombinedApcDisable; /* D0 */ + }; + KAFFINITY UserAffinity; /* D4 */ + UCHAR SystemAffinityActive;/* D8 */ + UCHAR PowerState; /* D9 */ + UCHAR NpxIrql; /* DA */ + UCHAR Pad[1]; /* DB */ + PVOID ServiceTable; /* DC */ + struct _KQUEUE *Queue; /* E0 */ + KSPIN_LOCK ApcQueueLock; /* E4 */ + KTIMER Timer; /* E8 */ + LIST_ENTRY QueueListEntry; /* 110 */ + KAFFINITY Affinity; /* 118 */ + UCHAR Preempted; /* 11C */ + UCHAR ProcessReadyQueue; /* 11D */ + UCHAR KernelStackResident; /* 11E */ + UCHAR NextProcessor; /* 11F */ + PVOID CallbackStack; /* 120 */ + struct _W32THREAD *Win32Thread; /* 124 */ + struct _KTRAP_FRAME *TrapFrame; /* 128 */ + PKAPC_STATE ApcStatePointer[2]; /* 12C */ + UCHAR EnableStackSwap; /* 134 */ + UCHAR LargeStack; /* 135 */ + UCHAR ResourceIndex; /* 136 */ + UCHAR PreviousMode; /* 137 */ + ULONG KernelTime; /* 138 */ + ULONG UserTime; /* 13C */ + KAPC_STATE SavedApcState; /* 140 */ + UCHAR Alertable; /* 158 */ + UCHAR ApcStateIndex; /* 159 */ + UCHAR ApcQueueable; /* 15A */ + UCHAR AutoAlignment; /* 15B */ + PVOID StackBase; /* 15C */ + KAPC SuspendApc; /* 160 */ + KSEMAPHORE SuspendSemaphore; /* 190 */ + LIST_ENTRY ThreadListEntry; /* 1A4 */ + CHAR FreezeCount; /* 1AC */ + UCHAR SuspendCount; /* 1AD */ + UCHAR IdealProcessor; /* 1AE */ + UCHAR DisableBoost; /* 1AF */ + UCHAR QuantumReset; /* 1B0 */ } KTHREAD;
#include <poppack.h> @@ -739,8 +751,10 @@ LIST_ENTRY ThreadListHead; /* 050 */ KSPIN_LOCK ProcessLock; /* 058 */ KAFFINITY Affinity; /* 05C */ - union { - struct { + union + { + struct + { ULONG AutoAlignment:1; /* 060.0 */ ULONG DisableBoost:1; /* 060.1 */ ULONG DisableQuantum:1; /* 060.2 */ _____
Modified: trunk/reactos/include/ndk/ldrfuncs.h --- trunk/reactos/include/ndk/ldrfuncs.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/ldrfuncs.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -42,5 +42,5 @@
IN ULONG Ordinal, OUT PVOID *ProcedureAddress ); - + #endif _____
Modified: trunk/reactos/include/ndk/ldrtypes.h --- trunk/reactos/include/ndk/ldrtypes.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/ldrtypes.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -20,17 +20,17 @@
#define RESOURCE_DATA_LEVEL 3
/* FIXME: USE CORRRECT LDR_ FLAGS */ -#define IMAGE_DLL 0x00000004 -#define LOAD_IN_PROGRESS 0x00001000 -#define UNLOAD_IN_PROGRESS 0x00002000 -#define ENTRY_PROCESSED 0x00004000 -#define DONT_CALL_FOR_THREAD 0x00040000 -#define PROCESS_ATTACH_CALLED 0x00080000 -#define IMAGE_NOT_AT_BASE 0x00200000 +#define IMAGE_DLL 0x00000004 +#define LOAD_IN_PROGRESS 0x00001000 +#define UNLOAD_IN_PROGRESS 0x00002000 +#define ENTRY_PROCESSED 0x00004000 +#define DONT_CALL_FOR_THREAD 0x00040000 +#define PROCESS_ATTACH_CALLED 0x00080000 +#define IMAGE_NOT_AT_BASE 0x00200000
/* ENUMERATIONS **************************************************************/
-/* TYPES *********************************************************************/ +/* TYPES *********************************************************************/ /* FIXME: Update with _LDR_DATA_TABLE_ENTRY and LDR_ flags */ typedef struct _PEB_LDR_DATA { @@ -69,7 +69,7 @@ #endif /* KDBG */ } LDR_DATA_TABLE_ENTRY, *PLDR_DATA_TABLE_ENTRY;
-typedef struct _LDR_RESOURCE_INFO +typedef struct _LDR_RESOURCE_INFO { ULONG Type; ULONG Name; _____
Modified: trunk/reactos/include/ndk/lpctypes.h --- trunk/reactos/include/ndk/lpctypes.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/lpctypes.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -21,7 +21,7 @@
/* ENUMERATIONS **************************************************************/
-typedef enum _LPC_TYPE +typedef enum _LPC_TYPE { LPC_NEW_MESSAGE, LPC_REQUEST, @@ -41,7 +41,8 @@ /* TYPES *********************************************************************/
/* FIXME: USE REAL DEFINITION */ -typedef struct _LPC_MESSAGE { +typedef struct _LPC_MESSAGE +{ USHORT DataSize; USHORT MessageSize; USHORT MessageType; @@ -52,7 +53,7 @@ } LPC_MESSAGE, *PLPC_MESSAGE;
/* FIXME: USE REAL DEFINITION */ -typedef struct _LPC_SECTION_WRITE +typedef struct _LPC_SECTION_WRITE { ULONG Length; HANDLE SectionHandle; @@ -63,15 +64,15 @@ } LPC_SECTION_WRITE, *PLPC_SECTION_WRITE;
/* FIXME: USE REAL DEFINITION */ -typedef struct _LPC_SECTION_READ +typedef struct _LPC_SECTION_READ { ULONG Length; ULONG ViewSize; PVOID ViewBase; -} LPC_SECTION_READ, *PLPC_SECTION_READ; +} LPC_SECTION_READ, *PLPC_SECTION_READ;
/* FIXME: USE REAL DEFINITION */ -typedef struct _LPC_MAX_MESSAGE +typedef struct _LPC_MAX_MESSAGE { LPC_MESSAGE Header; BYTE Data[MAX_MESSAGE_DATA]; _____
Modified: trunk/reactos/include/ndk/mmfuncs.h --- trunk/reactos/include/ndk/mmfuncs.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/mmfuncs.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -13,10 +13,10 @@
/* PROTOTYPES ****************************************************************/ -NTSTATUS +NTSTATUS STDCALL MmUnmapViewOfSection( - struct _EPROCESS* Process, + struct _EPROCESS* Process, PVOID BaseAddress );
_____
Modified: trunk/reactos/include/ndk/obtypes.h --- trunk/reactos/include/ndk/obtypes.h 2005-06-25 20:05:56 UTC (rev 16271) +++ trunk/reactos/include/ndk/obtypes.h 2005-06-26 01:08:55 UTC (rev 16272) @@ -34,7 +34,7 @@
/* ENUMERATIONS **************************************************************/
typedef enum _OB_OPEN_REASON -{ +{ ObCreateHandle, ObOpenHandle, ObDuplicateHandle, @@ -54,7 +54,7 @@ ACCESS_MASK GrantedAccess );
-typedef NTSTATUS +typedef NTSTATUS (STDCALL *OB_PARSE_METHOD)( PVOID Object, PVOID *NextObject, @@ -62,13 +62,13 @@ PWSTR *Path, ULONG Attributes ); - -typedef VOID + +typedef VOID (STDCALL *OB_DELETE_METHOD)( PVOID DeletedObject );
-typedef VOID +typedef VOID (STDCALL *OB_CLOSE_METHOD)( PVOID ClosedObject, ULONG HandleCount @@ -77,10 +77,10 @@ typedef VOID (STDCALL *OB_DUMP_METHOD)(VOID);
-typedef NTSTATUS +typedef NTSTATUS (STDCALL *OB_OKAYTOCLOSE_METHOD)(VOID);
-typedef NTSTATUS +typedef NTSTATUS (STDCALL *OB_QUERYNAME_METHOD)( PVOID ObjectBody, POBJECT_NAME_INFORMATION ObjectNameInfo, @@ -88,14 +88,14 @@ PULONG ReturnLength );
-typedef PVOID +typedef PVOID (STDCALL *OB_FIND_METHOD)( PVOID WinStaObject, PWSTR Name, ULONG Attributes );
-typedef NTSTATUS +typedef NTSTATUS (STDCALL *OB_SECURITY_METHOD)( PVOID ObjectBody, SECURITY_OPERATION_CODE OperationCode, @@ -116,7 +116,7 @@ /* TYPES *********************************************************************/
/* FIXME: Does this match NT's? */ [truncated at 1000 lines; 6297 more skipped]
-
ekohl＠svn.reactos.com