ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: edit: Improve handling of WM_KEYDOWN VK_RETURN in a dialog mode.

Browse Source
This commit is contained in:
Sergey Khodych 2009-08-25 18:01:05 +03:00 committed by Alexandre Julliard
parent d4707dbb60
commit 205a7f7f03
2 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/user32/edit.c
View File

@ -3619,21 +3619,20 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key)
/* If the edit doesn't want the return send a message to the default object */ /* If the edit doesn't want the return send a message to the default object */
if(!(es->style & ES_MULTILINE) || !(es->style & ES_WANTRETURN)) if(!(es->style & ES_MULTILINE) || !(es->style & ES_WANTRETURN))
{ {
HWND hwndParent; DWORD dw;
DWORD dw;
if (!EDIT_IsInsideDialog(es)) return 1; if (!EDIT_IsInsideDialog(es)) break;
if (control) break; if (control) break;
hwndParent = GetParent(es->hwndSelf); dw = SendMessageW(es->hwndParent, DM_GETDEFID, 0, 0);
dw = SendMessageW( hwndParent, DM_GETDEFID, 0, 0 ); if (HIWORD(dw) == DC_HASDEFID)
if (HIWORD(dw) == DC_HASDEFID) {
{ HWND hwDefCtrl = GetDlgItem(es->hwndParent, LOWORD(dw));
SendMessageW( hwndParent, WM_COMMAND, if (hwDefCtrl)
MAKEWPARAM( LOWORD(dw), BN_CLICKED ), {
(LPARAM)GetDlgItem( hwndParent, LOWORD(dw) ) ); SendMessageW(es->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, (LPARAM)TRUE);
} PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0);
else }
SendMessageW( hwndParent, WM_COMMAND, IDOK, (LPARAM)GetDlgItem( hwndParent, IDOK ) ); }
} }
break; break;
case VK_ESCAPE: case VK_ESCAPE:

24
dlls/user32/tests/edit.c
View File

@ -28,6 +28,7 @@
#define ES_COMBO 0x200 #define ES_COMBO 0x200
#endif #endif
#define ID_EDITTESTDBUTTON 0x123
#define ID_EDITTEST2 99 #define ID_EDITTEST2 99
#define MAXLEN 200 #define MAXLEN 200
@ -1819,7 +1820,7 @@ static void test_edit_dialog(void)
r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 6); r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 6);
ok(444 == r, "Expected %d, got %d\n", 444, r); ok(444 == r, "Expected %d, got %d\n", 444, r);
r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 7); r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 7);
todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); ok(444 == r, "Expected %d, got %d\n", 444, r);
r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 8); r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 8);
ok(444 == r, "Expected %d, got %d\n", 444, r); ok(444 == r, "Expected %d, got %d\n", 444, r);
@ -1843,7 +1844,7 @@ static void test_edit_dialog(void)
r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 6); r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 6);
ok(444 == r, "Expected %d, got %d\n", 444, r); ok(444 == r, "Expected %d, got %d\n", 444, r);
r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 7); r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 7);
todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); ok(444 == r, "Expected %d, got %d\n", 444, r);
r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 8); r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 8);
ok(444 == r, "Expected %d, got %d\n", 444, r); ok(444 == r, "Expected %d, got %d\n", 444, r);
@ -2115,7 +2116,7 @@ static LRESULT CALLBACK dialog_mode_wnd_proc(HWND hwnd, UINT iMsg, WPARAM wParam
break; break;
case DM_GETDEFID: case DM_GETDEFID:
dm_messages.wm_getdefid++; dm_messages.wm_getdefid++;
return 0; return MAKELONG(ID_EDITTESTDBUTTON, DC_HASDEFID);
case WM_NEXTDLGCTL: case WM_NEXTDLGCTL:
dm_messages.wm_nextdlgctl++; dm_messages.wm_nextdlgctl++;
break; break;
@ -2129,7 +2130,7 @@ static LRESULT CALLBACK dialog_mode_wnd_proc(HWND hwnd, UINT iMsg, WPARAM wParam
static void test_dialogmode(void) static void test_dialogmode(void)
{ {
HWND hwEdit, hwParent; HWND hwEdit, hwParent, hwButton;
MSG msg= {0}; MSG msg= {0};
int len, r; int len, r;
hwEdit = create_child_editcontrol(ES_MULTILINE, 0); hwEdit = create_child_editcontrol(ES_MULTILINE, 0);
@ -2241,6 +2242,21 @@ static void test_dialogmode(void)
test_dm_messages(0, 0, 0, 1); test_dm_messages(0, 0, 0, 1);
zero_dm_messages(); zero_dm_messages();
r = SendMessage(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001);
ok(1 == r, "expected 1, got %d\n", r);
test_dm_messages(0, 0, 1, 0);
zero_dm_messages();
hwButton = CreateWindow("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON,
100, 100, 50, 20, hwParent, (HMENU)ID_EDITTESTDBUTTON, hinst, NULL);
ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError());
r = SendMessage(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001);
ok(1 == r, "expected 1, got %d\n", r);
test_dm_messages(0, 0, 1, 1);
zero_dm_messages();
DestroyWindow(hwButton);
destroy_child_editcontrol(hwEdit); destroy_child_editcontrol(hwEdit);
} }