From 316713be6b00d10f6b512048259d80ff1f789d48 Mon Sep 17 00:00:00 2001 From: David Welch Date: Sat, 19 Dec 1998 18:46:02 +0000 Subject: [PATCH] Small changes to include files svn path=/trunk/; revision=124 --- reactos/include/ddk/iotypes.h | 9 +- reactos/include/ddk/ntifs.h | 209 ------------------------------ reactos/include/ddk/zwtypes.h | 8 +- reactos/include/internal/ke.h | 2 + reactos/include/internal/module.h | 2 - reactos/include/internal/ob.h | 4 +- 6 files changed, 11 insertions(+), 223 deletions(-) diff --git a/reactos/include/ddk/iotypes.h b/reactos/include/ddk/iotypes.h index e1f47bc57cd..a365ed76152 100644 --- a/reactos/include/ddk/iotypes.h +++ b/reactos/include/ddk/iotypes.h @@ -153,15 +153,12 @@ typedef struct _IO_STACK_LOCATION } u; } SetFile; - /* - * This is a guess - */ struct { - FILE_INFORMATION_CLASS FileInformationClass; - BOOLEAN ReturnSingleEntry; + ULONG Length; PUNICODE_STRING FileName; - BOOLEAN RestartScan; + FILE_INFORMATION_CLASS FileInformationClass; + ULONG FileIndex; } QueryDirectory; } Parameters; diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h index c1c330da767..bc737207801 100644 --- a/reactos/include/ddk/ntifs.h +++ b/reactos/include/ddk/ntifs.h @@ -1,215 +1,6 @@ #ifndef __INCLUDE_DDK_NTIFS_H #define __INCLUDE_DDK_NTIFS_H - -/* - * Cache manager interfaces (unused) - */ -#if 0 - -typedef struct _CC_FILE_SIZES -{ - LARGE_INTEGER AllocationSize; - LARGE_INTEGER FileSize; - LARGE_INTEGER ValidDataLength; -} CC_FILE_SIZES, *PCC_FILE_SIZES; - -typedef struct _CACHE_MANAGER_CALLBACKS -{ - PACQUIRE_FOR_LAZY_WRITE AcquireForLazyWrite; - PRELEASE_FROM_LAZY_WRITE ReleaseFromLazyWrite; - PACQUIRE_FOR_READ_AHEAD AcquireForReadAhead; - PRELEASE_FROM_READ_AHREAD ReleaseFromReadAhead; -} CACHE_MANAGER_CALLBACKS, *PCACHE_MANAGER_CALLBACKS; - -VOID CcInitializeCacheMap(PFILE_OBJECT FileObject, - PCC_FILE_SIZES FIleSizes, - BOOLEAN PinAccess, - PCACHE_MANAGER_CALLBACKS CallBacks, - PVOID LazyWriterContext); - -BOOLEAN CcCopyRead(PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - ULONG Length, - BOOLEAN Wait, - PVOID Buffer, - PIO_STATUS_BLOCK IoStatus); - -VOID CcFastCopyRead(PFILE_OBJECT FileObject, - ULONG FileOffset, - ULONG Length, - ULONG PageCount, - PVOID Buffer, - PIO_STATUS_BLOCK IoStatus); - -BOOLEAN CcCopyWrite(PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - ULONG Length, - BOOLEAN Wait, - PVOID Buffer); - -VOID CcFastCopyWrite(PFILE_OBJECT FileObject, - ULONG FileOffset, - ULONG Length, - PVOID Buffer); - -BOOLEAN CcCanIWrite(PFILE_OBJECT FileObject, - ULONG BytesToWrite, - BOOLEAN Wait, - BOOLEAN Retrying); - -typedef VOID (*PCC_DEFERRED_WRITE)(PVOID Context1, - PVOID Context2); - -VOID CcDeferWrite(PFILE_OBJECT FileObject, - PCC_POST_DEFERRED_WRITE PostRoutine, - PVOID Context1, - PVOID Context2, - ULONG BytesToWrite, - BOOLEAN Retrying); - -VOID CcSetReadAheadGranularity(PFILE_OBJECT FileObject, - ULONG Granularity); - -VOID CcScheduleReadAhead(PFILE_OBJECT FileObject, - PLARGE_INTEGER FileObject, - ULONG Length); - -#define CcReadAhead(FO,FOFF,LEN) { \ - if ((LEN) >= 256) { \ - CcScheduleReadAhead((FO),(FOFF),(LEN)); \ - } \ - } \ - -BOOLEAN CcMapData(PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - ULONG Length, - BOOLEAN Wait, - PVOID* Bcb, - PVOID* Buffer); - -BOOLEAN CcPinMappedData(PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - ULONG Length, - BOOLEAN Wait, - PVOID* Bcb); - -BOOLEAN CcPinRead(PFILE_OBJECT FileObject, - PLARGE_INTEGER FIleOffset, - ULONG Length, - BOOLEAN Wait, - PVOID* Bcb, - PVOID* Buffer); - -VOID CcSetDirtyPinnedData(PVOID Bcb, - PLARGE_INTEGER Lsn); - -BOOLEAN CcPreparePinWrite(PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - ULONG Length, - BOOLEAN Zero, - BOOLEAN Wait, - PVOID* Bcb, - PVOID* Buffer); - -VOID CcUnpinData(PVOID Bcb); - -VOID CcUnpinDataForThread(PVOID Bcb, - ERESOURCE_THREAD ResourceThreadId); - -VOID CcRepinBcb(PVOID Bcb); - -VOID CcUnpinRepinnedBcb(PVOID Bcb, - BOOLEAN WriteThrough, - PIO_STATUS_BLOCK IoStatus); - -PFILE_OBJECT CcGetFileObjectFromBcb(PVOID Bcb); - -VOID CcMdlRead(PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - ULONG Length, - PMDL* MdlChain, - PIO_STATUS_BLOCK IoStatus); - -VOID CcMdlReadComplete(PFILE_OBJECT FileObject, - PMDL MdlChain); - -VOID CcPrepareMdlWrite(PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - ULONG Length, - PMDL* MdlChain, - PIO_STATUS_BLOCK IoStatus); - -VOID CcMdlWriteComplete(PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - PMDL MdlChain); - -VOID CcFlushCache(PSECTION_OBJECT_POINTERS SectionObjectPointer, - PLARGE_INTEGER FileOffset, - ULONG Length, - PIO_STATUS_BLOCK IoStatus); - -typedef struct _CACHE_UNINITIALIZE_EVENT -{ - struct _CACHE_UNINITIALIZE_EVENT* Next; - KEVENT Event; -} CACHE_UNINITIALIZE_EVENT, *PCACHE_UNINITIALIZE_EVENT; - -BOOLEAN CcUninitializeCacheMap(PFILE_OBJECT FileObject, - PLARGE_INTEGER TruncateSize, - PCACHE_UNINITIALIZE_EVENT UninitializeCompleteEvent); - -VOID CcSetFileSizes(PFILE_OBJECT FileObject, - PCC_FILE_SIZES FileSizes); - -BOOLEAN CcPurgeCacheSection(PSECTION_OBJECT_POINTERS SectionObjectPointer, - PLARGE_INTEGER FileObject, - ULONG Length, - BOOLEAN UninitializeCacheMaps); - -VOID CcSetDirtyPageThreshold(PFILE_OBJECT FileObject, - ULONG DirtyPageThreshold); - -BOOLEAN CcZeroData(PFILE_OBJECT FileObject, - PLARGE_INTEGER StartOffset, - PLARGE_INTEGER EndOffset, - BOOLEAN Wait); - -PFILE_OBJECT CcGetFileObjectFromSectionPtrs( - PSECTION_OBJECT_POINTERS SectionObjectPointer); - -typedef VOID (*PFLUSH_TO_LSN)(PVOID LogHandle, LARGE_INTEGER Lsn); - -VOID CcSetLogHandle(PFILE_OBJECT FIleObject, - PVOID LogHandle, - PFLUSH_TO_LSN FlushToLsnRoutine); - -VOID CcSetAdditionalCacheAttributes(PFILE_OBJECT FileObject, - BOOLEAN DisableReadAhread, - BOOLEAN DisableWriteBehind); - -typedef VOID (*PDIRTY_PAGE_ROUTINE)(PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - ULONG Length, - PLARGE_INTEGER OldestLsn, - PLARGE_INTEGER NewestLsn, - PVOID Context1, - PVOID Context2); - -LARGE_INTEGER CcGetDirtyPages(PVOID LogHandle, - PDIRTY_PAGE_ROUTINE DirtyPageRoutine, - PVOID Context1, - PVOID Context2); - -BOOLEAN CcIsThereDirtyData(PVPB Vpb); - -LARGE_INTEGER CcGetLsnForFileObject(PFILE_OBJECT FileObject, - PLARGE_INTEGER OldestLsn); - - - -#endif - #if 0 typedef struct { diff --git a/reactos/include/ddk/zwtypes.h b/reactos/include/ddk/zwtypes.h index 07ee1809b1a..b3712ab3c2c 100644 --- a/reactos/include/ddk/zwtypes.h +++ b/reactos/include/ddk/zwtypes.h @@ -316,7 +316,7 @@ typedef struct _FILE_STANDARD_INFORMATION ULONG NumberOfLinks; BOOLEAN DeletePending; BOOLEAN Directory; -} FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION; +} FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION; typedef struct _FILE_POSITION_INFORMATION { @@ -526,7 +526,8 @@ typedef struct _FILE_FULL_DIRECTORY_INFORMATION { ULONG FileNameLength; ULONG EaSize; WCHAR FileName[0]; // variable size -} FILE_FULL_DIRECTORY_INFORMATION, *PFILE_FULL_DIRECTORY_INFORMATION; +} FILE_FULL_DIRECTORY_INFORMATION, *PFILE_FULL_DIRECTORY_INFORMATION, + FILE_FULL_DIR_INFORMATION, *PFILE_FULL_DIR_INFORMATION; typedef struct _FILE_BOTH_DIRECTORY_INFORMATION { @@ -544,7 +545,8 @@ typedef struct _FILE_BOTH_DIRECTORY_INFORMATION { CHAR ShortNameLength; WCHAR ShortName[12]; // 8.3 name WCHAR FileName[0]; -} FILE_BOTH_DIRECTORY_INFORMATION, *PFILE_BOTH_DIRECTORY_INFORMATION; +} FILE_BOTH_DIRECTORY_INFORMATION, *PFILE_BOTH_DIRECTORY_INFORMATION, + FILE_BOTH_DIR_INFORMATION, *PFILE_BOTH_DIR_INFORMATION; /* diff --git a/reactos/include/internal/ke.h b/reactos/include/internal/ke.h index 28fb8b01be7..3a1771488fa 100644 --- a/reactos/include/internal/ke.h +++ b/reactos/include/internal/ke.h @@ -28,6 +28,8 @@ NTSTATUS KeAddThreadTimeout(PKTHREAD Thread, PLARGE_INTEGER Interval); VOID KeInitializeDispatcherHeader(DISPATCHER_HEADER* Header, ULONG Type, ULONG Size, ULONG SignalState); +VOID KeDumpStackFrames(ULONG DummyArg); + /* INITIALIZATION FUNCTIONS *************************************************/ VOID KeInitExceptions(VOID); diff --git a/reactos/include/internal/module.h b/reactos/include/internal/module.h index 95f8ec02c4a..c2b98be5bd1 100644 --- a/reactos/include/internal/module.h +++ b/reactos/include/internal/module.h @@ -31,7 +31,5 @@ typedef struct BOOLEAN process_boot_module(unsigned int start); -NTSTATUS InitalizeLoadedDriver(PDRIVER_INITIALIZE entry); - #endif diff --git a/reactos/include/internal/ob.h b/reactos/include/internal/ob.h index d73b40d82d3..f2f9bf72b26 100644 --- a/reactos/include/internal/ob.h +++ b/reactos/include/internal/ob.h @@ -59,14 +59,12 @@ HANDLE ObInsertHandle(PKPROCESS Process, PVOID ObjectBody, ACCESS_MASK GrantedAccess, BOOLEAN Inherit); VOID ObDeleteHandle(HANDLE Handle); NTSTATUS ObLookupObject(HANDLE rootdir, PWSTR string, PVOID* Object, - PWSTR* UnparsedSection); + PWSTR* UnparsedSection, ULONG Attributes); PVOID ObGenericCreateObject(PHANDLE Handle, ACCESS_MASK DesiredAccess, POBJECT_ATTRIBUTES ObjectAttributes, POBJECT_TYPE Type); -NTSTATUS ObOpenObjectByName(POBJECT_ATTRIBUTES ObjectAttributes, - PVOID* Object, PWSTR* UnparsedSection); VOID ObInitializeHandleTable(PKPROCESS Parent, BOOLEAN Inherit, PKPROCESS Process); VOID ObRemoveEntry(POBJECT_HEADER Header);