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

richedit: Use ME_Cursor instead of offsets for ME_GetTextRange.

Browse Source
This commit is contained in:
Dylan Smith 2009-08-12 09:06:18 -04:00 committed by Alexandre Julliard
parent 2da0d8e933
commit c92bb271b7
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dlls/riched20/editor.c
View File

@ -1916,18 +1916,16 @@ static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText)
} }
static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText,
int nStart, int nLen, BOOL unicode) const ME_Cursor *start, int nLen, BOOL unicode)
{ {
ME_Cursor start;
if (!strText) return 0; if (!strText) return 0;
ME_CursorFromCharOfs(editor, nStart, &start);
if (unicode) { if (unicode) {
return ME_GetTextW(editor, strText, INT_MAX, &start, nLen, 0); return ME_GetTextW(editor, strText, INT_MAX, start, nLen, 0);
} else { } else {
int nChars; int nChars;
WCHAR *p = ALLOC_N_OBJ(WCHAR, nLen+1); WCHAR *p = ALLOC_N_OBJ(WCHAR, nLen+1);
if (!p) return 0; if (!p) return 0;
nChars = ME_GetTextW(editor, p, nLen, &start, nLen, 0); nChars = ME_GetTextW(editor, p, nLen, start, nLen, 0);
WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)strText, WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)strText,
nLen+1, NULL, NULL); nLen+1, NULL, NULL);
FREE_OBJ(p); FREE_OBJ(p);
@ -3566,10 +3564,10 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
return ME_GetTextEx(editor, (GETTEXTEX*)wParam, lParam); return ME_GetTextEx(editor, (GETTEXTEX*)wParam, lParam);
case EM_GETSELTEXT: case EM_GETSELTEXT:
{ {
int from, to; int nFrom, nTo, nStartCur = ME_GetSelectionOfs(editor, &nFrom, &nTo);
ME_GetSelectionOfs(editor, &from, &to); ME_Cursor *from = &editor->pCursors[nStartCur];
return ME_GetTextRange(editor, (WCHAR *)lParam, from, return ME_GetTextRange(editor, (WCHAR *)lParam, from,
to - from, unicode); nTo - nFrom, unicode);
} }
case EM_GETSCROLLPOS: case EM_GETSCROLLPOS:
{ {
@ -3586,17 +3584,20 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
case EM_GETTEXTRANGE: case EM_GETTEXTRANGE:
{ {
TEXTRANGEW *rng = (TEXTRANGEW *)lParam; TEXTRANGEW *rng = (TEXTRANGEW *)lParam;
int start = rng->chrg.cpMin; ME_Cursor start;
int end = rng->chrg.cpMax; int nStart = rng->chrg.cpMin;
int nEnd = rng->chrg.cpMax;
int textlength = ME_GetTextLength(editor); int textlength = ME_GetTextLength(editor);
TRACE("EM_GETTEXTRANGE min=%d max=%d unicode=%d emul1.0=%d length=%d\n",
rng->chrg.cpMin, rng->chrg.cpMax, unicode, TRACE("EM_GETTEXTRANGE min=%d max=%d unicode=%d textlength=%d\n",
editor->bEmulateVersion10, ME_GetTextLength(editor)); rng->chrg.cpMin, rng->chrg.cpMax, unicode, textlength);
if (start < 0) return 0; if (nStart < 0) return 0;
if ((start == 0 && end == -1) || end > textlength) if ((nStart == 0 && nEnd == -1) || nEnd > textlength)
end = textlength; nEnd = textlength;
if (start >= end) return 0; if (nStart >= nEnd) return 0;
return ME_GetTextRange(editor, rng->lpstrText, start, end - start, unicode);
ME_CursorFromCharOfs(editor, nStart, &start);
return ME_GetTextRange(editor, rng->lpstrText, &start, nEnd - nStart, unicode);
} }
case EM_GETLINE: case EM_GETLINE:
{ {