Revert "user32/combo: Set listbox popup height correctly and add tests.".

This partly reverts commit f7f7b89e (tests are left in place). Any application that currently uses "Microsoft.Windows.Common-Controls v6" via a Manifest has the possibility of breaking comboboxes. Using this version of the control ensures that dropdown for comboboxes, will show multiple items, regardless of its height in the resource. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

Revert "user32/combo: Set listbox popup height correctly and add tests.".
f0fc0349 · Sebastian Lackner · Alexandre Julliard · 2b622aab · f0fc0349 · f0fc0349
Commit f0fc0349 authored Dec 10, 2017 by Sebastian Lackner Committed by Alexandre Julliard Dec 11, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 10 deletions

combo.c dlls/user32/combo.c +8 -0

combo.c dlls/user32/tests/combo.c +10 -10

No files found.
--- a/dlls/user32/combo.c
+++ b/dlls/user32/combo.c
@@ -1044,6 +1044,14 @@ static void CBDropDown( LPHEADCOMBO lphc )

      if (nHeight < nDroppedHeight - COMBO_YBORDERSIZE())
         nDroppedHeight = nHeight + COMBO_YBORDERSIZE();
+
+      if (nDroppedHeight < nHeight)
+      {
+            if (nItems < 5)
+                nDroppedHeight = (nItems+1)*nIHeight;
+            else if (nDroppedHeight < 6*nIHeight)
+                nDroppedHeight = 6*nIHeight;
+      }
   }

   r.left = rect.left;

--- a/dlls/user32/tests/combo.c
+++ b/dlls/user32/tests/combo.c
@@ -718,25 +718,25 @@ static void test_listbox_size(DWORD style)
        int height_combo;
        BOOL todo;
    } info_height[] = {
-        {2, 24},
+        {2, 24, TRUE},
        {2, 41, TRUE},
-        {2, 42},
-        {2, 50},
+        {2, 42, TRUE},
+        {2, 50, TRUE},
        {2, 60},
        {2, 80},
        {2, 89},
        {2, 90},
        {2, 100},

-        {10, 24},
+        {10, 24, TRUE},
        {10, 41, TRUE},
-        {10, 42},
-        {10, 50},
-        {10, 60},
-        {10, 80},
+        {10, 42, TRUE},
+        {10, 50, TRUE},
+        {10, 60, TRUE},
+        {10, 80, TRUE},
        {10, 89, TRUE},
-        {10, 90},
-        {10, 100},
+        {10, 90, TRUE},
+        {10, 100, TRUE},
    };

    pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo");