From: Paul Gofman pgofman@codeweavers.com
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58932 --- dlls/comctl32/tests/combo.c | 4 ++-- dlls/comctl32_v6/combo.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index e193b9458a4..20cd3a94aec 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1704,7 +1704,7 @@ static LRESULT CALLBACK test_measure_item_wnd_proc(HWND hwnd, UINT msg, WPARAM w expected = get_font_height(GetStockObject(SYSTEM_FONT)) + 2; if (m->itemID == -1) { - todo_wine ok(m->itemHeight == expected, "got %u, expected %u.\n", m->itemHeight, expected); + ok(m->itemHeight == expected, "got %u, expected %u.\n", m->itemHeight, expected); m->itemHeight = expected + 4; } return TRUE; @@ -1745,7 +1745,7 @@ static void test_combo_measureitem(DWORD style) expected = get_font_height(GetStockObject(SYSTEM_FONT)) + 8; if (style & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) expected += 4; - todo_wine_if(style & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) expect_rect(r, 0, 0, 100, expected); + expect_rect(r, 0, 0, 100, expected);
DestroyWindow(combo); DestroyWindow(parent); diff --git a/dlls/comctl32_v6/combo.c b/dlls/comctl32_v6/combo.c index 453f1de7dd9..a8ecf9f74db 100644 --- a/dlls/comctl32_v6/combo.c +++ b/dlls/comctl32_v6/combo.c @@ -239,10 +239,10 @@ static INT CBGetTextAreaHeight(HEADCOMBO *lphc, BOOL clip_item_height) measureItem.CtlID = id; measureItem.itemID = -1; measureItem.itemWidth = clientRect.right; - measureItem.itemHeight = item_height - 6; /* ownerdrawn cb is taller */ + measureItem.itemHeight = item_height - 2; /* ownerdrawn cb is taller */ measureItem.itemData = 0; SendMessageW(lphc->owner, WM_MEASUREITEM, id, (LPARAM)&measureItem); - item_height = 6 + measureItem.itemHeight; + item_height = 2 + measureItem.itemHeight;
/* * Send a second one in the case of a fixed ownerdraw list to calculate the