Nikolay Sivov : d3dx9/tests: Fix some test failures.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Jan 20 10:50:01 CST 2016
Module: wine
Branch: master
Commit: 7b38f204586c6441d3666e8082d170fc341bd0ce
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b38f204586c6441d3666e8082d170fc341bd0ce
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Wed Jan 20 00:17:48 2016 +0300
d3dx9/tests: Fix some test failures.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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);
More information about the wine-cvs
mailing list