Fabian Maurer : comctl32/tests: Add test for v6 combobox dropdown size.
Alexandre Julliard
julliard at winehq.org
Tue Feb 6 15:55:50 CST 2018
Module: wine
Branch: master
Commit: 1f1e7259e6d0f6e87f79c31f3ff4710ac2a84d27
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f1e7259e6d0f6e87f79c31f3ff4710ac2a84d27
Author: Fabian Maurer <dark.shadow4 at web.de>
Date: Tue Feb 6 10:26:25 2018 +0300
comctl32/tests: Add test for v6 combobox dropdown size.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/comctl32/tests/combo.c | 110 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 110 insertions(+)
diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c
index 895d942..da2ded2 100644
--- a/dlls/comctl32/tests/combo.c
+++ b/dlls/comctl32/tests/combo.c
@@ -1151,6 +1151,114 @@ static void test_combo_WS_VSCROLL(void)
DestroyWindow(hCombo);
}
+static void test_combo_dropdown_size(DWORD style)
+{
+ static const char wine_test[] = "Wine Test";
+ HWND hCombo, hList;
+ COMBOBOXINFO cbInfo;
+ int i, test, ret;
+
+ static const struct list_size_info
+ {
+ int num_items;
+ int height_combo;
+ int limit;
+ } info_height[] = {
+ {33, 50, -1},
+ {35, 50, 40},
+ {15, 50, 3},
+ };
+
+ for (test = 0; test < sizeof(info_height) / sizeof(info_height[0]); test++)
+ {
+ const struct list_size_info *info_test = &info_height[test];
+ int height_item; /* Height of a list item */
+ int height_list; /* Height of the list we got */
+ int expected_height_list;
+ RECT rect_list_client;
+ int min_visible_expected;
+
+ hCombo = CreateWindowA(WC_COMBOBOXA, "Combo", CBS_DROPDOWN | WS_VISIBLE | WS_CHILD | style, 5, 5, 100,
+ info_test->height_combo, hMainWnd, (HMENU)COMBO_ID, NULL, 0);
+
+ min_visible_expected = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0);
+ todo_wine
+ ok(min_visible_expected == 30, "Unexpected number of items %d.\n", min_visible_expected);
+
+ cbInfo.cbSize = sizeof(COMBOBOXINFO);
+ ret = SendMessageA(hCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)&cbInfo);
+ ok(ret, "Failed to get combo info, %d\n", ret);
+
+ hList = cbInfo.hwndList;
+ for (i = 0; i < info_test->num_items; i++)
+ {
+ ret = SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM) wine_test);
+ ok(ret == i, "Failed to add string %d, returned %d.\n", i, ret);
+ }
+
+ if (info_test->limit != -1)
+ {
+ int min_visible_actual;
+ min_visible_expected = info_test->limit;
+
+ ret = SendMessageA(hCombo, CB_SETMINVISIBLE, min_visible_expected, 0);
+ todo_wine
+ ok(ret, "Failed to set visible limit.\n");
+ min_visible_actual = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0);
+ todo_wine
+ ok(min_visible_expected == min_visible_actual, "test %d: unexpected number of items %d.\n",
+ test, min_visible_actual);
+ }
+
+ ret = SendMessageA(hCombo, CB_SHOWDROPDOWN, TRUE,0);
+ ok(ret, "Failed to show dropdown.\n");
+ ret = SendMessageA(hCombo, CB_GETDROPPEDSTATE, 0, 0);
+ ok(ret, "Unexpected dropped state.\n");
+
+ GetClientRect(hList, &rect_list_client);
+ height_list = rect_list_client.bottom - rect_list_client.top;
+ height_item = (int)SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0);
+
+ if (style & CBS_NOINTEGRALHEIGHT)
+ {
+ RECT rect_list_complete;
+ int list_height_nonclient;
+ int list_height_calculated;
+ int edit_padding_size = cbInfo.rcItem.top; /* edit client rect top is the padding it has to its parent
+ We assume it's the same on the bottom */
+
+ GetWindowRect(hList, &rect_list_complete);
+
+ list_height_nonclient = (rect_list_complete.bottom - rect_list_complete.top)
+ - (rect_list_client.bottom - rect_list_client.top);
+
+ /* Calculate the expected client size of the listbox popup from the size of the combobox. */
+ list_height_calculated = info_test->height_combo /* Take height we created combobox with */
+ - (cbInfo.rcItem.bottom - cbInfo.rcItem.top) /* Subtract size of edit control */
+ - list_height_nonclient /* Subtract list nonclient area */
+ - edit_padding_size * 2; /* subtract space around the edit control */
+
+ expected_height_list = min(list_height_calculated, height_item * info_test->num_items);
+ if (expected_height_list < 0)
+ expected_height_list = 0;
+
+ todo_wine
+ ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n",
+ test, expected_height_list, height_list);
+ }
+ else
+ {
+ expected_height_list = min(info_test->num_items, min_visible_expected) * height_item;
+
+ todo_wine
+ ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n",
+ test, expected_height_list, height_list);
+ }
+
+ DestroyWindow(hCombo);
+ }
+}
+
START_TEST(combo)
{
ULONG_PTR ctx_cookie;
@@ -1192,6 +1300,8 @@ START_TEST(combo)
test_combo_listbox_styles(CBS_SIMPLE);
test_combo_listbox_styles(CBS_DROPDOWN);
test_combo_listbox_styles(CBS_DROPDOWNLIST);
+ test_combo_dropdown_size(0);
+ test_combo_dropdown_size(CBS_NOINTEGRALHEIGHT);
cleanup();
unload_v6_module(ctx_cookie, hCtx);
More information about the wine-cvs
mailing list