[PATCH 6/6] user32/combo: Properly handle WM_CTLCOLORSTATIC

[Fabian Maurer]

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

diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c
index 59c2e6484c..4ee54c85da 100644
--- a/dlls/user32/combo.c
+++ b/dlls/user32/combo.c
@@ -2165,6 +2165,8 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar
 		if( lphc->wState & CBF_EDIT )
 			return SendMessageW(lphc->hWndEdit, EM_LIMITTEXT, wParam, lParam);
 		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",
diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c
index b7859ee817..917e0beb61 100644
--- a/dlls/user32/tests/combo.c
+++ b/dlls/user32/tests/combo.c
@@ -830,7 +830,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