system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-30 14:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ntdll: Perform the offset checks also for a serial device.

Browse source
This commit is contained in:
Dmitry Timoshkov 2013-09-19 16:10:09 +09:00 committed by Alexandre Julliard
parent 96e32da5c9
commit 084f4b643c
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/kernel32/tests/comm.c
View file

@ -2153,20 +2153,14 @@ todo_wine
SetLastError(0xdeadbeef);
ret = ReadFile(hcom, buf, 0, &bytes, NULL);
ok(!ret, "ReadFile should fail\n");
todo_wine
ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
ok(bytes == 0, "bytes %u\n", bytes);
iob.Status = -1;
iob.Information = -1;
status = pNtReadFile(hcom, 0, NULL, NULL, &iob, buf, 0, NULL, NULL);
todo_wine
ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status);
/* FIXME: Remove once Wine is fixed */
if (status == STATUS_PENDING) WaitForSingleObject(hcom, TIMEOUT);
todo_wine
ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status);
todo_wine
ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information);
for (i = -20; i < 20; i++)
@ -2187,11 +2181,8 @@ todo_wine
}
else
{
todo_wine
ok(status == STATUS_INVALID_PARAMETER, "%d: expected STATUS_INVALID_PARAMETER, got %#x\n", i, status);
todo_wine
ok(iob.Status == -1, "%d: expected -1, got %#x\n", i, iob.Status);
todo_wine
ok(iob.Information == -1, "%d: expected -1, got %ld\n", i, iob.Information);
}
}

8
dlls/ntdll/file.c
View file

@ -632,6 +632,14 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent,
goto done;
}
}
else if (type == FD_TYPE_SERIAL)
{
if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && (!offset || offset->QuadPart < 0))
{
status = STATUS_INVALID_PARAMETER;
goto done;
}
}
for (;;)
{