Henri Verbeet : d3d8: Get rid of the unused "return_data_buffer" in the stateblock tests.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 17909a0c521582e66fe0deea68486b986ec3c9d3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=17909a0c521582e66fe0deea68...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Oct  7 09:02:54 2009 +0200

d3d8: Get rid of the unused "return_data_buffer" in the stateblock tests.

---

 dlls/d3d8/tests/stateblock.c |   40 ++++++----------------------------------
 1 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c
index 43c56cd..43996f6 100644
--- a/dlls/d3d8/tests/stateblock.c
+++ b/dlls/d3d8/tests/stateblock.c
@@ -437,11 +437,6 @@ struct shader_constant_arg
     BOOL pshader;
 };
 
-struct shader_constant_context
-{
-    struct shader_constant_data return_data_buffer;
-};
-
 static const struct shader_constant_data shader_constant_poison_data =
 {
     {1.0f, 2.0f, 3.0f, 4.0f},
@@ -508,10 +503,7 @@ static void shader_constant_check_data(IDirect3DDevice8 *device, unsigned int ch
 
 static HRESULT shader_constant_setup_handler(struct state_test *test)
 {
-    struct shader_constant_context *ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx));
-    if (!ctx) return E_FAIL;
-    test->test_context = ctx;
-
+    test->test_context = NULL;
     test->test_data_in = &shader_constant_test_data;
     test->test_data_out = &shader_constant_test_data;
     test->default_data = &shader_constant_default_data;
@@ -522,7 +514,6 @@ static HRESULT shader_constant_setup_handler(struct state_test *test)
 
 static void shader_constant_teardown_handler(struct state_test *test)
 {
-    HeapFree(GetProcessHeap(), 0, test->test_context);
 }
 
 static void shader_constants_queue_test(struct state_test *test, const struct shader_constant_arg *test_arg)
@@ -550,11 +541,6 @@ struct light_arg
     unsigned int idx;
 };
 
-struct light_context
-{
-    struct light_data return_data_buffer;
-};
-
 static const struct light_data light_poison_data =
 {
     {
@@ -731,10 +717,7 @@ static void light_check_data(IDirect3DDevice8 *device, unsigned int chain_stage,
 
 static HRESULT light_setup_handler(struct state_test *test)
 {
-    struct light_context *ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx));
-    if (!ctx) return E_FAIL;
-    test->test_context = ctx;
-
+    test->test_context = NULL;
     test->test_data_in = &light_test_data_in;
     test->test_data_out = &light_test_data_out;
     test->default_data = &light_default_data;
@@ -745,7 +728,6 @@ static HRESULT light_setup_handler(struct state_test *test)
 
 static void light_teardown_handler(struct state_test *test)
 {
-    HeapFree(GetProcessHeap(), 0, test->test_context);
 }
 
 static void lights_queue_test(struct state_test *test, const struct light_arg *test_arg)
@@ -770,11 +752,6 @@ struct transform_data
     D3DMATRIX world255;
 };
 
-struct transform_context
-{
-    struct transform_data return_data_buffer;
-};
-
 static const struct transform_data transform_default_data =
 {
     {{{
@@ -989,10 +966,7 @@ static void transform_check_data(IDirect3DDevice8 *device, unsigned int chain_st
 
 static HRESULT transform_setup_handler(struct state_test *test)
 {
-    struct transform_context *ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx));
-    if (!ctx) return E_FAIL;
-    test->test_context = ctx;
-
+    test->test_context = NULL;
     test->test_data_in = &transform_test_data;
     test->test_data_out = &transform_test_data;
     test->default_data = &transform_default_data;
@@ -1003,7 +977,6 @@ static HRESULT transform_setup_handler(struct state_test *test)
 
 static void transform_teardown_handler(struct state_test *test)
 {
-    HeapFree(GetProcessHeap(), 0, test->test_context);
 }
 
 static void transform_queue_test(struct state_test *test)
@@ -1105,10 +1078,9 @@ struct render_state_arg
 
 struct render_state_context
 {
-   struct render_state_data return_data_buffer;
-   struct render_state_data default_data_buffer;
-   struct render_state_data test_data_buffer;
-   struct render_state_data poison_data_buffer;
+    struct render_state_data default_data_buffer;
+    struct render_state_data test_data_buffer;
+    struct render_state_data poison_data_buffer;
 };
 
 static void render_state_set_handler(IDirect3DDevice8 *device, const struct state_test *test, const void *data)