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

riched20: EM_SETCHARFORMAT must return 0, not assert, on invalid struct size.

Browse Source
This commit is contained in:
Alex Villacís Lasso 2007-09-26 12:58:24 -05:00 committed by Alexandre Julliard
parent cbd75d3ace
commit be5105e894
3 changed files with 77 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/riched20/editor.c
View File

@ -1732,6 +1732,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam,
CHARFORMAT2W buf, *p; CHARFORMAT2W buf, *p;
BOOL bRepaint = TRUE; BOOL bRepaint = TRUE;
p = ME_ToCF2W(&buf, (CHARFORMAT2W *)lParam); p = ME_ToCF2W(&buf, (CHARFORMAT2W *)lParam);
if (p == NULL) return 0;
if (!wParam || (editor->mode & TM_PLAINTEXT)) if (!wParam || (editor->mode & TM_PLAINTEXT))
ME_SetDefaultCharFormat(editor, p); ME_SetDefaultCharFormat(editor, p);
else if (wParam == (SCF_WORD | SCF_SELECTION)) else if (wParam == (SCF_WORD | SCF_SELECTION))

3
dlls/riched20/style.c
View File

@ -60,8 +60,7 @@ CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from)
return to; return to;
} }
assert(from->cbSize >= sizeof(CHARFORMAT2W)); return (from->cbSize >= sizeof(CHARFORMAT2W)) ? from : NULL;
return from;
} }
void ME_CopyToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) void ME_CopyToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from)

75
dlls/riched20/tests/editor.c
View File

@ -333,6 +333,80 @@ static void test_EM_SCROLLCARET(void)
DestroyWindow(hwndRichEdit); DestroyWindow(hwndRichEdit);
} }
static void test_EM_SETCHARFORMAT(void)
{
HWND hwndRichEdit = new_richedit(NULL);
CHARFORMAT2 cf2;
int rc = 0;
/* Invalid flags, CHARFORMAT2 structure blanked out */
memset(&cf2, 0, sizeof(cf2));
rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) 0xfffffff0,
(LPARAM) &cf2);
ok(rc == 0, "EM_SETCHARFORMAT returned %d instead of 0\n", rc);
/* A valid flag, CHARFORMAT2 structure blanked out */
memset(&cf2, 0, sizeof(cf2));
rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_DEFAULT,
(LPARAM) &cf2);
ok(rc == 0, "EM_SETCHARFORMAT returned %d instead of 0\n", rc);
/* A valid flag, CHARFORMAT2 structure blanked out */
memset(&cf2, 0, sizeof(cf2));
rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_SELECTION,
(LPARAM) &cf2);
ok(rc == 0, "EM_SETCHARFORMAT returned %d instead of 0\n", rc);
/* A valid flag, CHARFORMAT2 structure blanked out */
memset(&cf2, 0, sizeof(cf2));
rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_WORD,
(LPARAM) &cf2);
ok(rc == 0, "EM_SETCHARFORMAT returned %d instead of 0\n", rc);
/* A valid flag, CHARFORMAT2 structure blanked out */
memset(&cf2, 0, sizeof(cf2));
rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL,
(LPARAM) &cf2);
ok(rc == 0, "EM_SETCHARFORMAT returned %d instead of 0\n", rc);
/* Invalid flags, CHARFORMAT2 structure minimally filled */
memset(&cf2, 0, sizeof(cf2));
cf2.cbSize = sizeof(CHARFORMAT2);
rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) 0xfffffff0,
(LPARAM) &cf2);
ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc);
/* A valid flag, CHARFORMAT2 structure minimally filled */
memset(&cf2, 0, sizeof(cf2));
cf2.cbSize = sizeof(CHARFORMAT2);
rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_DEFAULT,
(LPARAM) &cf2);
ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc);
/* A valid flag, CHARFORMAT2 structure minimally filled */
memset(&cf2, 0, sizeof(cf2));
cf2.cbSize = sizeof(CHARFORMAT2);
rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_SELECTION,
(LPARAM) &cf2);
ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc);
/* A valid flag, CHARFORMAT2 structure minimally filled */
memset(&cf2, 0, sizeof(cf2));
cf2.cbSize = sizeof(CHARFORMAT2);
rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_WORD,
(LPARAM) &cf2);
ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc);
/* A valid flag, CHARFORMAT2 structure minimally filled */
memset(&cf2, 0, sizeof(cf2));
cf2.cbSize = sizeof(CHARFORMAT2);
rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL,
(LPARAM) &cf2);
ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc);
DestroyWindow(hwndRichEdit);
}
static void test_EM_SETTEXTMODE(void) static void test_EM_SETTEXTMODE(void)
{ {
HWND hwndRichEdit = new_richedit(NULL); HWND hwndRichEdit = new_richedit(NULL);
@ -2125,6 +2199,7 @@ START_TEST( editor )
test_EM_SCROLLCARET(); test_EM_SCROLLCARET();
test_EM_SCROLL(); test_EM_SCROLL();
test_WM_SETTEXT(); test_WM_SETTEXT();
test_EM_SETCHARFORMAT();
test_EM_SETTEXTMODE(); test_EM_SETTEXTMODE();
test_TM_PLAINTEXT(); test_TM_PLAINTEXT();
test_EM_SETOPTIONS(); test_EM_SETOPTIONS();