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

richedit: Remove indication for bCRLF, now that ME_GetTextW() knows how to honor CR and LF counters. 

EM_GETTEXTRANGE and EM_GETSELTEXT are affected by this, so include tests to ensure no behavior was broken.
oldstable
Alex Villacís Lasso 2008-04-26 21:16:41 -05:00 committed by Alexandre Julliard
parent e8aa9dee56
commit 3a271386ec
3 changed files with 134 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/riched20/editor.c
View File

@ -2594,12 +2594,12 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam,
rng->chrg.cpMin, rng->chrg.cpMax, unicode,
editor->bEmulateVersion10, ME_GetTextLength(editor));
if (unicode)
return ME_GetTextW(editor, rng->lpstrText, rng->chrg.cpMin, rng->chrg.cpMax-rng->chrg.cpMin, editor->bEmulateVersion10);
return ME_GetTextW(editor, rng->lpstrText, rng->chrg.cpMin, rng->chrg.cpMax-rng->chrg.cpMin, 0);
else
{
int nLen = rng->chrg.cpMax-rng->chrg.cpMin;
WCHAR *p = ALLOC_N_OBJ(WCHAR, nLen+1);
int nChars = ME_GetTextW(editor, p, rng->chrg.cpMin, nLen, editor->bEmulateVersion10);
int nChars = ME_GetTextW(editor, p, rng->chrg.cpMin, nLen, 0);
/* FIXME this is a potential security hole (buffer overrun)
if you know more about wchar->mbyte conversion please explain
*/

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

@ -753,6 +753,67 @@ static void test_WM_GETTEXT(void)
DestroyWindow(hwndRichEdit);
}
static void test_EM_GETTEXTRANGE(void)
{
HWND hwndRichEdit = new_richedit(NULL);
const char * text1 = "foo bar\r\nfoo bar";
const char * text2 = "foo bar\rfoo bar";
const char * expect = "bar\rfoo";
char buffer[1024] = {0};
LRESULT result;
TEXTRANGEA textRange;
SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1);
textRange.lpstrText = buffer;
textRange.chrg.cpMin = 4;
textRange.chrg.cpMax = 11;
result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange);
ok(result == 7, "EM_GETTEXTRANGE returned %ld, expected %d\n",
result, strlen(expect));
ok(!strcmp(expect, buffer), "EM_GETTEXTRANGE filled %s\n", buffer);
SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2);
textRange.lpstrText = buffer;
textRange.chrg.cpMin = 4;
textRange.chrg.cpMax = 11;
result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange);
ok(result == 7, "EM_GETTEXTRANGE returned %ld, expected %d\n",
result, strlen(expect));
ok(!strcmp(expect, buffer), "EM_GETTEXTRANGE filled %s\n", buffer);
DestroyWindow(hwndRichEdit);
}
static void test_EM_GETSELTEXT(void)
{
HWND hwndRichEdit = new_richedit(NULL);
const char * text1 = "foo bar\r\nfoo bar";
const char * text2 = "foo bar\rfoo bar";
const char * expect = "bar\rfoo";
char buffer[1024] = {0};
LRESULT result;
SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1);
SendMessage(hwndRichEdit, EM_SETSEL, 4, 11);
result = SendMessage(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer);
ok(result == 7, "EM_GETTEXTRANGE returned %ld, expected %d\n",
result, strlen(expect));
ok(!strcmp(expect, buffer), "EM_GETTEXTRANGE filled %s\n", buffer);
SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2);
SendMessage(hwndRichEdit, EM_SETSEL, 4, 11);
result = SendMessage(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer);
ok(result == 7, "EM_GETTEXTRANGE returned %ld, expected %d\n",
result, strlen(expect));
ok(!strcmp(expect, buffer), "EM_GETTEXTRANGE filled %s\n", buffer);
DestroyWindow(hwndRichEdit);
}
/* FIXME: need to test unimplemented options and robustly test wparam */
static void test_EM_SETOPTIONS(void)
{
@ -3028,6 +3089,8 @@ START_TEST( editor )
test_TM_PLAINTEXT();
test_EM_SETOPTIONS();
test_WM_GETTEXT();
test_EM_GETTEXTRANGE();
test_EM_GETSELTEXT();
test_EM_AUTOURLDETECT();
test_EM_SETUNDOLIMIT();
test_ES_PASSWORD();

69
dlls/riched32/tests/editor.c
View File

@ -464,6 +464,73 @@ static void test_EM_LINELENGTH(void)
DestroyWindow(hwndRichEdit);
}
static void test_EM_GETTEXTRANGE(void)
{
HWND hwndRichEdit = new_richedit(NULL);
const char * text1 = "foo bar\r\nfoo bar";
const char * text2 = "foo bar\rfoo bar";
const char * expect1 = "bar\r\nfoo";
const char * expect2 = "bar\rfoo";
char buffer[1024] = {0};
LRESULT result;
TEXTRANGEA textRange;
SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1);
textRange.lpstrText = buffer;
textRange.chrg.cpMin = 4;
textRange.chrg.cpMax = 12;
result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange);
ok(result == 8, "EM_GETTEXTRANGE returned %ld, expected %d\n",
result, strlen(expect1));
ok(!strcmp(expect1, buffer), "EM_GETTEXTRANGE filled %s\n", buffer);
SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2);
textRange.lpstrText = buffer;
textRange.chrg.cpMin = 4;
textRange.chrg.cpMax = 11;
result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange);
ok(result == 7, "EM_GETTEXTRANGE returned %ld, expected %d\n",
result, strlen(expect2));
todo_wine {
ok(!strcmp(expect2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer);
}
DestroyWindow(hwndRichEdit);
}
static void test_EM_GETSELTEXT(void)
{
HWND hwndRichEdit = new_richedit(NULL);
const char * text1 = "foo bar\r\nfoo bar";
const char * text2 = "foo bar\rfoo bar";
const char * expect1 = "bar\r\nfoo";
const char * expect2 = "bar\rfoo";
char buffer[1024] = {0};
LRESULT result;
SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1);
SendMessage(hwndRichEdit, EM_SETSEL, 4, 12);
result = SendMessage(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer);
ok(result == 8, "EM_GETTEXTRANGE returned %ld, expected %d\n",
result, strlen(expect1));
ok(!strcmp(expect1, buffer), "EM_GETTEXTRANGE filled %s\n", buffer);
SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2);
SendMessage(hwndRichEdit, EM_SETSEL, 4, 11);
result = SendMessage(hwndRichEdit, EM_GETSELTEXT, 0, (LPARAM)buffer);
ok(result == 7, "EM_GETTEXTRANGE returned %ld, expected %d\n",
result, strlen(expect2));
todo_wine {
ok(!strcmp(expect2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer);
}
DestroyWindow(hwndRichEdit);
}
START_TEST( editor )
{
MSG msg;
@ -475,6 +542,8 @@ START_TEST( editor )
ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError());
test_WM_SETTEXT();
test_EM_GETTEXTRANGE();
test_EM_GETSELTEXT();
test_WM_GETTEXTLENGTH();
test_EM_STREAMIN();
test_EM_STREAMOUT();