[PATCH 2/2] gdi32/tests: Fix a D3DKMTCreateDCFromMemory test failure on Windows 7+.

Huw Davies huw at codeweavers.com
Wed Nov 20 03:15:38 CST 2019


On Tue, Nov 12, 2019 at 07:41:38PM +0100, Sven Baars wrote:
> Signed-off-by: Sven Baars <sven.wine at gmail.com>
> ---
>  dlls/gdi32/tests/bitmap.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c
> index c1651b5a2b..bac34d0b69 100644
> --- a/dlls/gdi32/tests/bitmap.c
> +++ b/dlls/gdi32/tests/bitmap.c
> @@ -5782,7 +5782,8 @@ static void test_D3DKMTCreateDCFromMemory( void )
>          create_desc.Height = 7;
>          create_desc.Width = 0;
>          status = pD3DKMTCreateDCFromMemory( &create_desc );
> -        ok(status == test_data[i].status, "%s: Got unexpected status %#x, expected %#x.\n",
> +        ok(status == test_data[i].status || broken(status == STATUS_INVALID_PARAMETER) /* Win7+ */,
> +           "%s: Got unexpected status %#x, expected %#x.\n",
>             test_data[i].name, status, test_data[i].status);
>          if (status == STATUS_SUCCESS)
>          {

I think just removing the width = 0 test would be preferable here.

Huw.



More information about the wine-devel mailing list