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

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

This commit is contained in:
Dmitry Timoshkov 2013-09-25 13:03:25 +09:00 committed by Alexandre Julliard
parent 4544826291
commit 2ffd28cff7
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/kernel32/tests/comm.c
View File

@ -830,9 +830,7 @@ static void test_waittxempty(void)
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, NULL); res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, NULL);
todo_wine
ok(!res, "WriteFile on an overlapped handle without ovl structure should fail\n"); ok(!res, "WriteFile on an overlapped handle without ovl structure should fail\n");
todo_wine
ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
S(U(ovl_write)).Offset = 0; S(U(ovl_write)).Offset = 0;
@ -2057,20 +2055,15 @@ static void test_read_write(void)
bytes = 0xdeadbeef; bytes = 0xdeadbeef;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = WriteFile(hcom, atz, 0, &bytes, NULL); ret = WriteFile(hcom, atz, 0, &bytes, NULL);
todo_wine
ok(!ret, "WriteFile should fail\n"); ok(!ret, "WriteFile should fail\n");
todo_wine
ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
ok(bytes == 0, "bytes %u\n", bytes); ok(bytes == 0, "bytes %u\n", bytes);
iob.Status = -1; iob.Status = -1;
iob.Information = -1; iob.Information = -1;
status = pNtWriteFile(hcom, 0, NULL, NULL, &iob, atz, 0, NULL, NULL); status = pNtWriteFile(hcom, 0, NULL, NULL, &iob, atz, 0, NULL, NULL);
todo_wine
ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status); ok(status == STATUS_INVALID_PARAMETER, "expected STATUS_INVALID_PARAMETER, got %#x\n", status);
todo_wine
ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status);
todo_wine
ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information);
for (i = -20; i < 20; i++) for (i = -20; i < 20; i++)
@ -2087,11 +2080,8 @@ todo_wine
} }
else else
{ {
todo_wine
ok(status == STATUS_INVALID_PARAMETER, "%d: expected STATUS_INVALID_PARAMETER, got %#x\n", i, status); 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); 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); ok(iob.Information == -1, "%d: expected -1, got %ld\n", i, iob.Information);
} }
} }

9
dlls/ntdll/file.c
View File

@ -1016,6 +1016,15 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent,
goto done; goto done;
} }
} }
else if (type == FD_TYPE_SERIAL)
{
if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) &&
(!offset || (offset->QuadPart < 0 && offset->QuadPart != (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */)))
{
status = STATUS_INVALID_PARAMETER;
goto done;
}
}
for (;;) for (;;)
{ {