wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Henri Verbeet : d3d8: Rename abort_stateblock() to delete_stateblock() in the stateblock tests.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: d6f48927227791b22da3bc6e5578479adce9f93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f48927227791b22da3bc6e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 09:02:58 2009 +0200 d3d8: Rename abort_stateblock() to delete_stateblock() in the stateblock tests. --- dlls/d3d8/tests/stateblock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index a742fe5..e31a964 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -317,7 +317,7 @@ static int end_stateblock(IDirect3DDevice8 *device, struct event_data *event_dat return EVENT_OK; } -static int abort_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) +static int delete_stateblock(IDirect3DDevice8 *device, struct event_data *event_data) { IDirect3DDevice8_DeleteStateBlock(device, event_data->stateblock); return EVENT_OK; @@ -367,7 +367,7 @@ static void execute_test_chain_all(IDirect3DDevice8 *device, struct state_test * { {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, - {abort_stateblock, SB_DATA_DEFAULT, SB_DATA_NONE}, + {delete_stateblock, SB_DATA_DEFAULT, SB_DATA_NONE}, }; struct event apply_stateblock_events[] =

1 0

Henri Verbeet : d3d9: Use separate fields for data to check/ apply in the stateblock tests.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 3cb7e872845ad8627ae4b844485a36c5a81f4c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb7e872845ad8627ae4b8444… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 09:02:57 2009 +0200 d3d9: Use separate fields for data to check/apply in the stateblock tests. --- dlls/d3d9/tests/stateblock.c | 140 +++++++++++++++++++++++------------------- 1 files changed, 77 insertions(+), 63 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 5479bb8..5a22b4a 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -139,13 +139,8 @@ struct state_test void* test_context; }; -/* See below for explanation of the flags */ -#define EVENT_OK 0x00 -#define EVENT_CHECK_DEFAULT 0x01 -#define EVENT_CHECK_INITIAL 0x02 -#define EVENT_CHECK_TEST 0x04 -#define EVENT_ERROR 0x08 -#define EVENT_APPLY_DATA 0x10 +#define EVENT_OK 0 +#define EVENT_ERROR -1 struct event_data { @@ -154,12 +149,43 @@ struct event_data IDirect3DSwapChain9 *new_swap_chain; }; +enum stateblock_data +{ + SB_DATA_NONE = 0, + SB_DATA_DEFAULT, + SB_DATA_INITIAL, + SB_DATA_TEST_IN, + SB_DATA_TEST, +}; + struct event { int (*event_fn)(IDirect3DDevice9 *device, struct event_data *event_data); - int status; + enum stateblock_data check; + enum stateblock_data apply; }; +static const void *get_event_data(const struct state_test *test, enum stateblock_data data) +{ + switch (data) + { + case SB_DATA_DEFAULT: + return test->default_data; + + case SB_DATA_INITIAL: + return test->initial_data; + + case SB_DATA_TEST_IN: + return test->test_data_in; + + case SB_DATA_TEST: + return test->test_data_out; + + default: + return NULL; + } +} + /* This is an event-machine, which tests things. * It tests get and set operations for a batch of states, based on * results from the event function, which directs what's to be done */ @@ -167,51 +193,39 @@ struct event static void execute_test_chain(IDirect3DDevice9 *device, struct state_test *test, unsigned int ntests, struct event *event, unsigned int nevents, struct event_data *event_data) { - int outcome; - unsigned int i = 0, j; + unsigned int i, j; /* For each queued event */ - for (j=0; j < nevents; j++) { + for (j = 0; j < nevents; ++j) + { + const void *data; - /* Execute the next event handler (if available) or just set the supplied status */ - outcome = event[j].status; + /* Execute the next event handler (if available). */ if (event[j].event_fn) - outcome |= event[j].event_fn(device, event_data); - - /* Now verify correct outcome depending on what was signaled by the handler. - * An EVENT_CHECK_TEST signal means check the returned data against the test_data (out). - * An EVENT_CHECK_DEFAULT signal means check the returned data against the default_data. - * An EVENT_CHECK_INITIAL signal means check the returned data against the initial_data. - * An EVENT_ERROR signal means the test isn't going to work, exit the event loop. - * An EVENT_APPLY_DATA signal means load the test data (after checks) */ - - if (outcome & EVENT_ERROR) { - trace("Test %s, Stage %u in error state, aborting\n", test[i].test_name, j); - break; - + { + if (event[j].event_fn(device, event_data) == EVENT_ERROR) + { + trace("Stage %u in error state, aborting.\n", j); + break; + } } - else if (outcome & (EVENT_CHECK_TEST | EVENT_CHECK_DEFAULT | EVENT_CHECK_INITIAL)) + + if (event[j].check != SB_DATA_NONE) { for (i = 0; i < ntests; ++i) { - if (outcome & EVENT_CHECK_TEST) - { - test[i].check_data(device, j, &test[i], test[i].test_data_out); - } - else if (outcome & EVENT_CHECK_DEFAULT) - { - test[i].check_data(device, j, &test[i], test[i].default_data); - } - else if (outcome & EVENT_CHECK_INITIAL) - { - test[i].check_data(device, j, &test[i], test[i].initial_data); - } + data = get_event_data(&test[i], event[j].check); + test[i].check_data(device, j, &test[i], data); } } - if (outcome & EVENT_APPLY_DATA) { - for (i=0; i < ntests; i++) - test[i].set_handler(device, &test[i], test[i].test_data_in); + if (event[j].apply != SB_DATA_NONE) + { + for (i = 0; i < ntests; ++i) + { + data = get_event_data(&test[i], event[j].apply); + test[i].set_handler(device, &test[i], data); + } } } @@ -341,51 +355,51 @@ static void execute_test_chain_all(IDirect3DDevice9 *device, struct state_test * struct event read_events[] = { - { NULL, EVENT_CHECK_INITIAL } + {NULL, SB_DATA_INITIAL, SB_DATA_NONE}, }; struct event write_read_events[] = { - { NULL, EVENT_APPLY_DATA }, - { NULL, EVENT_CHECK_TEST } + {NULL, SB_DATA_NONE, SB_DATA_TEST_IN}, + {NULL, SB_DATA_TEST, SB_DATA_NONE}, }; struct event abort_stateblock_events[] = { - { begin_stateblock, EVENT_APPLY_DATA }, - { end_stateblock, EVENT_OK }, - { abort_stateblock, EVENT_CHECK_DEFAULT } + {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, + {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, + {abort_stateblock, SB_DATA_DEFAULT, SB_DATA_NONE}, }; struct event apply_stateblock_events[] = { - { begin_stateblock, EVENT_APPLY_DATA }, - { end_stateblock, EVENT_OK }, - { apply_stateblock, EVENT_CHECK_TEST } + {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, + {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, + {apply_stateblock, SB_DATA_TEST, SB_DATA_NONE}, }; struct event capture_reapply_stateblock_events[] = { - { begin_stateblock, EVENT_APPLY_DATA }, - { end_stateblock, EVENT_OK }, - { capture_stateblock, EVENT_CHECK_DEFAULT | EVENT_APPLY_DATA }, - { apply_stateblock, EVENT_CHECK_DEFAULT } + {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, + {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, + {capture_stateblock, SB_DATA_DEFAULT, SB_DATA_TEST_IN}, + {apply_stateblock, SB_DATA_DEFAULT, SB_DATA_NONE}, }; struct event rendertarget_switch_events[] = { - { NULL, EVENT_APPLY_DATA }, - { switch_render_target, EVENT_CHECK_TEST }, - { revert_render_target, EVENT_OK } + {NULL, SB_DATA_NONE, SB_DATA_TEST_IN}, + {switch_render_target, SB_DATA_TEST, SB_DATA_NONE}, + {revert_render_target, SB_DATA_NONE, SB_DATA_NONE}, }; struct event rendertarget_stateblock_events[] = { - { begin_stateblock, EVENT_APPLY_DATA }, - { switch_render_target, EVENT_CHECK_DEFAULT }, - { end_stateblock, EVENT_OK }, - { revert_render_target, EVENT_OK }, - { apply_stateblock, EVENT_CHECK_TEST } + {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, + {switch_render_target, SB_DATA_DEFAULT, SB_DATA_NONE}, + {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, + {revert_render_target, SB_DATA_NONE, SB_DATA_NONE}, + {apply_stateblock, SB_DATA_TEST, SB_DATA_NONE}, }; /* Setup each test for execution */

1 0

Henri Verbeet : d3d8: Use separate fields for data to check/ apply in the stateblock tests.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: fb5079815d51462c6a1e2f3bc3fc5a56f4072590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5079815d51462c6a1e2f3bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 09:02:56 2009 +0200 d3d8: Use separate fields for data to check/apply in the stateblock tests. --- dlls/d3d8/tests/stateblock.c | 131 +++++++++++++++++++++++------------------- 1 files changed, 72 insertions(+), 59 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index 43996f6..a742fe5 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -138,12 +138,8 @@ struct state_test }; /* See below for explanation of the flags */ -#define EVENT_OK 0x00 -#define EVENT_CHECK_DEFAULT 0x01 -#define EVENT_CHECK_INITIAL 0x02 -#define EVENT_CHECK_TEST 0x04 -#define EVENT_ERROR 0x08 -#define EVENT_APPLY_DATA 0x10 +#define EVENT_OK 0 +#define EVENT_ERROR -1 struct event_data { @@ -152,64 +148,81 @@ struct event_data IDirect3DSwapChain8 *new_swap_chain; }; +enum stateblock_data +{ + SB_DATA_NONE = 0, + SB_DATA_DEFAULT, + SB_DATA_INITIAL, + SB_DATA_TEST_IN, + SB_DATA_TEST, +}; + struct event { int (*event_fn)(IDirect3DDevice8 *device, struct event_data *event_data); - int status; + enum stateblock_data check; + enum stateblock_data apply; }; +static const void *get_event_data(const struct state_test *test, enum stateblock_data data) +{ + switch (data) + { + case SB_DATA_DEFAULT: + return test->default_data; + + case SB_DATA_INITIAL: + return test->initial_data; + + case SB_DATA_TEST_IN: + return test->test_data_in; + + case SB_DATA_TEST: + return test->test_data_out; + + default: + return NULL; + } +} + /* This is an event-machine, which tests things. * It tests get and set operations for a batch of states, based on * results from the event function, which directs what's to be done */ static void execute_test_chain(IDirect3DDevice8 *device, struct state_test *test, unsigned int ntests, struct event *event, unsigned int nevents, struct event_data *event_data) { - unsigned int i = 0, j; - int outcome; + unsigned int i, j; /* For each queued event */ for (j = 0; j < nevents; ++j) { - /* Execute the next event handler (if available) or just set the supplied status */ - outcome = event[j].status; - if (event[j].event_fn) outcome |= event[j].event_fn(device, event_data); - - /* Now verify correct outcome depending on what was signaled by the handler. - * An EVENT_CHECK_TEST signal means check the returned data against the test_data (out). - * An EVENT_CHECK_DEFAULT signal means check the returned data against the default_data. - * An EVENT_CHECK_INITIAL signal means check the returned data against the initial_data. - * An EVENT_ERROR signal means the test isn't going to work, exit the event loop. - * An EVENT_APPLY_DATA signal means load the test data (after checks) */ - - if (outcome & EVENT_ERROR) + const void *data; + + /* Execute the next event handler (if available). */ + if (event[j].event_fn) { - trace("Test %s, Stage %u in error state, aborting\n", test[i].test_name, j); - break; + if (event[j].event_fn(device, event_data) == EVENT_ERROR) + { + trace("Stage %u in error state, aborting.\n", j); + break; + } } - else if (outcome & EVENT_CHECK_TEST || outcome & EVENT_CHECK_DEFAULT || outcome & EVENT_CHECK_INITIAL) + + if (event[j].check != SB_DATA_NONE) { for (i = 0; i < ntests; ++i) { - if (outcome & EVENT_CHECK_TEST) - { - test[i].check_data(device, j, &test[i], test[i].test_data_out); - } - else if (outcome & EVENT_CHECK_DEFAULT) - { - test[i].check_data(device, j, &test[i], test[i].default_data); - } - else if (outcome & EVENT_CHECK_INITIAL) - { - test[i].check_data(device, j, &test[i], test[i].initial_data); - } + data = get_event_data(&test[i], event[j].check); + test[i].check_data(device, j, &test[i], data); } } - if (outcome & EVENT_APPLY_DATA) + if (event[j].apply != SB_DATA_NONE) { for (i = 0; i < ntests; ++i) { - test[i].set_handler(device, &test[i], test[i].test_data_in); + data = get_event_data(&test[i], event[j].apply); + test[i].set_handler(device, &test[i], data); } } } @@ -341,51 +354,51 @@ static void execute_test_chain_all(IDirect3DDevice8 *device, struct state_test * struct event read_events[] = { - {NULL, EVENT_CHECK_INITIAL}, + {NULL, SB_DATA_INITIAL, SB_DATA_NONE}, }; struct event write_read_events[] = { - {NULL, EVENT_APPLY_DATA}, - {NULL, EVENT_CHECK_TEST}, + {NULL, SB_DATA_NONE, SB_DATA_TEST_IN}, + {NULL, SB_DATA_TEST, SB_DATA_NONE}, }; struct event abort_stateblock_events[] = { - {begin_stateblock, EVENT_APPLY_DATA}, - {end_stateblock, EVENT_OK}, - {abort_stateblock, EVENT_CHECK_DEFAULT}, + {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, + {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, + {abort_stateblock, SB_DATA_DEFAULT, SB_DATA_NONE}, }; struct event apply_stateblock_events[] = { - {begin_stateblock, EVENT_APPLY_DATA}, - {end_stateblock, EVENT_OK}, - {apply_stateblock, EVENT_CHECK_TEST}, + {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, + {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, + {apply_stateblock, SB_DATA_TEST, SB_DATA_NONE}, }; struct event capture_reapply_stateblock_events[] = { - {begin_stateblock, EVENT_APPLY_DATA}, - {end_stateblock, EVENT_OK}, - {capture_stateblock, EVENT_CHECK_DEFAULT | EVENT_APPLY_DATA}, - {apply_stateblock, EVENT_CHECK_DEFAULT}, + {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, + {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, + {capture_stateblock, SB_DATA_DEFAULT, SB_DATA_TEST_IN}, + {apply_stateblock, SB_DATA_DEFAULT, SB_DATA_NONE}, }; struct event rendertarget_switch_events[] = { - {NULL, EVENT_APPLY_DATA}, - {switch_render_target, EVENT_CHECK_TEST}, - {revert_render_target, EVENT_OK}, + {NULL, SB_DATA_NONE, SB_DATA_TEST_IN}, + {switch_render_target, SB_DATA_TEST, SB_DATA_NONE}, + {revert_render_target, SB_DATA_NONE, SB_DATA_NONE}, }; struct event rendertarget_stateblock_events[] = { - {begin_stateblock, EVENT_APPLY_DATA}, - {switch_render_target, EVENT_CHECK_DEFAULT}, - {end_stateblock, EVENT_OK}, - {revert_render_target, EVENT_OK}, - {apply_stateblock, EVENT_CHECK_TEST}, + {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, + {switch_render_target, SB_DATA_DEFAULT, SB_DATA_NONE}, + {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, + {revert_render_target, SB_DATA_NONE, SB_DATA_NONE}, + {apply_stateblock, SB_DATA_TEST, SB_DATA_NONE}, }; /* Setup each test for execution */

1 0

Henri Verbeet : d3d9: Get rid of the unused "return_data_buffer" in the stateblock tests.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 063d3d181bc26c0a6599ed1765a072500683d5c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=063d3d181bc26c0a6599ed176… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 09:02:55 2009 +0200 d3d9: Get rid of the unused "return_data_buffer" in the stateblock tests. --- dlls/d3d9/tests/stateblock.c | 31 +++---------------------------- 1 files changed, 3 insertions(+), 28 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 764e35b..5479bb8 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/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 = { {0x1337c0de, 0x1337c0de, 0x1337c0de, 0x1337c0de}, @@ -548,10 +543,7 @@ static void shader_constant_check_data(IDirect3DDevice9 *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 == NULL) 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; @@ -590,11 +582,6 @@ struct light_arg unsigned int idx; }; -struct light_context -{ - struct light_data return_data_buffer; -}; - static const struct light_data light_poison_data = { { @@ -771,10 +758,7 @@ static void light_check_data(IDirect3DDevice9 *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 == NULL) 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; @@ -810,11 +794,6 @@ struct transform_data D3DMATRIX world255; }; -struct transform_context -{ - struct transform_data return_data_buffer; -}; - static const struct transform_data transform_default_data = { {{{ @@ -1027,10 +1006,7 @@ static void transform_check_data(IDirect3DDevice9 *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 == NULL) 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; @@ -1178,7 +1154,6 @@ 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;

1 0

Henri Verbeet : d3d8: Get rid of the unused "return_data_buffer" in the stateblock tests.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 17909a0c521582e66fe0deea68486b986ec3c9d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17909a0c521582e66fe0deea6… 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)

1 0

Marcus Meissner : wpp: Fixed resource leakages (Coverity).
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 15968fadef203d45620709d341fc397841210b7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=15968fadef203d45620709d34… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 7 08:59:22 2009 +0200 wpp: Fixed resource leakages (Coverity). --- libs/wpp/wpp.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index e6a1a83..afca1bb 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -216,12 +216,16 @@ int wpp_parse_temp( const char *input, const char *output_base, char **output_na if((fd = mkstemps( temp_name, 0 )) == -1) { ppy_error("Could not generate a temp name from %s\n", temp_name); + free( temp_name ); return 2; } if (!(output = fdopen(fd, "wt"))) { ppy_error("Could not open fd %s for writing\n", temp_name); + close( fd ); + unlink( temp_name ); + free( temp_name ); return 2; }

1 0

Nikolay Sivov : comctl32/monthcal: Invalidate unconditonally on MCM_SETFIRSTDAYOFWEEK.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 41db6f8500c1a631ca1606220052c820200a6396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41db6f8500c1a631ca1606220… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Oct 7 04:25:45 2009 +0400 comctl32/monthcal: Invalidate unconditonally on MCM_SETFIRSTDAYOFWEEK. --- dlls/comctl32/monthcal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 5a34a37..893a505 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1138,6 +1138,8 @@ MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, INT day) infoPtr->firstDayHighWord = TRUE; } + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + return prev; }

1 0

Nikolay Sivov : comctl32/monthcal: Recalculate control layout on MCS_WEEKNUMBERS style change.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 526e1d81a34c1baeb93558dc06d7ff44c176eac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=526e1d81a34c1baeb93558dc0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Oct 7 03:50:02 2009 +0400 comctl32/monthcal: Recalculate control layout on MCS_WEEKNUMBERS style change. --- dlls/comctl32/monthcal.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 5793ca5..5a34a37 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2191,6 +2191,10 @@ static INT MONTHCAL_StyleChanged(MONTHCAL_INFO *infoPtr, WPARAM wStyleType, infoPtr->dwStyle = lpss->styleNew; + /* make room for week numbers */ + if ((lpss->styleNew ^ lpss->styleOld) & MCS_WEEKNUMBERS) + MONTHCAL_UpdateSize(infoPtr); + return 0; }

1 0

Nikolay Sivov : comctl32/monthcal: Update day of week properly while iterating with prev/ next buttons and hit testing.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 689a9eb5df3191eaf819c6e5a334ab508da6f758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=689a9eb5df3191eaf819c6e5a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Oct 7 03:19:52 2009 +0400 comctl32/monthcal: Update day of week properly while iterating with prev/next buttons and hit testing. --- dlls/comctl32/monthcal.c | 70 +++++++++++++++++++++++++-------------------- 1 files changed, 39 insertions(+), 31 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 21c72d1..5793ca5 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -382,6 +382,30 @@ int MONTHCAL_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year) DayOfWeekTable[month-1] + day ) % 7); } +/* properly updates date to point on next month */ +void inline MONTHCAL_GetNextMonth(SYSTEMTIME *date) +{ + if(++date->wMonth > 12) + { + date->wMonth = 1; + date->wYear++; + } + date->wDayOfWeek = MONTHCAL_CalculateDayOfWeek(date->wDay, date->wMonth, + date->wYear); +} + +/* properly updates date to point on prev month */ +void inline MONTHCAL_GetPrevMonth(SYSTEMTIME *date) +{ + if(--date->wMonth < 1) + { + date->wMonth = 12; + date->wYear--; + } + date->wDayOfWeek = MONTHCAL_CalculateDayOfWeek(date->wDay, date->wMonth, + date->wYear); +} + /* From a given point, calculate the row (weekpos), column(daypos) and day in the calendar. day== 0 mean the last day of tha last month */ @@ -1245,7 +1269,7 @@ MONTHCAL_GetCurSel(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) if(!curSel) return FALSE; if(infoPtr->dwStyle & MCS_MULTISELECT) return FALSE; - *curSel = infoPtr->minSel; + *curSel = infoPtr->curSel; TRACE("%d/%d/%d\n", curSel->wYear, curSel->wMonth, curSel->wDay); return TRUE; } @@ -1499,36 +1523,28 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) if(PtInRect(&infoPtr->days, lpht->pt)) { lpht->st.wYear = infoPtr->curSel.wYear; - if ( day < 1) + lpht->st.wMonth = infoPtr->curSel.wMonth; + if (day < 1) { retval = MCHT_CALENDARDATEPREV; - lpht->st.wMonth = infoPtr->curSel.wMonth - 1; - if (lpht->st.wMonth < 1) - { - lpht->st.wMonth = 12; - lpht->st.wYear--; - } - lpht->st.wDay = MONTHCAL_MonthLength(lpht->st.wMonth,lpht->st.wYear) + day; + MONTHCAL_GetPrevMonth(&lpht->st); + lpht->st.wDay = MONTHCAL_MonthLength(lpht->st.wMonth, lpht->st.wYear) + day; } - else if (day > MONTHCAL_MonthLength(infoPtr->curSel.wMonth,infoPtr->curSel.wYear)) + else if (day > MONTHCAL_MonthLength(infoPtr->curSel.wMonth, infoPtr->curSel.wYear)) { retval = MCHT_CALENDARDATENEXT; - lpht->st.wMonth = infoPtr->curSel.wMonth + 1; - if (lpht->st.wMonth > 12) - { - lpht->st.wMonth = 1; - lpht->st.wYear++; - } - lpht->st.wDay = day - MONTHCAL_MonthLength(infoPtr->curSel.wMonth,infoPtr->curSel.wYear); + MONTHCAL_GetNextMonth(&lpht->st); + lpht->st.wDay = day - MONTHCAL_MonthLength(infoPtr->curSel.wMonth, infoPtr->curSel.wYear); } else { retval = MCHT_CALENDARDATE; - lpht->st.wMonth = infoPtr->curSel.wMonth; - lpht->st.wDay = day; - lpht->st.wDayOfWeek = MONTHCAL_CalculateDayOfWeek(day,lpht->st.wMonth,lpht->st.wYear); + lpht->st.wDay = day; } + /* always update day of week */ + lpht->st.wDayOfWeek = MONTHCAL_CalculateDayOfWeek(day, lpht->st.wMonth, + lpht->st.wYear); goto done; - } + } if(PtInRect(&infoPtr->todayrect, lpht->pt)) { retval = MCHT_TODAYLINK; goto done; @@ -1575,11 +1591,7 @@ static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) TRACE("\n"); - next.wMonth++; - if(next.wMonth > 12) { - next.wYear++; - next.wMonth = 1; - } + MONTHCAL_GetNextMonth(&next); if(!MONTHCAL_IsDateInValidRange(infoPtr, &next)) return; @@ -1595,11 +1607,7 @@ static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr) TRACE("\n"); - prev.wMonth--; - if(prev.wMonth < 1) { - prev.wYear--; - prev.wMonth = 12; - } + MONTHCAL_GetPrevMonth(&prev); if(!MONTHCAL_IsDateInValidRange(infoPtr, &prev)) return;

1 0

Nikolay Sivov : comctl32/monthcal: Optimize WM_LBUTTONUP handler.
by Alexandre Julliard 07 Oct '09

07 Oct '09

Module: wine Branch: master Commit: 71d4b5fcd4ae3f4fb107a7d2fbd876d6f7b9dd3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d4b5fcd4ae3f4fb107a7d2f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Oct 7 01:20:48 2009 +0400 comctl32/monthcal: Optimize WM_LBUTTONUP handler. --- dlls/comctl32/monthcal.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a2c7aaa..21c72d1 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1,11 +1,12 @@ -/* Month calendar control - +/* + * Month calendar control * * Copyright 1998, 1999 Eric Kohl (ekohl(a)abo.rhein-zeitung.de) * Copyright 1999 Alex Priem (alexp(a)sci.kun.nl) * Copyright 1999 Chris Morgan <cmorgan(a)wpi.edu> and * James Abbatiello <abbeyj(a)wpi.edu> * Copyright 2000 Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> + * Copyright 2009 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1788,16 +1789,19 @@ static LRESULT MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) { NMHDR nmhdr; - BOOL redraw = FALSE; MCHITTESTINFO ht; DWORD hit; TRACE("\n"); if(infoPtr->status & (MC_PREVPRESSED | MC_NEXTPRESSED)) { + RECT *r; + KillTimer(infoPtr->hwndSelf, MC_PREVNEXTMONTHTIMER); + r = infoPtr->status & MC_PREVPRESSED ? &infoPtr->titlebtnprev : &infoPtr->titlebtnnext; infoPtr->status &= ~(MC_PREVPRESSED | MC_NEXTPRESSED); - redraw = TRUE; + + InvalidateRect(infoPtr->hwndSelf, r, FALSE); } ReleaseCapture(); @@ -1818,9 +1822,7 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) infoPtr->status = MC_SEL_LBUTUP; MONTHCAL_SetDayFocus(infoPtr, NULL); - if((hit == MCHT_CALENDARDATENEXT) || - (hit == MCHT_CALENDARDATEPREV) || - (hit == MCHT_CALENDARDATE)) + if((hit & MCHT_CALENDARDATE) == MCHT_CALENDARDATE) { SYSTEMTIME sel = infoPtr->curSel; @@ -1839,14 +1841,8 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) MONTHCAL_NotifySelectionChange(infoPtr); MONTHCAL_NotifySelect(infoPtr); - - return 0; } - /* redraw if necessary */ - if(redraw) - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - return 0; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009