Advertisement
Guest User

Untitled

a guest
Aug 1st, 2022
49
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.89 KB | None | 0 0
  1. diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
  2. index fd60e18a97f..b1cb0ef16c2 100644
  3. --- a/dlls/comctl32/tests/listview.c
  4. +++ b/dlls/comctl32/tests/listview.c
  5. @@ -3610,16 +3610,6 @@ static void test_ownerdata(void)
  6. DestroyWindow(hwnd);
  7. }
  8.  
  9. -struct kbd_select_sequence {
  10. - BOOL hold_shift;
  11. - BOOL hold_control;
  12. - UINT press_key;
  13. - UINT selected_count;
  14. - const char *context;
  15. - const struct message *expected;
  16. - BOOL todo;
  17. -};
  18. -
  19. static void test_ownerdata_multiselect(void)
  20. {
  21. HWND hwnd;
  22. @@ -3627,7 +3617,19 @@ static void test_ownerdata_multiselect(void)
  23. LVITEMA item;
  24. unsigned int i;
  25. char buf[256];
  26. - struct kbd_select_sequence sequence[] = {
  27. +
  28. + static const struct
  29. + {
  30. + BOOL hold_shift;
  31. + BOOL hold_control;
  32. + UINT press_key;
  33. + UINT selected_count;
  34. + const char *context;
  35. + const struct message *expected;
  36. + BOOL todo;
  37. + }
  38. + key_tests[] =
  39. + {
  40. /* First down then up */
  41. { TRUE, FALSE, VK_DOWN, 2, "select multiple via SHIFT+DOWN",
  42. ownerdata_multiselect_select_0_to_1_odstatechanged_seq, FALSE },
  43. @@ -3679,29 +3681,29 @@ static void test_ownerdata_multiselect(void)
  44. expect(0, res);
  45.  
  46. /* Select/deselect rows using UP/DOWN and SHIFT/CONTROL keys */
  47. - for (i = 0; i < ARRAY_SIZE(sequence); i++)
  48. + for (i = 0; i < ARRAY_SIZE(key_tests); i++)
  49. {
  50. flush_sequences(sequences, NUM_MSG_SEQUENCES);
  51.  
  52. - if (sequence[i].hold_shift)
  53. + if (key_tests[i].hold_shift)
  54. hold_key(VK_SHIFT);
  55. - if (sequence[i].hold_control)
  56. + if (key_tests[i].hold_control)
  57. hold_key(VK_CONTROL);
  58.  
  59. - res = SendMessageA(hwnd, WM_KEYDOWN, sequence[i].press_key, 0);
  60. + res = SendMessageA(hwnd, WM_KEYDOWN, key_tests[i].press_key, 0);
  61. expect(0, res);
  62. - sprintf(buf, "ownerdata multiselect: %s", sequence[i].context);
  63. - ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, sequence[i].expected,
  64. - buf, sequence[i].todo);
  65. - res = SendMessageA(hwnd, WM_KEYUP, sequence[i].press_key, 0);
  66. + sprintf(buf, "ownerdata multiselect: %s", key_tests[i].context);
  67. + ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, key_tests[i].expected,
  68. + buf, key_tests[i].todo);
  69. + res = SendMessageA(hwnd, WM_KEYUP, key_tests[i].press_key, 0);
  70. expect(0, res);
  71.  
  72. res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0);
  73. - expect(sequence[i].selected_count, res);
  74. + expect(key_tests[i].selected_count, res);
  75.  
  76. - if (sequence[i].hold_shift)
  77. + if (key_tests[i].hold_shift)
  78. release_key(VK_SHIFT);
  79. - if (sequence[i].hold_control)
  80. + if (key_tests[i].hold_control)
  81. release_key(VK_CONTROL);
  82. }
  83.  
  84.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement