Henri Verbeet : d3d8/tests: Fix test_ApplyStateBlock() (Valgrind).
Alexandre Julliard
julliard at winehq.org
Thu Jan 20 12:41:20 CST 2011
Module: wine
Branch: master
Commit: 3d64b44c8c4ab172d4db67b6d3ffd8549687e7ba
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d64b44c8c4ab172d4db67b6d3ffd8549687e7ba
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Jan 19 19:20:10 2011 +0100
d3d8/tests: Fix test_ApplyStateBlock() (Valgrind).
---
dlls/d3d8/tests/device.c | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index e4aabf4..edcb72b 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -2084,33 +2084,32 @@ static void test_ApplyStateBlock(void)
goto cleanup;
}
- IDirect3DDevice8_CreateStateBlock(device, D3DSBT_ALL, &token);
- ok(token !=0, "received null token\n");
-
IDirect3DDevice8_BeginStateBlock(device);
IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, TRUE);
IDirect3DDevice8_EndStateBlock(device, &token);
+ ok(token, "Received zero stateblock handle.\n");
IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE);
hr = IDirect3DDevice8_GetRenderState(device, D3DRS_ZENABLE, &received);
- ok(hr==D3D_OK, "Expected= D3D_OK, Got= %#x\n", hr);
- ok(received==FALSE, "Expected = TRUE, received FALSE\n");
+ ok(hr == D3D_OK, "Expected D3D_OK, received %#x.\n", hr);
+ ok(!received, "Expected = FALSE, received TRUE.\n");
IDirect3DDevice8_ApplyStateBlock(device, 0);
- ok(hr == D3D_OK, "Expected= D3D_OK, Got= %#x\n", hr);
+ ok(hr == D3D_OK, "Expected D3D_OK, received %#x.\n", hr);
hr = IDirect3DDevice8_GetRenderState(device, D3DRS_ZENABLE, &received);
- ok(hr==D3D_OK, "Expected= D3D_OK, Got= %#x\n", hr);
- ok(received==FALSE, "Expected = TRUE, received FALSE\n");
+ ok(hr == D3D_OK, "Expected D3D_OK, received %#x.\n", hr);
+ ok(!received, "Expected FALSE, received TRUE.\n");
IDirect3DDevice8_ApplyStateBlock(device, token);
- ok(hr == D3D_OK, "Expected= D3D_OK, Got= %#x\n", hr);
+ ok(hr == D3D_OK, "Expected D3D_OK, received %#x.\n", hr);
hr = IDirect3DDevice8_GetRenderState(device, D3DRS_ZENABLE, &received);
- ok(hr==D3D_OK, "Expected= D3D_OK, Got= %#x\n", hr);
- ok(received==TRUE, "Expected = TRUE, received FALSE\n");
+ ok(hr == D3D_OK, "Expected D3D_OK, received %#x.\n", hr);
+ ok(received, "Expected TRUE, received FALSE.\n");
- cleanup:
- if(device) IDirect3DDevice8_Release(device);
- if(d3d8) IDirect3D8_Release(d3d8);
+ IDirect3DDevice8_DeleteStateBlock(device, token);
+ IDirect3DDevice8_Release(device);
+cleanup:
+ if (d3d8) IDirect3D8_Release(d3d8);
}
START_TEST(device)
More information about the wine-cvs
mailing list