From 1375ddbb833e0dc3bac6769a4d999c472709f461 Mon Sep 17 00:00:00 2001 From: Thomas Bluemel Date: Sun, 24 Jul 2005 09:11:30 +0000 Subject: [PATCH] use ZwQueryInformationFile and ZwSetInformationFile instead of the Nt version since we're passing kernel pointers to them which cause a probe failure in UserMode. This should fix the 1st stage setup svn path=/trunk/; revision=16708 --- reactos/ntoskrnl/io/file.c | 20 ++++++++++++++++++-- reactos/ntoskrnl/mm/section.c | 4 ++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/reactos/ntoskrnl/io/file.c b/reactos/ntoskrnl/io/file.c index be2be1478c0..9611c4d2e91 100644 --- a/reactos/ntoskrnl/io/file.c +++ b/reactos/ntoskrnl/io/file.c @@ -3039,7 +3039,15 @@ failfreeirp: PreviousMode, FileObject->Flags & FO_ALERTABLE_IO, NULL); - Status = IoStatusBlock->Status; + _SEH_TRY + { + Status = IoStatusBlock->Status; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } else { @@ -3048,7 +3056,15 @@ failfreeirp: PreviousMode, FileObject->Flags & FO_ALERTABLE_IO, NULL); - Status = FileObject->FinalStatus; + _SEH_TRY + { + Status = FileObject->FinalStatus; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } } diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c index 2aad7d5f464..094fba75825 100644 --- a/reactos/ntoskrnl/mm/section.c +++ b/reactos/ntoskrnl/mm/section.c @@ -2308,7 +2308,7 @@ MmCreateDataFileSection(PSECTION_OBJECT *SectionObject, * (as in case of the EXT2FS driver by Manoj Paul Joseph where the * standard file information is filled on first request). */ - Status = NtQueryInformationFile(FileHandle, + Status = ZwQueryInformationFile(FileHandle, &Iosb, &FileInfo, sizeof(FILE_STANDARD_INFORMATION), @@ -2342,7 +2342,7 @@ MmCreateDataFileSection(PSECTION_OBJECT *SectionObject, if (MaximumSize.QuadPart > FileInfo.EndOfFile.QuadPart) { - Status = NtSetInformationFile(FileHandle, + Status = ZwSetInformationFile(FileHandle, &Iosb, &MaximumSize, sizeof(LARGE_INTEGER),