[PATCH 4/6] comctl32/combo: Properly handle WM_CTLCOLORSTATIC

[Fabian Maurer]

Signed-off-by: Fabian Maurer <dark.shadow4 at web.de>
---
 dlls/comctl32/combo.c       | 3 +++
 dlls/comctl32/tests/combo.c | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c
index 8a52a0bdc0..8df2992eee 100644
--- a/dlls/comctl32/combo.c
+++ b/dlls/comctl32/combo.c
@@ -2137,6 +2137,9 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam
         lphc->visibleItems = (INT)wParam;
         return TRUE;

+    case WM_CTLCOLORSTATIC:
+        return SendMessageW(lphc->owner, WM_CTLCOLORSTATIC, wParam, (LPARAM)lphc->hWndEdit);
+
     default:
         if (message >= WM_USER)
             WARN("unknown msg WM_USER+%04x wp=%04lx lp=%08lx\n", message - WM_USER, wParam, lParam );
diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c
index 5a1ba408f0..3d5832aee6 100644
--- a/dlls/comctl32/tests/combo.c
+++ b/dlls/comctl32/tests/combo.c
@@ -1283,7 +1283,6 @@ static void test_WM_CTLCOLORSTATIC(void)
     result = GetObjectA(brush, sizeof(logbrush), &logbrush);
     ok(result > 0, "GetObject failed: %d!\n", GetLastError());

-    todo_wine
     ok(logbrush.lbColor == color_expected, "Expected %x, got %x\n", color_expected, logbrush.lbColor);

     DestroyWindow(handle_combo);
--
2.23.0