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

riched20: Fix crash undoing a paste.

This commit is contained in:
Clinton Stimpson 2007-01-11 23:09:44 -07:00 committed by Alexandre Julliard
parent 3456e5627a
commit a065d0f68d
2 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/riched20/editor.c
View File

@ -598,7 +598,6 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre
RTF_Info parser;
ME_Style *style;
int from, to, to2;
ME_UndoItem *pUI;
int nEventMask = editor->nEventMask;
ME_InStream inStream;
@ -671,19 +670,9 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre
if (!(format & SFF_SELECTION))
SendMessageA(editor->hWnd, EM_SETSEL, 0, 0);
}
if (format & SFF_SELECTION)
{
if(from < to) /* selection overwritten is non-empty */
{
pUI = ME_AddUndoItem(editor, diUndoDeleteRun, NULL);
TRACE("from %d to %d\n", from, to);
if (pUI)
{
pUI->nStart = from;
pUI->nLen = to-from;
}
}
/* even if we didn't add an undo, we need to commit the ones added earlier */
ME_CommitUndo(editor);
}

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

@ -22,6 +22,7 @@
#include <windows.h>
#include <richedit.h>
#include <time.h>
#include <stdio.h>
static HMODULE hmoduleRichEdit;
@ -1386,6 +1387,41 @@ static void test_EM_EXSETSEL(void)
DestroyWindow(hwndRichEdit);
}
static void test_WM_PASTE(void)
{
int result;
char buffer[1024] = {0};
const char* text1 = "testing paste\r";
const char* text2 = "testing paste\r\rtesting paste";
const char* text3 = "testing paste\rpaste\rtesting paste";
HWND hwndRichEdit = new_richedit(NULL);
SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text1);
SendMessage(hwndRichEdit, EM_SETSEL, 0, 14);
SendMessage(hwndRichEdit, WM_CHAR, 3, 0); /* ctrl-c */
SendMessage(hwndRichEdit, EM_SETSEL, 14, 14);
SendMessage(hwndRichEdit, WM_CHAR, 22, 0); /* ctrl-v */
SendMessage(hwndRichEdit, WM_CHAR, 26, 0); /* ctrl-z */
SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer);
result = strcmp(text1, buffer);
ok(result == 0,
"test paste: strcmp = %i\n", result);
SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text2);
SendMessage(hwndRichEdit, EM_SETSEL, 8, 13);
SendMessage(hwndRichEdit, WM_CHAR, 3, 0); /* ctrl-c */
SendMessage(hwndRichEdit, EM_SETSEL, 14, 14);
SendMessage(hwndRichEdit, WM_CHAR, 22, 0); /* ctrl-v */
SendMessage(hwndRichEdit, WM_CHAR, 26, 0); /* ctrl-z */
SendMessage(hwndRichEdit, WM_CHAR, 25, 0); /* ctrl-y */
SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer);
result = strcmp(buffer,text3);
ok(result == 0,
"test paste: strcmp = %i\n", result);
DestroyWindow(hwndRichEdit);
}
START_TEST( editor )
{
MSG msg;
@ -1412,6 +1448,7 @@ START_TEST( editor )
test_WM_SETFONT();
test_EM_GETMODIFY();
test_EM_EXSETSEL();
test_WM_PASTE();
/* Set the environment variable WINETEST_RICHED20 to keep windows
* responsive and open for 30 seconds. This is useful for debugging.