user32/tests: Drop superfluous function pointer casts.
This commit is contained in:
parent
e6cf9fbcc2
commit
8cd1d5839f
|
@ -1150,7 +1150,7 @@ static void test_DialogBoxParamA(void)
|
||||||
static void test_DisabledDialogTest(void)
|
static void test_DisabledDialogTest(void)
|
||||||
{
|
{
|
||||||
g_terminated = FALSE;
|
g_terminated = FALSE;
|
||||||
DialogBoxParam(g_hinst, "IDD_DIALOG", NULL, (DLGPROC)disabled_test_proc, 0);
|
DialogBoxParam(g_hinst, "IDD_DIALOG", NULL, disabled_test_proc, 0);
|
||||||
ok(FALSE == g_terminated, "dialog with disabled ok button has been terminated\n");
|
ok(FALSE == g_terminated, "dialog with disabled ok button has been terminated\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1950,57 +1950,57 @@ static void test_edit_dialog(void)
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
/* from bug 11841 */
|
/* from bug 11841 */
|
||||||
r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 0);
|
r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, 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, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 1);
|
r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, 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, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 2);
|
r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 2);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
|
|
||||||
/* more tests for WM_CHAR */
|
/* more tests for WM_CHAR */
|
||||||
r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 3);
|
r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 3);
|
||||||
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, 4);
|
r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 4);
|
||||||
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, 5);
|
r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, edit_dialog_proc, 5);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
|
|
||||||
/* more tests for WM_KEYDOWN + WM_CHAR */
|
/* more tests for WM_KEYDOWN + WM_CHAR */
|
||||||
r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 6);
|
r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, 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, edit_dialog_proc, 7);
|
||||||
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, edit_dialog_proc, 8);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
|
|
||||||
/* tests with an editable edit control */
|
/* tests with an editable edit control */
|
||||||
r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 0);
|
r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, 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, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 1);
|
r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, 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, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 2);
|
r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 2);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
|
|
||||||
/* tests for WM_CHAR */
|
/* tests for WM_CHAR */
|
||||||
r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 3);
|
r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 3);
|
||||||
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, 4);
|
r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 4);
|
||||||
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, 5);
|
r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 5);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
|
|
||||||
/* tests for WM_KEYDOWN + WM_CHAR */
|
/* tests for WM_KEYDOWN + WM_CHAR */
|
||||||
r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 6);
|
r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, 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, edit_dialog_proc, 7);
|
||||||
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, edit_dialog_proc, 8);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
|
|
||||||
/* multiple tab tests */
|
/* multiple tab tests */
|
||||||
r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 9);
|
r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 9);
|
||||||
ok(22 == r, "Expected %d, got %d\n", 22, r);
|
ok(22 == r, "Expected %d, got %d\n", 22, r);
|
||||||
r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 10);
|
r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, edit_dialog_proc, 10);
|
||||||
ok(33 == r, "Expected %d, got %d\n", 33, r);
|
ok(33 == r, "Expected %d, got %d\n", 33, r);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2009,13 +2009,13 @@ static void test_multi_edit_dialog(void)
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
/* test for multiple edit dialogs (bug 12319) */
|
/* test for multiple edit dialogs (bug 12319) */
|
||||||
r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, (DLGPROC)multi_edit_dialog_proc, 0);
|
r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, multi_edit_dialog_proc, 0);
|
||||||
ok(2222 == r, "Expected %d, got %d\n", 2222, r);
|
ok(2222 == r, "Expected %d, got %d\n", 2222, r);
|
||||||
r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, (DLGPROC)multi_edit_dialog_proc, 1);
|
r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, multi_edit_dialog_proc, 1);
|
||||||
ok(1111 == r, "Expected %d, got %d\n", 1111, r);
|
ok(1111 == r, "Expected %d, got %d\n", 1111, r);
|
||||||
r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, (DLGPROC)multi_edit_dialog_proc, 2);
|
r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, multi_edit_dialog_proc, 2);
|
||||||
ok(2222 == r, "Expected %d, got %d\n", 2222, r);
|
ok(2222 == r, "Expected %d, got %d\n", 2222, r);
|
||||||
r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, (DLGPROC)multi_edit_dialog_proc, 3);
|
r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, multi_edit_dialog_proc, 3);
|
||||||
ok(11 == r, "Expected %d, got %d\n", 11, r);
|
ok(11 == r, "Expected %d, got %d\n", 11, r);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2024,27 +2024,27 @@ static void test_wantreturn_edit_dialog(void)
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
/* tests for WM_KEYDOWN */
|
/* tests for WM_KEYDOWN */
|
||||||
r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 0);
|
r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_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, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 1);
|
r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 1);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 2);
|
r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 2);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
|
|
||||||
/* tests for WM_CHAR */
|
/* tests for WM_CHAR */
|
||||||
r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 3);
|
r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 3);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 4);
|
r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 4);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 5);
|
r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 5);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
|
|
||||||
/* tests for WM_KEYDOWN + WM_CHAR */
|
/* tests for WM_KEYDOWN + WM_CHAR */
|
||||||
r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 6);
|
r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_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_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 7);
|
r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 7);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 8);
|
r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, edit_wantreturn_dialog_proc, 8);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2053,51 +2053,51 @@ static void test_singleline_wantreturn_edit_dialog(void)
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
/* tests for WM_KEYDOWN */
|
/* tests for WM_KEYDOWN */
|
||||||
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 0);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 0);
|
||||||
ok(222 == r, "Expected %d, got %d\n", 222, r);
|
ok(222 == r, "Expected %d, got %d\n", 222, r);
|
||||||
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 1);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_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, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 2);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 2);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
|
|
||||||
/* tests for WM_CHAR */
|
/* tests for WM_CHAR */
|
||||||
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 3);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 3);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 4);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 4);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 5);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 5);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
|
|
||||||
/* tests for WM_KEYDOWN + WM_CHAR */
|
/* tests for WM_KEYDOWN + WM_CHAR */
|
||||||
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 6);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 6);
|
||||||
ok(222 == r, "Expected %d, got %d\n", 222, r);
|
ok(222 == r, "Expected %d, got %d\n", 222, r);
|
||||||
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 7);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 7);
|
||||||
ok(111 == r, "Expected %d, got %d\n", 111, r);
|
ok(111 == r, "Expected %d, got %d\n", 111, r);
|
||||||
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 8);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, edit_singleline_dialog_proc, 8);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
|
|
||||||
/* tests for WM_KEYDOWN */
|
/* tests for WM_KEYDOWN */
|
||||||
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 0);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 0);
|
||||||
ok(222 == r, "Expected %d, got %d\n", 222, r);
|
ok(222 == r, "Expected %d, got %d\n", 222, r);
|
||||||
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 1);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_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, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 2);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 2);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
|
|
||||||
/* tests for WM_CHAR */
|
/* tests for WM_CHAR */
|
||||||
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 3);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 3);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 4);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 4);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 5);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 5);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
|
|
||||||
/* tests for WM_KEYDOWN + WM_CHAR */
|
/* tests for WM_KEYDOWN + WM_CHAR */
|
||||||
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 6);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 6);
|
||||||
ok(222 == r, "Expected %d, got %d\n", 222, r);
|
ok(222 == r, "Expected %d, got %d\n", 222, r);
|
||||||
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 7);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 7);
|
||||||
ok(111 == r, "Expected %d, got %d\n", 111, r);
|
ok(111 == r, "Expected %d, got %d\n", 111, r);
|
||||||
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 8);
|
r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, edit_singleline_dialog_proc, 8);
|
||||||
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
ok(444 == r, "Expected %d, got %d\n", 444, r);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11236,7 +11236,7 @@ static void test_dialog_messages(void)
|
||||||
cls.lpszClassName = "MyDialogClass";
|
cls.lpszClassName = "MyDialogClass";
|
||||||
cls.hInstance = GetModuleHandle(0);
|
cls.hInstance = GetModuleHandle(0);
|
||||||
/* need a cast since a dlgproc is used as a wndproc */
|
/* need a cast since a dlgproc is used as a wndproc */
|
||||||
cls.lpfnWndProc = (WNDPROC)test_dlg_proc;
|
cls.lpfnWndProc = test_dlg_proc;
|
||||||
if (!RegisterClass(&cls)) assert(0);
|
if (!RegisterClass(&cls)) assert(0);
|
||||||
|
|
||||||
hdlg = CreateDialogParam(0, "CLASS_TEST_DIALOG_2", 0, test_dlg_proc, 0);
|
hdlg = CreateDialogParam(0, "CLASS_TEST_DIALOG_2", 0, test_dlg_proc, 0);
|
||||||
|
|
Loading…
Reference in New Issue