comctl32/ipaddress: Focus first field on WM_SETFOCUS.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49924
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hirofumi Katayama 2020-10-08 17:03:27 +03:00 committed by Alexandre Julliard
parent 6cfc5df3f5
commit 3c29108523
2 changed files with 37 additions and 0 deletions

View File

@ -632,6 +632,10 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
case IPM_ISBLANK: case IPM_ISBLANK:
return IPADDRESS_IsBlank (infoPtr); return IPADDRESS_IsBlank (infoPtr);
case WM_SETFOCUS:
IPADDRESS_SetFocusToField (infoPtr, 0);
break;
default: default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam);

View File

@ -113,6 +113,37 @@ static void test_IPM_SETFOCUS(void)
DestroyWindow(hwnd); DestroyWindow(hwnd);
} }
static void test_WM_SETFOCUS(void)
{
struct child_enum child_enum = {{ 0 }};
unsigned int ret, from, to, i;
HWND hwnd;
hwnd = create_ipaddress_control();
ok(!!hwnd, "Failed to create control.\n");
ret = SendMessageA(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(0, 1, 2, 3));
ok(ret, "Unexpected return value %u.\n", ret);
EnumChildWindows(hwnd, test_child_enum_proc, (LPARAM)&child_enum);
ok(child_enum.count == 4, "Unexpected child count %u.\n", child_enum.count);
SetFocus(child_enum.fields[3]);
for (i = 0; i < 3; ++i)
SendMessageA(child_enum.fields[i], EM_SETSEL, -1, 0);
SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to);
ok(from == 0 && to == 0, "Unexpected selection %u x %u.\n", from, to);
SetFocus(hwnd);
SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to);
ok(from == 0 && to == 1, "Unexpected selection %u x %u.\n", from, to);
DestroyWindow(hwnd);
}
START_TEST(ipaddress) START_TEST(ipaddress)
{ {
ULONG_PTR cookie; ULONG_PTR cookie;
@ -120,12 +151,14 @@ START_TEST(ipaddress)
test_get_set_text(); test_get_set_text();
test_IPM_SETFOCUS(); test_IPM_SETFOCUS();
test_WM_SETFOCUS();
if (!load_v6_module(&cookie, &ctxt)) if (!load_v6_module(&cookie, &ctxt))
return; return;
test_get_set_text(); test_get_set_text();
test_IPM_SETFOCUS(); test_IPM_SETFOCUS();
test_WM_SETFOCUS();
unload_v6_module(cookie, ctxt); unload_v6_module(cookie, ctxt);
} }