[PATCH 2/4] user32/combo: Don't update item height on WM_SETFONT for owner drawn CB.

[Paul Gofman]

From: Paul Gofman

---
 dlls/user32/combo.c       | 3 ++-
 dlls/user32/tests/combo.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c
index 7486385ac37..5f2ddb3dcdf 100644
--- a/dlls/user32/combo.c
+++ b/dlls/user32/combo.c
@@ -1467,7 +1467,8 @@ static void COMBO_Size( HEADCOMBO *lphc )
 static void COMBO_Font( LPHEADCOMBO lphc, HFONT hFont, BOOL bRedraw )
 {
   lphc->hFont = hFont;
-  lphc->item_height = combo_get_text_height(lphc);
+  if (!CB_OWNERDRAWN(lphc))
+    lphc->item_height = combo_get_text_height(lphc);

/*
    * Propagate to owned windows.
diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c
index 59c810a0203..77dec2382bd 100644
--- a/dlls/user32/tests/combo.c
+++ b/dlls/user32/tests/combo.c
@@ -956,7 +956,7 @@ static void test_combo_setfont(void)
     ret = GetComboBoxInfo( combo, &info );
     ok( ret, "got error %lu.\n", GetLastError() );
     r2 = info.rcItem;
-    todo_wine ok( !memcmp( &r1, &r2, sizeof(r1) ), "got %s, expected %s.\n", wine_dbgstr_rect(&r2), wine_dbgstr_rect(&r1) );
+    ok( !memcmp( &r1, &r2, sizeof(r1) ), "got %s, expected %s.\n", wine_dbgstr_rect(&r2), wine_dbgstr_rect(&r1) );
     DestroyWindow(combo);

DeleteObject(hf);