comctl32/combo: Properly handle WM_CTLCOLOR* messages.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46417 Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
2feab9b99d
commit
1dc3ec2cdc
|
@ -1963,6 +1963,16 @@ static LRESULT CALLBACK COMBO_WindowProc( HWND hwnd, UINT message, WPARAM wParam
|
||||||
if (GET_WHEEL_DELTA_WPARAM(wParam) < 0) return SendMessageW(hwnd, WM_KEYDOWN, VK_DOWN, 0);
|
if (GET_WHEEL_DELTA_WPARAM(wParam) < 0) return SendMessageW(hwnd, WM_KEYDOWN, VK_DOWN, 0);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
|
case WM_CTLCOLOR:
|
||||||
|
case WM_CTLCOLORMSGBOX:
|
||||||
|
case WM_CTLCOLOREDIT:
|
||||||
|
case WM_CTLCOLORLISTBOX:
|
||||||
|
case WM_CTLCOLORBTN:
|
||||||
|
case WM_CTLCOLORDLG:
|
||||||
|
case WM_CTLCOLORSCROLLBAR:
|
||||||
|
case WM_CTLCOLORSTATIC:
|
||||||
|
return SendMessageW(lphc->owner, message, wParam, lParam);
|
||||||
|
|
||||||
/* Combo messages */
|
/* Combo messages */
|
||||||
case CB_ADDSTRING:
|
case CB_ADDSTRING:
|
||||||
if (lphc->dwStyle & CBS_LOWERCASE)
|
if (lphc->dwStyle & CBS_LOWERCASE)
|
||||||
|
|
|
@ -1306,7 +1306,6 @@ static void test_combo_ctlcolor(void)
|
||||||
for (i = 0; i < ARRAY_SIZE(messages); ++i)
|
for (i = 0; i < ARRAY_SIZE(messages); ++i)
|
||||||
{
|
{
|
||||||
brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem);
|
brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem);
|
||||||
todo_wine
|
|
||||||
ok(brush == brush_red, "%u: unexpected brush %p, expected got %p.\n", i, brush, brush_red);
|
ok(brush == brush_red, "%u: unexpected brush %p, expected got %p.\n", i, brush, brush_red);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1317,7 +1316,6 @@ static void test_combo_ctlcolor(void)
|
||||||
for (i = 0; i < ARRAY_SIZE(messages); ++i)
|
for (i = 0; i < ARRAY_SIZE(messages); ++i)
|
||||||
{
|
{
|
||||||
brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem);
|
brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem);
|
||||||
todo_wine
|
|
||||||
ok(!brush, "%u: unexpected brush %p.\n", i, brush);
|
ok(!brush, "%u: unexpected brush %p.\n", i, brush);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1344,7 +1342,6 @@ static void test_combo_ctlcolor(void)
|
||||||
for (i = 0; i < ARRAY_SIZE(messages); ++i)
|
for (i = 0; i < ARRAY_SIZE(messages); ++i)
|
||||||
{
|
{
|
||||||
brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem);
|
brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem);
|
||||||
todo_wine
|
|
||||||
ok(!brush, "%u: unexpected brush %p.\n", i, brush);
|
ok(!brush, "%u: unexpected brush %p.\n", i, brush);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue