marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

riched20: Single-line control must refuse to insert carriage returns (with tests).

oldstable
Alex Villacís Lasso 2007-10-18 11:02:09 -05:00 committed by Alexandre Julliard
parent c54219fb40
commit f54aa40746
2 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/riched20/editor.c
View File

@ -2431,7 +2431,9 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam,
SendMessageW(editor->hWnd, EM_UNDO, 0, 0);
return 0;
}
if (((unsigned)wstr)>=' ' || wstr=='\r' || wstr=='\t') {
if (((unsigned)wstr)>=' '
|| (wstr=='\r' && (GetWindowLongW(hWnd, GWL_STYLE) & ES_MULTILINE))
|| wstr=='\t') {
/* FIXME maybe it would make sense to call EM_REPLACESEL instead ? */
/* WM_CHAR is restricted to nTextLimit */
int from, to;

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

@ -2058,6 +2058,56 @@ static void test_unicode_conversions(void)
DestroyWindow(hwnd);
}
static void test_WM_CHAR(void)
{
HWND hwnd;
int ret;
const char * char_list = "abc\rabc\r";
const char * expected_content_single = "abcabc";
const char * expected_content_multi = "abc\r\nabc\r\n";
char buffer[64] = {0};
const char * p;
/* single-line control must IGNORE carriage returns */
hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP,
0, 0, 200, 60, 0, 0, 0, 0);
ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError());
p = char_list;
while (*p != '\0') {
SendMessageA(hwnd, WM_KEYDOWN, *p, 1);
ret = SendMessageA(hwnd, WM_CHAR, *p, 1);
ok(ret == 0, "WM_CHAR('%c') ret=%d\n", *p, ret);
SendMessageA(hwnd, WM_KEYUP, *p, 1);
p++;
}
SendMessage(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer);
ret = strcmp(buffer, expected_content_single);
ok(ret == 0, "WM_GETTEXT recovered incorrect string!\n");
DestroyWindow(hwnd);
/* multi-line control inserts CR normally */
hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP|ES_MULTILINE,
0, 0, 200, 60, 0, 0, 0, 0);
ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError());
p = char_list;
while (*p != '\0') {
SendMessageA(hwnd, WM_KEYDOWN, *p, 1);
ret = SendMessageA(hwnd, WM_CHAR, *p, 1);
ok(ret == 0, "WM_CHAR('%c') ret=%d\n", *p, ret);
SendMessageA(hwnd, WM_KEYUP, *p, 1);
p++;
}
SendMessage(hwnd, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer);
ret = strcmp(buffer, expected_content_multi);
ok(ret == 0, "WM_GETTEXT recovered incorrect string!\n");
DestroyWindow(hwnd);
}
static void test_EM_GETTEXTLENGTHEX(void)
{
@ -2205,6 +2255,7 @@ START_TEST( editor )
hmoduleRichEdit = LoadLibrary("RICHED20.DLL");
ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError());
test_WM_CHAR();
test_EM_FINDTEXT();
test_EM_GETLINE();
test_EM_SCROLLCARET();