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

riched20: EM_FINDTEXT implementation should match richedit character type.

This commit is contained in:
Andrew Eikum 2013-03-22 11:34:42 -05:00 committed by Alexandre Julliard
parent a0a12d7b7c
commit 3f02c24163
2 changed files with 123 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/riched20/editor.c
View File

@ -3850,28 +3850,38 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
} }
case EM_FINDTEXT: case EM_FINDTEXT:
{ {
LRESULT r;
if(!unicode){
FINDTEXTA *ft = (FINDTEXTA *)lParam; FINDTEXTA *ft = (FINDTEXTA *)lParam;
int nChars = MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, NULL, 0); int nChars = MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, NULL, 0);
WCHAR *tmp; WCHAR *tmp;
LRESULT r;
if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL)
MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, tmp, nChars); MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, tmp, nChars);
r = ME_FindText(editor, wParam, &ft->chrg, tmp, NULL); r = ME_FindText(editor, wParam, &ft->chrg, tmp, NULL);
FREE_OBJ( tmp ); FREE_OBJ( tmp );
}else{
FINDTEXTW *ft = (FINDTEXTW *)lParam;
r = ME_FindText(editor, wParam, &ft->chrg, ft->lpstrText, NULL);
}
return r; return r;
} }
case EM_FINDTEXTEX: case EM_FINDTEXTEX:
{ {
LRESULT r;
if(!unicode){
FINDTEXTEXA *ex = (FINDTEXTEXA *)lParam; FINDTEXTEXA *ex = (FINDTEXTEXA *)lParam;
int nChars = MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, NULL, 0); int nChars = MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, NULL, 0);
WCHAR *tmp; WCHAR *tmp;
LRESULT r;
if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL)
MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, tmp, nChars); MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, tmp, nChars);
r = ME_FindText(editor, wParam, &ex->chrg, tmp, &ex->chrgText); r = ME_FindText(editor, wParam, &ex->chrg, tmp, &ex->chrgText);
FREE_OBJ( tmp ); FREE_OBJ( tmp );
}else{
FINDTEXTEXW *ex = (FINDTEXTEXW *)lParam;
r = ME_FindText(editor, wParam, &ex->chrg, ex->lpstrText, &ex->chrgText);
}
return r; return r;
} }
case EM_FINDTEXTW: case EM_FINDTEXTW:

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

@ -217,68 +217,128 @@ static struct find_s find_tests2[] = {
{0, -1, "wineWine wine", 0, -1}, {0, -1, "wineWine wine", 0, -1},
}; };
static void check_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *f, int id) { static WCHAR *atowstr(const char *str)
{
WCHAR *ret;
DWORD len;
len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0);
ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len);
return ret;
}
static void check_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *f, int id, BOOL unicode)
{
int findloc; int findloc;
FINDTEXT ft;
memset(&ft, 0, sizeof(ft)); if(unicode){
ft.chrg.cpMin = f->start; FINDTEXTW ftw;
ft.chrg.cpMax = f->end; memset(&ftw, 0, sizeof(ftw));
ft.lpstrText = f->needle; ftw.chrg.cpMin = f->start;
findloc = SendMessage(hwnd, EM_FINDTEXT, f->flags, (LPARAM) &ft); ftw.chrg.cpMax = f->end;
ftw.lpstrText = atowstr(f->needle);
findloc = SendMessage(hwnd, EM_FINDTEXT, f->flags, (LPARAM) &ftw);
ok(findloc == f->expected_loc, ok(findloc == f->expected_loc,
"EM_FINDTEXT(%s,%d) '%s' in range(%d,%d), flags %08x, got start at %d, expected %d\n", "EM_FINDTEXT(%s,%d,%u) '%s' in range(%d,%d), flags %08x, got start at %d, expected %d\n",
name, id, f->needle, f->start, f->end, f->flags, findloc, f->expected_loc); name, id, unicode, f->needle, f->start, f->end, f->flags, findloc, f->expected_loc);
findloc = SendMessage(hwnd, EM_FINDTEXTW, f->flags, (LPARAM) &ftw);
ok(findloc == f->expected_loc,
"EM_FINDTEXTW(%s,%d,%u) '%s' in range(%d,%d), flags %08x, got start at %d, expected %d\n",
name, id, unicode, f->needle, f->start, f->end, f->flags, findloc, f->expected_loc);
HeapFree(GetProcessHeap(), 0, (void*)ftw.lpstrText);
}else{
FINDTEXTA fta;
memset(&fta, 0, sizeof(fta));
fta.chrg.cpMin = f->start;
fta.chrg.cpMax = f->end;
fta.lpstrText = f->needle;
findloc = SendMessage(hwnd, EM_FINDTEXT, f->flags, (LPARAM) &fta);
ok(findloc == f->expected_loc,
"EM_FINDTEXT(%s,%d,%u) '%s' in range(%d,%d), flags %08x, got start at %d, expected %d\n",
name, id, unicode, f->needle, f->start, f->end, f->flags, findloc, f->expected_loc);
}
} }
static void check_EM_FINDTEXTEX(HWND hwnd, const char *name, struct find_s *f, static void check_EM_FINDTEXTEX(HWND hwnd, const char *name, struct find_s *f,
int id) { int id, BOOL unicode)
{
int findloc; int findloc;
FINDTEXTEX ft;
int expected_end_loc; int expected_end_loc;
memset(&ft, 0, sizeof(ft)); if(unicode){
ft.chrg.cpMin = f->start; FINDTEXTEXW ftw;
ft.chrg.cpMax = f->end; memset(&ftw, 0, sizeof(ftw));
ft.lpstrText = f->needle; ftw.chrg.cpMin = f->start;
findloc = SendMessage(hwnd, EM_FINDTEXTEX, f->flags, (LPARAM) &ft); ftw.chrg.cpMax = f->end;
ftw.lpstrText = atowstr(f->needle);
findloc = SendMessage(hwnd, EM_FINDTEXTEX, f->flags, (LPARAM) &ftw);
ok(findloc == f->expected_loc, ok(findloc == f->expected_loc,
"EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n", "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n",
name, id, f->needle, f->start, f->end, f->flags, findloc); name, id, f->needle, f->start, f->end, f->flags, findloc);
ok(ft.chrgText.cpMin == f->expected_loc, ok(ftw.chrgText.cpMin == f->expected_loc,
"EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n", "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n",
name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMin); name, id, f->needle, f->start, f->end, f->flags, ftw.chrgText.cpMin);
expected_end_loc = ((f->expected_loc == -1) ? -1 expected_end_loc = ((f->expected_loc == -1) ? -1
: f->expected_loc + strlen(f->needle)); : f->expected_loc + strlen(f->needle));
ok(ft.chrgText.cpMax == expected_end_loc, ok(ftw.chrgText.cpMax == expected_end_loc,
"EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, end at %d, expected %d\n", "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, end at %d, expected %d\n",
name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMax, expected_end_loc); name, id, f->needle, f->start, f->end, f->flags, ftw.chrgText.cpMax, expected_end_loc);
HeapFree(GetProcessHeap(), 0, (void*)ftw.lpstrText);
}else{
FINDTEXTEXA fta;
memset(&fta, 0, sizeof(fta));
fta.chrg.cpMin = f->start;
fta.chrg.cpMax = f->end;
fta.lpstrText = f->needle;
findloc = SendMessage(hwnd, EM_FINDTEXTEX, f->flags, (LPARAM) &fta);
ok(findloc == f->expected_loc,
"EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n",
name, id, f->needle, f->start, f->end, f->flags, findloc);
ok(fta.chrgText.cpMin == f->expected_loc,
"EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n",
name, id, f->needle, f->start, f->end, f->flags, fta.chrgText.cpMin);
expected_end_loc = ((f->expected_loc == -1) ? -1
: f->expected_loc + strlen(f->needle));
ok(fta.chrgText.cpMax == expected_end_loc,
"EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, end at %d, expected %d\n",
name, id, f->needle, f->start, f->end, f->flags, fta.chrgText.cpMax, expected_end_loc);
}
} }
static void run_tests_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *find, static void run_tests_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *find,
int num_tests) int num_tests, BOOL unicode)
{ {
int i; int i;
for (i = 0; i < num_tests; i++) { for (i = 0; i < num_tests; i++) {
check_EM_FINDTEXT(hwnd, name, &find[i], i); check_EM_FINDTEXT(hwnd, name, &find[i], i, unicode);
check_EM_FINDTEXTEX(hwnd, name, &find[i], i); check_EM_FINDTEXTEX(hwnd, name, &find[i], i, unicode);
} }
} }
static void test_EM_FINDTEXT(void) static void test_EM_FINDTEXT(BOOL unicode)
{ {
HWND hwndRichEdit = new_richedit(NULL); HWND hwndRichEdit;
CHARFORMAT2 cf2; CHARFORMAT2 cf2;
if(unicode)
hwndRichEdit = new_richeditW(NULL);
else
hwndRichEdit = new_richedit(NULL);
/* Empty rich edit control */ /* Empty rich edit control */
run_tests_EM_FINDTEXT(hwndRichEdit, "1", find_tests, run_tests_EM_FINDTEXT(hwndRichEdit, "1", find_tests,
sizeof(find_tests)/sizeof(struct find_s)); sizeof(find_tests)/sizeof(struct find_s), unicode);
SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) haystack); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) haystack);
/* Haystack text */ /* Haystack text */
run_tests_EM_FINDTEXT(hwndRichEdit, "2", find_tests2, run_tests_EM_FINDTEXT(hwndRichEdit, "2", find_tests2,
sizeof(find_tests2)/sizeof(struct find_s)); sizeof(find_tests2)/sizeof(struct find_s), unicode);
/* Setting a format on an arbitrary range should have no effect in search /* Setting a format on an arbitrary range should have no effect in search
results. This tests correct offset reporting across runs. */ results. This tests correct offset reporting across runs. */
@ -291,7 +351,7 @@ static void test_EM_FINDTEXT(void)
/* Haystack text, again */ /* Haystack text, again */
run_tests_EM_FINDTEXT(hwndRichEdit, "2-bis", find_tests2, run_tests_EM_FINDTEXT(hwndRichEdit, "2-bis", find_tests2,
sizeof(find_tests2)/sizeof(struct find_s)); sizeof(find_tests2)/sizeof(struct find_s), unicode);
/* Yet another range */ /* Yet another range */
cf2.dwMask = CFM_BOLD | cf2.dwMask; cf2.dwMask = CFM_BOLD | cf2.dwMask;
@ -301,7 +361,7 @@ static void test_EM_FINDTEXT(void)
/* Haystack text, again */ /* Haystack text, again */
run_tests_EM_FINDTEXT(hwndRichEdit, "2-bisbis", find_tests2, run_tests_EM_FINDTEXT(hwndRichEdit, "2-bisbis", find_tests2,
sizeof(find_tests2)/sizeof(struct find_s)); sizeof(find_tests2)/sizeof(struct find_s), unicode);
DestroyWindow(hwndRichEdit); DestroyWindow(hwndRichEdit);
} }
@ -7303,7 +7363,8 @@ START_TEST( editor )
ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError());
test_WM_CHAR(); test_WM_CHAR();
test_EM_FINDTEXT(); test_EM_FINDTEXT(FALSE);
test_EM_FINDTEXT(TRUE);
test_EM_GETLINE(); test_EM_GETLINE();
test_EM_POSFROMCHAR(); test_EM_POSFROMCHAR();
test_EM_SCROLLCARET(); test_EM_SCROLLCARET();