Skip to content

W
wine-winehq
Commit a228d7d9 authored by Alex Henrie's avatar Alex Henrie Committed by Alexandre Julliard
Browse files
Options

ntdll/tests: Correct signaled / not signaled error messages.

Signed-off-by: 's avatarAlex Henrie <alexhenrie24@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 025373ca
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
dlls/ntdll/tests/file.c
View file @ a228d7d9
...@@ -677,7 +677,7 @@ static void read_file_test(void) ...@@ -677,7 +677,7 @@ static void read_file_test(void)
apc_count = 0; apc_count = 0;
U(iosb).Status = 0xdeadbabe; U(iosb).Status = 0xdeadbabe;
iosb.Information = 0xdeadbeef; iosb.Information = 0xdeadbeef;
ok( !is_signaled( read ), "read handle is not signaled\n" ); ok( !is_signaled( read ), "read handle is signaled\n" );
status = pNtReadFile( read, 0, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); status = pNtReadFile( read, 0, apc, &apc_count, &iosb, buffer, 1, NULL, NULL );
ok( status == STATUS_PENDING, "wrong status %x\n", status ); ok( status == STATUS_PENDING, "wrong status %x\n", status );
ok( !is_signaled( read ), "read handle is signaled\n" ); ok( !is_signaled( read ), "read handle is signaled\n" );
...@@ -690,7 +690,7 @@ static void read_file_test(void) ...@@ -690,7 +690,7 @@ static void read_file_test(void)
Sleep(1); /* FIXME: needed for wine to run the i/o apc */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */
ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status );
ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information );
ok( is_signaled( read ), "read handle is signaled\n" ); ok( is_signaled( read ), "read handle is not signaled\n" );
ok( !apc_count, "apc was called\n" ); ok( !apc_count, "apc was called\n" );
apc_count = 0; apc_count = 0;
SleepEx( 1, FALSE ); /* non-alertable sleep */ SleepEx( 1, FALSE ); /* non-alertable sleep */
...@@ -731,7 +731,7 @@ static void read_file_test(void) ...@@ -731,7 +731,7 @@ static void read_file_test(void)
ok(ret && written == 1, "WriteFile error %d\n", GetLastError()); ok(ret && written == 1, "WriteFile error %d\n", GetLastError());
/* partial read is good enough */ /* partial read is good enough */
Sleep(1); /* FIXME: needed for wine to run the i/o apc */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */
ok( is_signaled( event ), "event is signaled\n" ); ok( is_signaled( event ), "event is not signaled\n" );
ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status );
ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information );
ok( !apc_count, "apc was called\n" ); ok( !apc_count, "apc was called\n" );
...@@ -762,7 +762,7 @@ static void read_file_test(void) ...@@ -762,7 +762,7 @@ static void read_file_test(void)
ok( status == STATUS_INVALID_HANDLE, "wrong status %x\n", status ); ok( status == STATUS_INVALID_HANDLE, "wrong status %x\n", status );
ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status );
ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information );
ok( is_signaled( event ), "event is signaled\n" ); /* not reset on invalid handle */ ok( is_signaled( event ), "event is not signaled\n" ); /* not reset on invalid handle */
ok( !apc_count, "apc was called\n" ); ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */ SleepEx( 1, TRUE ); /* alertable sleep */
ok( !apc_count, "apc was called\n" ); ok( !apc_count, "apc was called\n" );
...@@ -782,7 +782,7 @@ static void read_file_test(void) ...@@ -782,7 +782,7 @@ static void read_file_test(void)
Sleep(1); /* FIXME: needed for wine to run the i/o apc */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */
ok( U(iosb).Status == STATUS_PIPE_BROKEN, "wrong status %x\n", U(iosb).Status ); ok( U(iosb).Status == STATUS_PIPE_BROKEN, "wrong status %x\n", U(iosb).Status );
ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information );
ok( is_signaled( event ), "event is signaled\n" ); ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" ); ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */ SleepEx( 1, TRUE ); /* alertable sleep */
ok( apc_count == 1, "apc was not called\n" ); ok( apc_count == 1, "apc was not called\n" );
...@@ -807,7 +807,7 @@ static void read_file_test(void) ...@@ -807,7 +807,7 @@ static void read_file_test(void)
Sleep(1); /* FIXME: needed for wine to run the i/o apc */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */
ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status );
ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information );
ok( is_signaled( event ), "event is signaled\n" ); ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" ); ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */ SleepEx( 1, TRUE ); /* alertable sleep */
ok( apc_count == 1, "apc was not called\n" ); ok( apc_count == 1, "apc was not called\n" );
...@@ -833,7 +833,7 @@ static void read_file_test(void) ...@@ -833,7 +833,7 @@ static void read_file_test(void)
Sleep(1); /* FIXME: needed for wine to run the i/o apc */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */
ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status );
ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information );
ok( is_signaled( event ), "event is signaled\n" ); ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" ); ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */ SleepEx( 1, TRUE ); /* alertable sleep */
ok( apc_count == 1, "apc was not called\n" ); ok( apc_count == 1, "apc was not called\n" );
...@@ -859,7 +859,7 @@ static void read_file_test(void) ...@@ -859,7 +859,7 @@ static void read_file_test(void)
Sleep(1); /* FIXME: needed for wine to run the i/o apc */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */
ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status );
ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information );
ok( is_signaled( event ), "event is signaled\n" ); ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" ); ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */ SleepEx( 1, TRUE ); /* alertable sleep */
ok( apc_count == 1, "apc was not called\n" ); ok( apc_count == 1, "apc was not called\n" );
...@@ -885,7 +885,7 @@ static void read_file_test(void) ...@@ -885,7 +885,7 @@ static void read_file_test(void)
Sleep(1); /* FIXME: needed for wine to run the i/o apc */ Sleep(1); /* FIXME: needed for wine to run the i/o apc */
ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status );
ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information );
ok( is_signaled( event ), "event is signaled\n" ); ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" ); ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */ SleepEx( 1, TRUE ); /* alertable sleep */
ok( apc_count == 2, "apc was not called\n" ); ok( apc_count == 2, "apc was not called\n" );
...@@ -906,7 +906,7 @@ static void read_file_test(void) ...@@ -906,7 +906,7 @@ static void read_file_test(void)
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 );
ok( is_signaled( event ), "event is signaled\n" ); ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" ); ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */ SleepEx( 1, TRUE ); /* alertable sleep */
ok( apc_count == 1, "apc was not called\n" ); ok( apc_count == 1, "apc was not called\n" );
...@@ -923,7 +923,7 @@ static void read_file_test(void) ...@@ -923,7 +923,7 @@ static void read_file_test(void)
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 );
ok( is_signaled( event ), "event is signaled\n" ); ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" ); ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */ SleepEx( 1, TRUE ); /* alertable sleep */
ok( apc_count == 1, "apc was not called\n" ); ok( apc_count == 1, "apc was not called\n" );
...@@ -940,7 +940,7 @@ static void read_file_test(void) ...@@ -940,7 +940,7 @@ static void read_file_test(void)
WaitForSingleObject( event, 1000 ); WaitForSingleObject( event, 1000 );
ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %x\n", U(iosb).Status ); ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %x\n", U(iosb).Status );
ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information );
ok( is_signaled( event ), "event is signaled\n" ); ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" ); ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */ SleepEx( 1, TRUE ); /* alertable sleep */
ok( apc_count == 1, "apc was not called\n" ); ok( apc_count == 1, "apc was not called\n" );
...@@ -961,7 +961,7 @@ static void read_file_test(void) ...@@ -961,7 +961,7 @@ static void read_file_test(void)
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 );
ok( is_signaled( event ), "event is signaled\n" ); ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" ); ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */ SleepEx( 1, TRUE ); /* alertable sleep */
ok( apc_count == 1, "apc was not called\n" ); ok( apc_count == 1, "apc was not called\n" );
...@@ -975,7 +975,7 @@ static void read_file_test(void) ...@@ -975,7 +975,7 @@ static void read_file_test(void)
ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); ok( status == STATUS_SUCCESS, "wrong status %x\n", status );
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 );
ok( is_signaled( event ), "event is signaled\n" ); ok( is_signaled( event ), "event is not signaled\n" );
ok( !apc_count, "apc was called\n" ); ok( !apc_count, "apc was called\n" );
SleepEx( 1, TRUE ); /* alertable sleep */ SleepEx( 1, TRUE ); /* alertable sleep */
todo_wine ok( !apc_count, "apc was called\n" ); todo_wine ok( !apc_count, "apc was called\n" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment