Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
- index fd60e18a97f..b1cb0ef16c2 100644
- --- a/dlls/comctl32/tests/listview.c
- +++ b/dlls/comctl32/tests/listview.c
- @@ -3610,16 +3610,6 @@ static void test_ownerdata(void)
- DestroyWindow(hwnd);
- }
- -struct kbd_select_sequence {
- - BOOL hold_shift;
- - BOOL hold_control;
- - UINT press_key;
- - UINT selected_count;
- - const char *context;
- - const struct message *expected;
- - BOOL todo;
- -};
- -
- static void test_ownerdata_multiselect(void)
- {
- HWND hwnd;
- @@ -3627,7 +3617,19 @@ static void test_ownerdata_multiselect(void)
- LVITEMA item;
- unsigned int i;
- char buf[256];
- - struct kbd_select_sequence sequence[] = {
- +
- + static const struct
- + {
- + BOOL hold_shift;
- + BOOL hold_control;
- + UINT press_key;
- + UINT selected_count;
- + const char *context;
- + const struct message *expected;
- + BOOL todo;
- + }
- + key_tests[] =
- + {
- /* First down then up */
- { TRUE, FALSE, VK_DOWN, 2, "select multiple via SHIFT+DOWN",
- ownerdata_multiselect_select_0_to_1_odstatechanged_seq, FALSE },
- @@ -3679,29 +3681,29 @@ static void test_ownerdata_multiselect(void)
- expect(0, res);
- /* Select/deselect rows using UP/DOWN and SHIFT/CONTROL keys */
- - for (i = 0; i < ARRAY_SIZE(sequence); i++)
- + for (i = 0; i < ARRAY_SIZE(key_tests); i++)
- {
- flush_sequences(sequences, NUM_MSG_SEQUENCES);
- - if (sequence[i].hold_shift)
- + if (key_tests[i].hold_shift)
- hold_key(VK_SHIFT);
- - if (sequence[i].hold_control)
- + if (key_tests[i].hold_control)
- hold_key(VK_CONTROL);
- - res = SendMessageA(hwnd, WM_KEYDOWN, sequence[i].press_key, 0);
- + res = SendMessageA(hwnd, WM_KEYDOWN, key_tests[i].press_key, 0);
- expect(0, res);
- - sprintf(buf, "ownerdata multiselect: %s", sequence[i].context);
- - ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, sequence[i].expected,
- - buf, sequence[i].todo);
- - res = SendMessageA(hwnd, WM_KEYUP, sequence[i].press_key, 0);
- + sprintf(buf, "ownerdata multiselect: %s", key_tests[i].context);
- + ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, key_tests[i].expected,
- + buf, key_tests[i].todo);
- + res = SendMessageA(hwnd, WM_KEYUP, key_tests[i].press_key, 0);
- expect(0, res);
- res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0);
- - expect(sequence[i].selected_count, res);
- + expect(key_tests[i].selected_count, res);
- - if (sequence[i].hold_shift)
- + if (key_tests[i].hold_shift)
- release_key(VK_SHIFT);
- - if (sequence[i].hold_control)
- + if (key_tests[i].hold_control)
- release_key(VK_CONTROL);
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement