Re: [PATCH] d3dx9/tests: Fix some test failures

[Matteo Bruni]

2016-01-19 22:17 GMT+01:00 Nikolay Sivov <nsivov(a)codeweavers.com>:
> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
> ---
>  dlls/d3dx9_36/tests/mesh.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
> index 7c86190..1afba18 100644
> --- a/dlls/d3dx9_36/tests/mesh.c
> +++ b/dlls/d3dx9_36/tests/mesh.c
> @@ -11109,21 +11109,25 @@ static void D3DXCreateAnimationControllerTest(void)
>      hr = D3DXCreateAnimationController(0, 0, 0, 0, NULL);
>      ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr);
>
> +    animation = (void*)0xdeadbeef;
>      hr = D3DXCreateAnimationController(0, 1, 1, 1, &animation);
>      ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr);
> -    ok(!animation, "Got unexpected animation %p.\n", animation);
> +    ok(animation == (void*)0xdeadbeef, "Got unexpected animation %p.\n", animation);
>
> +    animation = (void*)0xdeadbeef;
>      hr = D3DXCreateAnimationController(1, 0, 1, 1, &animation);
>      ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr);
> -    ok(!animation, "Got unexpected animation %p.\n", animation);
> +    ok(animation == (void*)0xdeadbeef, "Got unexpected animation %p.\n", animation);
>
> +    animation = (void*)0xdeadbeef;
>      hr = D3DXCreateAnimationController(1, 1, 0, 1, &animation);
>      ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr);
> -    ok(!animation, "Got unexpected animation %p.\n", animation);
> +    ok(animation == (void*)0xdeadbeef, "Got unexpected animation %p.\n", animation);
>
> +    animation = (void*)0xdeadbeef;
>      hr = D3DXCreateAnimationController(1, 1, 1, 0, &animation);
>      ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr);
> -    ok(!animation, "Got unexpected animation %p.\n", animation);
> +    ok(animation == (void*)0xdeadbeef, "Got unexpected animation %p.\n", animation);
>
> hr = D3DXCreateAnimationController(1, 1, 1, 1, &animation);
>      ok(hr == D3D_OK, "Got unexpected hr returned %#x.\n", hr);
> --
> 2.7.0.rc3

Ugh.
I'm late to the signoff party but thanks for the patch.