ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: NtReadFile should fail for overlapped IO on files if offset is NULL.

This commit is contained in:
Dmitry Timoshkov 2013-09-02 18:30:27 +09:00 committed by Alexandre Julliard
parent d37fac0519
commit 2d5ecbee43
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dlls/ntdll/file.c
View File

@ -604,24 +604,33 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent,
goto done; goto done;
} }
if (type == FD_TYPE_FILE && offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */ ) if (type == FD_TYPE_FILE)
{ {
/* async I/O doesn't make sense on regular files */ if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && !offset)
while ((result = pread( unix_handle, buffer, length, offset->QuadPart )) == -1)
{ {
if (errno != EINTR) status = STATUS_INVALID_PARAMETER;
{ goto done;
status = FILE_GetNtStatus();
goto done;
}
} }
if (options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))
/* update file pointer position */
lseek( unix_handle, offset->QuadPart + result, SEEK_SET );
total = result; if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */)
status = total ? STATUS_SUCCESS : STATUS_END_OF_FILE; {
goto done; /* async I/O doesn't make sense on regular files */
while ((result = pread( unix_handle, buffer, length, offset->QuadPart )) == -1)
{
if (errno != EINTR)
{
status = FILE_GetNtStatus();
goto done;
}
}
if (options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))
/* update file pointer position */
lseek( unix_handle, offset->QuadPart + result, SEEK_SET );
total = result;
status = total ? STATUS_SUCCESS : STATUS_END_OF_FILE;
goto done;
}
} }
for (;;) for (;;)