Re: ntdll: Fix a few failing tests in Vista

[Alexandre Julliard]

"James Hawkins" <jhawkins(a)codeweavers.com> writes:
> @@ -325,13 +327,21 @@ static void read_file_test(void)
>      iosb.Information = 0xdeadbeef;
>      offset.QuadPart = strlen(text) + 2;
>      status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, 2, &offset, NULL );
> -    ok( status == STATUS_END_OF_FILE, "wrong status %x\n", status );
> -    ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status );
> -    ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information );
> -    ok( !is_signaled( event ), "event is signaled\n" );
> +    ok( status == STATUS_END_OF_FILE ||
> +        status == STATUS_PENDING, /* Vista */
> +        "wrong status %x\n", status );
> +    ok( U(iosb).Status == 0xdeadbabe ||
> +        U(iosb).Status == STATUS_END_OF_FILE, /* Vista */
> +        "wrong status %x\n", U(iosb).Status );
> +    ok( iosb.Information == 0xdeadbeef ||
> +        iosb.Information == 0, /* Vista */
> +        "wrong info %lu\n", iosb.Information );
>      ok( !apc_count, "apc was called\n" );
>      SleepEx( 1, TRUE ); /* alertable sleep */
> -    ok( !apc_count, "apc was called\n" );
> +    if ( is_signaled( event ) )
> +        ok( apc_count == 1, "apc was not called\n" );
> +    else
> +        ok( !apc_count, "apc was called\n" );

The results are not independent, they should all depend on whether we
got STATUS_PENDING or not.

-- 
Alexandre Julliard
julliard(a)winehq.org