mirror of
https://github.com/reactos/reactos.git
synced 2024-07-30 08:08:56 +00:00
Move Exported functions away from internal/ke.h, move exported data from internal/ex.h, add internal structures to internal/ifs.h, include ntdddisk.h in internal/xhal.h for access to PDRIVE_LAYOUT_INFORMATION, remove DDK function from internal/nls.h, remove KTRAP_FRAME from internal/i386/ke.h, add some more temporary types to krnltypes.h, protect PNP_VETO_TYPE, move EVENT_TRACE_HEADER to DDK, guard disk.h properly, correct DRIVE_LAYOUT_INFORMATION typedef in DDK, add PNP_VETO_TYPE, NLSTABLEINFO, CPTABLEINFO, remove KDPC_DATA, PP_LOOKASIDE_LIST. remove PROCESSOR_POWER_STATE from ntpoapi, remove MAILSLOT_CREATE_PARAMETERS, NAMED_PIPE_CREATE_PARAMETERS, IO_COMPLETION_INFORMATION_CLASS, PAGEFAULT_HISTORY, SECTION_XXX_INFORMATION, RtlSelfRelativeToAbsoluteSD, ZwQuerySection/Object, ZwQuerySystemInformation, ZwSetInformationObject, ZwSetSystemInformation from IFS
svn path=/trunk/; revision=16072
This commit is contained in:
parent
0af7b6f7a0
commit
428572a138
|
@ -237,7 +237,8 @@ KeDisconnectInterrupt(
|
|||
PKINTERRUPT InterruptObject
|
||||
);
|
||||
|
||||
struct _KPROCESS*
|
||||
PKPROCESS
|
||||
STDCALL
|
||||
KeGetCurrentProcess(
|
||||
VOID
|
||||
);
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#ifndef __INCLUDE_DISK_H
|
||||
#define __INCLUDE_DISK_H
|
||||
|
||||
#ifndef __NTDDDISK_H
|
||||
#ifndef __USE_W32API
|
||||
|
||||
#define IOCTL_DISK_BASE FILE_DEVICE_DISK
|
||||
|
||||
|
@ -177,12 +177,9 @@ typedef struct _DRIVE_LAYOUT_INFORMATION
|
|||
PARTITION_INFORMATION PartitionEntry[1];
|
||||
} DRIVE_LAYOUT_INFORMATION;
|
||||
|
||||
#ifndef __USE_W32API
|
||||
typedef DRIVE_LAYOUT_INFORMATION *PDRIVE_LAYOUT_INFORMATION;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* __INCLUDE_DISK_H */
|
||||
|
||||
/* EOF */
|
||||
|
|
|
@ -24,18 +24,4 @@ typedef struct _MCB {
|
|||
LARGE_MCB LargeMcb;
|
||||
} MCB, *PMCB;
|
||||
|
||||
|
||||
typedef struct _FILE_LOCK_GRANTED {
|
||||
LIST_ENTRY ListEntry;
|
||||
FILE_LOCK_INFO Lock;
|
||||
PVOID UnlockContext;
|
||||
} FILE_LOCK_GRANTED, *PFILE_LOCK_GRANTED;
|
||||
|
||||
|
||||
typedef struct _FILE_LOCK_TOC {
|
||||
KSPIN_LOCK SpinLock;
|
||||
LIST_ENTRY GrantedListHead;
|
||||
LIST_ENTRY PendingListHead;
|
||||
} FILE_LOCK_TOC, *PFILE_LOCK_TOC;
|
||||
|
||||
#endif /* __INCLUDE_DDK_FSTYPES_H */
|
||||
|
|
|
@ -94,6 +94,12 @@ KeFlushEntireTb(
|
|||
IN BOOLEAN Unknown,
|
||||
IN BOOLEAN CurrentCpuOnly);
|
||||
|
||||
struct _KPROCESS*
|
||||
STDCALL
|
||||
KeGetCurrentProcess(
|
||||
VOID
|
||||
);
|
||||
|
||||
VOID STDCALL
|
||||
KeFlushWriteBuffer(
|
||||
VOID);
|
||||
|
|
|
@ -11,6 +11,53 @@
|
|||
#define DOE_REMOVE_PROCESSED 0x8
|
||||
#define DOE_START_PENDING 0x10
|
||||
|
||||
extern POBJECT_TYPE EXPORTED ExMutantObjectType;
|
||||
extern POBJECT_TYPE EXPORTED ExTimerType;
|
||||
|
||||
typedef struct _SECTION_BASIC_INFORMATION
|
||||
{
|
||||
PVOID BaseAddress;
|
||||
ULONG Attributes;
|
||||
LARGE_INTEGER Size;
|
||||
} SECTION_BASIC_INFORMATION, *PSECTION_BASIC_INFORMATION;
|
||||
|
||||
typedef struct _SECTION_IMAGE_INFORMATION
|
||||
{
|
||||
ULONG EntryPoint;
|
||||
ULONG Unknown1;
|
||||
ULONG_PTR StackReserve;
|
||||
ULONG_PTR StackCommit;
|
||||
ULONG Subsystem;
|
||||
USHORT MinorSubsystemVersion;
|
||||
USHORT MajorSubsystemVersion;
|
||||
ULONG Unknown2;
|
||||
ULONG Characteristics;
|
||||
USHORT ImageNumber;
|
||||
BOOLEAN Executable;
|
||||
UCHAR Unknown3;
|
||||
ULONG Unknown4[3];
|
||||
} SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION;
|
||||
|
||||
typedef struct _MAILSLOT_CREATE_PARAMETERS
|
||||
{
|
||||
ULONG MailslotQuota;
|
||||
ULONG MaximumMessageSize;
|
||||
LARGE_INTEGER ReadTimeout;
|
||||
BOOLEAN TimeoutSpecified;
|
||||
} MAILSLOT_CREATE_PARAMETERS, *PMAILSLOT_CREATE_PARAMETERS;
|
||||
|
||||
typedef struct _NAMED_PIPE_CREATE_PARAMETERS
|
||||
{
|
||||
ULONG NamedPipeType;
|
||||
ULONG ReadMode;
|
||||
ULONG CompletionMode;
|
||||
ULONG MaximumInstances;
|
||||
ULONG InboundQuota;
|
||||
ULONG OutboundQuota;
|
||||
LARGE_INTEGER DefaultTimeout;
|
||||
BOOLEAN TimeoutSpecified;
|
||||
} NAMED_PIPE_CREATE_PARAMETERS, *PNAMED_PIPE_CREATE_PARAMETERS;
|
||||
|
||||
/*
|
||||
* PURPOSE: Special timer associated with each device
|
||||
*/
|
||||
|
@ -39,6 +86,68 @@ typedef struct _EX_WORK_QUEUE {
|
|||
EX_QUEUE_WORKER_INFO Info;
|
||||
} EX_WORK_QUEUE, *PEX_WORK_QUEUE;
|
||||
|
||||
typedef struct _KDPC_DATA
|
||||
{
|
||||
LIST_ENTRY DpcListHead;
|
||||
ULONG DpcLock;
|
||||
ULONG DpcQueueDepth;
|
||||
ULONG DpcCount;
|
||||
} KDPC_DATA, *PKDPC_DATA;
|
||||
|
||||
typedef struct _KTRAP_FRAME
|
||||
{
|
||||
PVOID DebugEbp;
|
||||
PVOID DebugEip;
|
||||
PVOID DebugArgMark;
|
||||
PVOID DebugPointer;
|
||||
PVOID TempCs;
|
||||
PVOID TempEip;
|
||||
ULONG Dr0;
|
||||
ULONG Dr1;
|
||||
ULONG Dr2;
|
||||
ULONG Dr3;
|
||||
ULONG Dr6;
|
||||
ULONG Dr7;
|
||||
USHORT Gs;
|
||||
USHORT Reserved1;
|
||||
USHORT Es;
|
||||
USHORT Reserved2;
|
||||
USHORT Ds;
|
||||
USHORT Reserved3;
|
||||
ULONG Edx;
|
||||
ULONG Ecx;
|
||||
ULONG Eax;
|
||||
ULONG PreviousMode;
|
||||
PVOID ExceptionList;
|
||||
USHORT Fs;
|
||||
USHORT Reserved4;
|
||||
ULONG Edi;
|
||||
ULONG Esi;
|
||||
ULONG Ebx;
|
||||
ULONG Ebp;
|
||||
ULONG ErrorCode;
|
||||
ULONG Eip;
|
||||
ULONG Cs;
|
||||
ULONG Eflags;
|
||||
ULONG Esp;
|
||||
USHORT Ss;
|
||||
USHORT Reserved5;
|
||||
USHORT V86_Es;
|
||||
USHORT Reserved6;
|
||||
USHORT V86_Ds;
|
||||
USHORT Reserved7;
|
||||
USHORT V86_Fs;
|
||||
USHORT Reserved8;
|
||||
USHORT V86_Gs;
|
||||
USHORT Reserved9;
|
||||
} KTRAP_FRAME, *PKTRAP_FRAME;
|
||||
|
||||
typedef struct _PP_LOOKASIDE_LIST
|
||||
{
|
||||
struct _GENERAL_LOOKASIDE *P;
|
||||
struct _GENERAL_LOOKASIDE *L;
|
||||
} PP_LOOKASIDE_LIST, *PPP_LOOKASIDE_LIST;
|
||||
|
||||
typedef enum _PP_NPAGED_LOOKASIDE_NUMBER
|
||||
{
|
||||
LookasideSmallIrpList = 0,
|
||||
|
|
|
@ -71,6 +71,7 @@ typedef enum _PLUGPLAY_EVENT_CATEGORY {
|
|||
MaxPlugEventCategory
|
||||
} PLUGPLAY_EVENT_CATEGORY;
|
||||
|
||||
#ifndef __USE_W32API
|
||||
typedef enum _PNP_VETO_TYPE {
|
||||
PNP_VetoTypeUnknown,
|
||||
PNP_VetoLegacyDevice,
|
||||
|
@ -86,6 +87,7 @@ typedef enum _PNP_VETO_TYPE {
|
|||
PNP_VetoLegacyDriver,
|
||||
PNP_VetoInsufficientRights,
|
||||
} PNP_VETO_TYPE;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Plug and Play event structure used by NtGetPlugPlayEvent.
|
||||
|
|
|
@ -187,28 +187,6 @@ typedef struct _INITIAL_TEB
|
|||
PVOID StackReserved;
|
||||
} INITIAL_TEB, *PINITIAL_TEB;
|
||||
|
||||
#else /* __USE_W32API */
|
||||
|
||||
#include <ddk/ntifs.h>
|
||||
|
||||
#endif /* __USE_W32API */
|
||||
|
||||
typedef struct _RTL_HEAP_DEFINITION
|
||||
{
|
||||
ULONG Length;
|
||||
ULONG Unknown[11];
|
||||
} RTL_HEAP_DEFINITION, *PRTL_HEAP_DEFINITION;
|
||||
|
||||
typedef struct _RTL_ATOM_TABLE
|
||||
{
|
||||
ULONG TableSize;
|
||||
ULONG NumberOfAtoms;
|
||||
PVOID Lock; /* fast mutex (kernel mode)/ critical section (user mode) */
|
||||
PVOID HandleTable;
|
||||
LIST_ENTRY Slot[0];
|
||||
} RTL_ATOM_TABLE, *PRTL_ATOM_TABLE;
|
||||
|
||||
|
||||
#define MAXIMUM_LEADBYTES 12
|
||||
|
||||
typedef struct _CPTABLEINFO
|
||||
|
@ -236,6 +214,30 @@ typedef struct _NLSTABLEINFO
|
|||
} NLSTABLEINFO, *PNLSTABLEINFO;
|
||||
|
||||
|
||||
#else /* __USE_W32API */
|
||||
|
||||
#include <ddk/ntifs.h>
|
||||
|
||||
#endif /* __USE_W32API */
|
||||
|
||||
typedef struct _RTL_HEAP_DEFINITION
|
||||
{
|
||||
ULONG Length;
|
||||
ULONG Unknown[11];
|
||||
} RTL_HEAP_DEFINITION, *PRTL_HEAP_DEFINITION;
|
||||
|
||||
typedef struct _RTL_ATOM_TABLE
|
||||
{
|
||||
ULONG TableSize;
|
||||
ULONG NumberOfAtoms;
|
||||
PVOID Lock; /* fast mutex (kernel mode)/ critical section (user mode) */
|
||||
PVOID HandleTable;
|
||||
LIST_ENTRY Slot[0];
|
||||
} RTL_ATOM_TABLE, *PRTL_ATOM_TABLE;
|
||||
|
||||
|
||||
|
||||
|
||||
#include <pshpack1.h>
|
||||
|
||||
typedef struct _NLS_FILE_HEADER
|
||||
|
|
|
@ -53,44 +53,6 @@ typedef struct _EVENT_BASIC_INFORMATION
|
|||
} EVENT_BASIC_INFORMATION, *PEVENT_BASIC_INFORMATION;
|
||||
|
||||
// wmi trace event data
|
||||
typedef struct _EVENT_TRACE_HEADER {
|
||||
USHORT Size;
|
||||
union {
|
||||
USHORT FieldTypeFlags;
|
||||
struct {
|
||||
UCHAR HeaderType;
|
||||
UCHAR MarkerFlags;
|
||||
};
|
||||
};
|
||||
union {
|
||||
ULONG Version;
|
||||
struct {
|
||||
UCHAR Type;
|
||||
UCHAR Level;
|
||||
USHORT Version;
|
||||
} Class;
|
||||
};
|
||||
ULONG ThreadId;
|
||||
ULONG ProcessId;
|
||||
LARGE_INTEGER TimeStamp;
|
||||
union {
|
||||
GUID Guid;
|
||||
ULONGLONG GuidPtr;
|
||||
};
|
||||
union {
|
||||
struct {
|
||||
ULONG ClientContext;
|
||||
ULONG Flags;
|
||||
};
|
||||
struct {
|
||||
ULONG KernelTime;
|
||||
ULONG UserTime;
|
||||
};
|
||||
ULONG64 ProcessorTime;
|
||||
};
|
||||
} EVENT_TRACE_HEADER, *PEVENT_TRACE_HEADER;
|
||||
|
||||
|
||||
typedef struct _FILE_USER_QUOTA_INFORMATION {
|
||||
ULONG NextEntryOffset;
|
||||
ULONG SidLength;
|
||||
|
|
|
@ -1793,6 +1793,11 @@ typedef VOID STDCALL_FUNC
|
|||
|
||||
#endif /* __USE_W32API */
|
||||
|
||||
typedef enum _IO_COMPLETION_INFORMATION_CLASS
|
||||
{
|
||||
IoCompletionBasicInformation
|
||||
} IO_COMPLETION_INFORMATION_CLASS;
|
||||
|
||||
/* BEGIN REACTOS ONLY */
|
||||
|
||||
typedef enum _TRAVERSE_METHOD {
|
||||
|
|
|
@ -83,9 +83,6 @@ extern LARGE_INTEGER ExpTimeZoneBias;
|
|||
extern ULONG ExpTimeZoneId;
|
||||
|
||||
extern POBJECT_TYPE ExEventPairObjectType;
|
||||
extern POBJECT_TYPE EXPORTED ExMutantObjectType;
|
||||
extern POBJECT_TYPE EXPORTED ExSemaphoreObjectType;
|
||||
extern POBJECT_TYPE EXPORTED ExTimerType;
|
||||
|
||||
/* INITIALIZATION FUNCTIONS *************************************************/
|
||||
|
||||
|
|
|
@ -111,54 +111,6 @@
|
|||
|
||||
#ifndef __ASM__
|
||||
|
||||
typedef struct _KTRAP_FRAME
|
||||
{
|
||||
PVOID DebugEbp;
|
||||
PVOID DebugEip;
|
||||
PVOID DebugArgMark;
|
||||
PVOID DebugPointer;
|
||||
PVOID TempSegSs;
|
||||
PVOID TempEsp;
|
||||
ULONG Dr0;
|
||||
ULONG Dr1;
|
||||
ULONG Dr2;
|
||||
ULONG Dr3;
|
||||
ULONG Dr6;
|
||||
ULONG Dr7;
|
||||
USHORT Gs;
|
||||
USHORT Reserved1;
|
||||
USHORT Es;
|
||||
USHORT Reserved2;
|
||||
USHORT Ds;
|
||||
USHORT Reserved3;
|
||||
ULONG Edx;
|
||||
ULONG Ecx;
|
||||
ULONG Eax;
|
||||
ULONG PreviousMode;
|
||||
PVOID ExceptionList;
|
||||
USHORT Fs;
|
||||
USHORT Reserved4;
|
||||
ULONG Edi;
|
||||
ULONG Esi;
|
||||
ULONG Ebx;
|
||||
ULONG Ebp;
|
||||
ULONG ErrorCode;
|
||||
ULONG Eip;
|
||||
ULONG Cs;
|
||||
ULONG Eflags;
|
||||
ULONG Esp;
|
||||
USHORT Ss;
|
||||
USHORT Reserved5;
|
||||
USHORT V86_Es;
|
||||
USHORT Reserved6;
|
||||
USHORT V86_Ds;
|
||||
USHORT Reserved7;
|
||||
USHORT V86_Fs;
|
||||
USHORT Reserved8;
|
||||
USHORT V86_Gs;
|
||||
USHORT Reserved9;
|
||||
} KTRAP_FRAME, *PKTRAP_FRAME;
|
||||
|
||||
typedef struct _KIRQ_TRAPFRAME
|
||||
{
|
||||
ULONG Magic;
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#ifdef __USE_W32API
|
||||
#ifndef __ASM__
|
||||
#include <ddk/ntpoapi.h>
|
||||
#include <ndk/potypes.h> /* FIXME: TEMP HACK */
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
|
@ -4,6 +4,19 @@
|
|||
/* Look for "FSrt" in mem view */
|
||||
#define IFS_POOL_TAG 0x74725346
|
||||
|
||||
typedef struct _FILE_LOCK_GRANTED {
|
||||
LIST_ENTRY ListEntry;
|
||||
FILE_LOCK_INFO Lock;
|
||||
PVOID UnlockContext;
|
||||
} FILE_LOCK_GRANTED, *PFILE_LOCK_GRANTED;
|
||||
|
||||
|
||||
typedef struct _FILE_LOCK_TOC {
|
||||
KSPIN_LOCK SpinLock;
|
||||
LIST_ENTRY GrantedListHead;
|
||||
LIST_ENTRY PendingListHead;
|
||||
} FILE_LOCK_TOC, *PFILE_LOCK_TOC;
|
||||
|
||||
VOID
|
||||
STDCALL INIT_FUNCTION
|
||||
FsRtlpInitNotifyImplementation(VOID);
|
||||
|
|
|
@ -212,11 +212,6 @@ typedef struct _KPROCESS
|
|||
|
||||
/* INTERNAL KERNEL FUNCTIONS ************************************************/
|
||||
|
||||
#ifdef __USE_W32API
|
||||
struct _KPROCESS* STDCALL KeGetCurrentProcess(VOID);
|
||||
VOID KeSetGdtSelector(ULONG Entry, ULONG Value1, ULONG Value2);
|
||||
#endif
|
||||
|
||||
struct _KIRQ_TRAPFRAME;
|
||||
struct _KPCR;
|
||||
struct _KPRCB;
|
||||
|
|
|
@ -36,8 +36,6 @@ VOID RtlpImportUnicodeCasemap(PUSHORT TableBase, ULONG Size);
|
|||
VOID RtlpCreateInitialNlsTables(VOID);
|
||||
VOID RtlpCreateNlsSection(VOID);
|
||||
|
||||
WCHAR RtlDowncaseUnicodeChar (IN WCHAR Source);
|
||||
|
||||
#endif /* __NTOSKRNL_INCLUDE_INTERNAL_NLS_H */
|
||||
|
||||
/* EOF */
|
||||
|
|
|
@ -115,7 +115,7 @@ typedef struct _ETHREAD
|
|||
struct _EPROCESS *ThreadsProcess; /* 218 */
|
||||
PKSTART_ROUTINE StartAddress; /* 21C */
|
||||
union {
|
||||
LPTHREAD_START_ROUTINE Win32StartAddress; /* 220 */
|
||||
PTHREAD_START_ROUTINE Win32StartAddress; /* 220 */
|
||||
ULONG LpcReceivedMessageId; /* 220 */
|
||||
};
|
||||
LIST_ENTRY ThreadListEntry; /* 224 */
|
||||
|
@ -239,7 +239,7 @@ typedef struct _EPROCESS
|
|||
ACCESS_MASK GrantedAccess; /* 194 */
|
||||
ULONG DefaultHardErrorProcessing; /* 198 */
|
||||
NTSTATUS LastThreadExitStatus; /* 19C */
|
||||
PPEB Peb; /* 1A0 */
|
||||
struct _PEB* Peb; /* 1A0 */
|
||||
EX_FAST_REF PrefetchTrace; /* 1A4 */
|
||||
LARGE_INTEGER ReadOperationCount; /* 1A8 */
|
||||
LARGE_INTEGER WriteOperationCount; /* 1B0 */
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
#ifndef __INCLUDE_INTERNAL_XHAL_H
|
||||
#define __INCLUDE_INTERNAL_XHAL_H
|
||||
|
||||
#include <ddk/ntdddisk.h>
|
||||
|
||||
NTSTATUS
|
||||
xHalQueryDriveLayout(IN PUNICODE_STRING DeviceName,
|
||||
OUT PDRIVE_LAYOUT_INFORMATION *LayoutInfo);
|
||||
|
|
Loading…
Reference in a new issue