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

ntdll/tests: Mark sync NtReadFile() result for async regular file as broken. 

Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Paul Gofman 2019-03-07 12:28:34 +03:00 committed by Alexandre Julliard
parent 56f34c7489
commit fb5bf0ec8a
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/ntdll/tests/file.c
View File

@ -635,9 +635,9 @@ static void read_file_test(void)
offset.QuadPart = 0; offset.QuadPart = 0;
ResetEvent( event ); ResetEvent( event );
status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, strlen(text) + 10, &offset, NULL ); status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, strlen(text) + 10, &offset, NULL );
ok( status == STATUS_SUCCESS || todo_wine ok(status == STATUS_PENDING
status == STATUS_PENDING, /* vista */ || broken(status == STATUS_SUCCESS) /* before Vista */,
"wrong status %x\n", status ); "wrong status %x.\n", status);
if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 );
ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status );
ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information );
@ -4450,9 +4450,8 @@ static void test_read_write(void)
bytes = 0xdeadbeef; bytes = 0xdeadbeef;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = ReadFile(hfile, buf, 0, &bytes, &ovl); ret = ReadFile(hfile, buf, 0, &bytes, &ovl);
/* ReadFile return value depends on Windows version and testing it is not practical */ todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */,
if (!ret) "Unexpected result, ret %#x, GetLastError() %u.\n", ret, GetLastError());
ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError());
ret = GetLastError(); ret = GetLastError();
ok(bytes == 0, "bytes %u\n", bytes); ok(bytes == 0, "bytes %u\n", bytes);
@ -4480,9 +4479,8 @@ static void test_read_write(void)
bytes = 0xdeadbeef; bytes = 0xdeadbeef;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = ReadFile(hfile, NULL, 0, &bytes, &ovl); ret = ReadFile(hfile, NULL, 0, &bytes, &ovl);
/* ReadFile return value depends on Windows version and testing it is not practical */ todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */,
if (!ret) "Unexpected result, ret %#x, GetLastError() %u.\n", ret, GetLastError());
ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError());
ret = GetLastError(); ret = GetLastError();
ok(bytes == 0, "bytes %u\n", bytes); ok(bytes == 0, "bytes %u\n", bytes);
@ -4526,6 +4524,8 @@ static void test_read_write(void)
iob.Information = -1; iob.Information = -1;
offset.QuadPart = sizeof(contents); offset.QuadPart = sizeof(contents);
status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL);
todo_wine ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */,
"expected STATUS_PENDING, got %#x.\n", status);
if (status == STATUS_PENDING) if (status == STATUS_PENDING)
{ {
ret = WaitForSingleObject(hfile, 3000); ret = WaitForSingleObject(hfile, 3000);
@ -4535,7 +4535,6 @@ static void test_read_write(void)
} }
else else
{ {
ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", status);
ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status);
ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information);
} }
@ -4551,13 +4550,12 @@ static void test_read_write(void)
bytes = 0; bytes = 0;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl);
/* ReadFile return value depends on Windows version and testing it is not practical */ todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */,
"Unexpected result, ret %#x, GetLastError() %u.\n", ret, GetLastError());
if (!ret) if (!ret)
{
ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError());
ok(bytes == 0, "bytes %u\n", bytes); ok(bytes == 0, "bytes %u\n", bytes);
} else
else ok(bytes == 14, "bytes %u\n", bytes); ok(bytes == 14, "bytes %u\n", bytes);
ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal);
ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh);
@ -4600,7 +4598,8 @@ static void test_read_write(void)
iob.Information = -1; iob.Information = -1;
offset.QuadPart = 0; offset.QuadPart = 0;
status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL);
ok(status == STATUS_PENDING || status == STATUS_SUCCESS, "expected STATUS_PENDING or STATUS_SUCCESS, got %#x\n", status); todo_wine ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */,
"expected STATUS_PENDING, got %#x.\n", status);
if (status == STATUS_PENDING) if (status == STATUS_PENDING)
{ {
ret = WaitForSingleObject(hfile, 3000); ret = WaitForSingleObject(hfile, 3000);
@ -4659,10 +4658,10 @@ static void test_read_write(void)
bytes = 0; bytes = 0;
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl);
/* ReadFile return value depends on Windows version and testing it is not practical */ todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */,
"Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError());
if (!ret) if (!ret)
{ {
ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError());
ok(bytes == 0, "bytes %u\n", bytes); ok(bytes == 0, "bytes %u\n", bytes);
ret = WaitForSingleObject(hfile, 3000); ret = WaitForSingleObject(hfile, 3000);
ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret);