From faee3753ea79c7e332c7a1b5eb74ca2c6614e23d Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sun, 12 Nov 2017 22:36:47 +0100 Subject: [PATCH] [CDFS_NEW] Now NtWriteFile is fixed, revert 5f25582, ie remove FastIO hack from the driver CORE-14003 --- drivers/filesystems/cdfs_new/cdinit.c | 36 --------------------------- 1 file changed, 36 deletions(-) diff --git a/drivers/filesystems/cdfs_new/cdinit.c b/drivers/filesystems/cdfs_new/cdinit.c index 1f086fe61de..b6bec14c45b 100755 --- a/drivers/filesystems/cdfs_new/cdinit.c +++ b/drivers/filesystems/cdfs_new/cdinit.c @@ -58,29 +58,6 @@ CdShutdown ( #pragma alloc_text(INIT, CdInitializeGlobalData) #endif -#ifdef __REACTOS__ - -// -// Stub for CcWrite, this is a hack -// -BOOLEAN -NTAPI -CdFastIoWrite ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Wait, - IN ULONG LockKey, - IN PVOID Buffer, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject) -{ - ASSERT(FALSE); - return FALSE; -} - -#endif - // // Local support routine @@ -365,19 +342,6 @@ Return Value: CdFastIoDispatch.SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); CdFastIoDispatch.FastIoCheckIfPossible = CdFastIoCheckIfPossible; // CheckForFastIo CdFastIoDispatch.FastIoRead = FsRtlCopyRead; // Read -#ifdef __REACTOS__ - - // - // Add a stub for CdFastIoWrite. This is a hack required because - // our current implementation of NtWriteFile won't validate - // access granted to files opened. And some applications may attempt - // to write to a file. In case it is cached, the kernel will null-dereference - // the fastIO routine, trying to call it. - // FIXME: remove once NtWriteFile got fixed! - // - - CdFastIoDispatch.FastIoWrite = CdFastIoWrite; // Write -#endif CdFastIoDispatch.FastIoQueryBasicInfo = CdFastQueryBasicInfo; // QueryBasicInfo CdFastIoDispatch.FastIoQueryStandardInfo = CdFastQueryStdInfo; // QueryStandardInfo CdFastIoDispatch.FastIoLock = CdFastLock; // Lock