NtWriteFile must append to file if it was opened with the FILE_APPEND_DATA access.

FILE_WRITE_DATA take precedence over FILE_APPEND_DATA.

svn path=/trunk/; revision=11101
This commit is contained in:
Eric Kohl 2004-09-28 10:51:05 +00:00
parent 3d82d976d3
commit d394870def

View file

@ -1,4 +1,4 @@
/* $Id: rw.c,v 1.54 2004/08/15 16:39:03 chorns Exp $
/* $Id: rw.c,v 1.55 2004/09/28 10:51:05 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -67,7 +67,7 @@ NtReadFile (IN HANDLE FileHandle,
NULL);
if (!NT_SUCCESS(Status))
{
return(Status);
return Status;
}
if (ByteOffset == NULL)
@ -94,8 +94,9 @@ NtReadFile (IN HANDLE FileHandle,
if (!NT_SUCCESS(Status))
{
ObDereferenceObject(FileObject);
return(Status);
return Status;
}
KeClearEvent(EventObject);
}
@ -124,16 +125,15 @@ NtReadFile (IN HANDLE FileHandle,
Status = IoCallDriver(FileObject->DeviceObject, Irp);
if (Status == STATUS_PENDING && (FileObject->Flags & FO_SYNCHRONOUS_IO))
{
Status = KeWaitForSingleObject (&FileObject->Event,
Status = KeWaitForSingleObject(&FileObject->Event,
Executive,
PreviousMode,
FileObject->Flags & FO_ALERTABLE_IO,
NULL);
if (Status != STATUS_WAIT_0)
{
/* Wait failed. */
return(Status);
return Status;
}
Status = IoStatusBlock->Status;
@ -168,12 +168,14 @@ NtWriteFile (IN HANDLE FileHandle,
IN PLARGE_INTEGER ByteOffset OPTIONAL, /* NOT optional for asynch. operations! */
IN PULONG Key OPTIONAL)
{
OBJECT_HANDLE_INFORMATION HandleInformation;
NTSTATUS Status;
PFILE_OBJECT FileObject;
PIRP Irp;
PIO_STACK_LOCATION StackPtr;
KPROCESSOR_MODE PreviousMode;
PKEVENT EventObject = NULL;
LARGE_INTEGER Offset;
DPRINT("NtWriteFile(FileHandle %x Buffer %x Length %x ByteOffset %x, "
"IoStatusBlock %x)\n", FileHandle, Buffer, Length, ByteOffset,
@ -185,16 +187,26 @@ NtWriteFile (IN HANDLE FileHandle,
PreviousMode = ExGetPreviousMode();
Status = ObReferenceObjectByHandle(FileHandle,
FILE_WRITE_DATA,
0,
IoFileObjectType,
PreviousMode,
(PVOID*)&FileObject,
NULL);
&HandleInformation);
if (!NT_SUCCESS(Status))
{
return(Status);
return Status;
}
/* Must have FILE_WRITE_DATA | FILE_APPEND_DATA access */
if (!(HandleInformation.GrantedAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)))
{
DPRINT1("Invalid access rights\n");
ObDereferenceObject(FileObject);
return STATUS_ACCESS_DENIED;
}
if (HandleInformation.GrantedAccess & FILE_WRITE_DATA)
{
if (ByteOffset == NULL)
{
/* a valid ByteOffset is required if asynch. op. */
@ -207,6 +219,21 @@ NtWriteFile (IN HANDLE FileHandle,
ByteOffset = &FileObject->CurrentByteOffset;
}
}
else if (HandleInformation.GrantedAccess & FILE_APPEND_DATA)
{
/* a valid ByteOffset is required if asynch. op. */
if (!(FileObject->Flags & FO_SYNCHRONOUS_IO))
{
DPRINT1("NtWriteFile: missing ByteOffset for asynch. op\n");
ObDereferenceObject(FileObject);
return STATUS_INVALID_PARAMETER;
}
Offset.u.LowPart = FILE_WRITE_TO_END_OF_FILE;
Offset.u.HighPart = 0xffffffff;
ByteOffset = &Offset;
}
if (Event != NULL)
{
@ -216,11 +243,10 @@ NtWriteFile (IN HANDLE FileHandle,
PreviousMode,
(PVOID*)&EventObject,
NULL);
if (!NT_SUCCESS(Status))
{
ObDereferenceObject(FileObject);
return(Status);
return Status;
}
KeClearEvent(EventObject);
@ -251,7 +277,7 @@ NtWriteFile (IN HANDLE FileHandle,
Status = IoCallDriver(FileObject->DeviceObject, Irp);
if (Status == STATUS_PENDING && (FileObject->Flags & FO_SYNCHRONOUS_IO))
{
Status = KeWaitForSingleObject (&FileObject->Event,
Status = KeWaitForSingleObject(&FileObject->Event,
Executive,
PreviousMode,
FileObject->Flags & FO_ALERTABLE_IO,
@ -259,7 +285,7 @@ NtWriteFile (IN HANDLE FileHandle,
if (Status != STATUS_WAIT_0)
{
/* Wait failed. */
return(Status);
return Status;
}
Status = IoStatusBlock->Status;