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

user32: Make an edit test more readable.

This commit is contained in:
Lei Zhang 2008-03-27 11:48:44 -07:00 committed by Alexandre Julliard
parent 06d429d6b6
commit 1560203215
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,23 +37,24 @@ struct edit_notify {
static struct edit_notify notifications; static struct edit_notify notifications;
static INT_PTR CALLBACK bug_11841_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
{ {
switch (msg) switch (msg)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
{ {
SetFocus(GetDlgItem(hdlg, 1000)); HWND hedit = GetDlgItem(hdlg, 1000);
SetFocus(hedit);
switch (lparam) switch (lparam)
{ {
case 0: case 0:
PostMessage(GetDlgItem(hdlg, 1000), WM_KEYDOWN, 0x1b, 0x10001); PostMessage(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001);
break; break;
case 1: case 1:
PostMessage(GetDlgItem(hdlg, 1000), WM_KEYDOWN, 0xd, 0x1c0001); PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001);
break; break;
case 2: case 2:
PostMessage(GetDlgItem(hdlg, 1000), WM_KEYDOWN, 0x9, 0xf0001); PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001);
PostMessage(hdlg, WM_USER, 0xdeadbeef, 0xdeadbeef); PostMessage(hdlg, WM_USER, 0xdeadbeef, 0xdeadbeef);
break; break;
default: default:
@ -1198,14 +1199,16 @@ static void test_undo(void)
DestroyWindow (hwEdit); DestroyWindow (hwEdit);
} }
static void test_bug_11841(void) static void test_edit_dialog(void)
{ {
int r; int r;
r = DialogBoxParam(hinst, "BUG_11841_DIALOG", NULL, (DLGPROC)bug_11841_proc, 0);
/* from bug 11841 */
r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 0);
ok(333 == r, "Expected %d, got %d\n", 333, r); ok(333 == r, "Expected %d, got %d\n", 333, r);
r = DialogBoxParam(hinst, "BUG_11841_DIALOG", NULL, (DLGPROC)bug_11841_proc, 1); r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 1);
ok(111 == r, "Expected %d, got %d\n", 111, r); ok(111 == r, "Expected %d, got %d\n", 111, r);
r = DialogBoxParam(hinst, "BUG_11841_DIALOG", NULL, (DLGPROC)bug_11841_proc, 2); r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 2);
ok(444 == r, "Expected %d, got %d\n", 444, r); ok(444 == r, "Expected %d, got %d\n", 444, r);
} }
@ -1277,7 +1280,7 @@ START_TEST(edit)
test_text_position(); test_text_position();
test_espassword(); test_espassword();
test_undo(); test_undo();
test_bug_11841(); test_edit_dialog();
UnregisterWindowClasses(); UnregisterWindowClasses();
} }

4
dlls/user32/tests/resource.rc
View File

@ -98,9 +98,9 @@ BEGIN
PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14
END END
BUG_11841_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 EDIT_READONLY_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80
STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER
CAPTION "Bug 11841 Test" CAPTION "Edit Readonly Test"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
{ {
PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP