February 2009 - Wine-Commits

Francois Gouget : notepad: Make the Lithuanian resources SUBLANG_NEUTRAL.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 90d8b9426f25435a6c604c607c8cbdb51af0be44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d8b9426f25435a6c604c607… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 7 16:04:23 2009 +0100 notepad: Make the Lithuanian resources SUBLANG_NEUTRAL. --- programs/notepad/Lt.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/Lt.rc b/programs/notepad/Lt.rc index 3b321d2..577bb5c 100644 --- a/programs/notepad/Lt.rc +++ b/programs/notepad/Lt.rc @@ -21,7 +21,7 @@ /* UTF-8 */ #pragma code_page(65001) -LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL MAIN_MENU MENU {

1 0

Dylan Smith : richedit: Removed ME_StrRelPos, ME_StrRelPos2, & ME_PosToVPos functions.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: c8b44555656edc8e27e6f1444fa6846539d75c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8b44555656edc8e27e6f1444… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Feb 7 13:21:29 2009 -0500 richedit: Removed ME_StrRelPos, ME_StrRelPos2, & ME_PosToVPos functions. These functions were just being used for addition, so it was simpler to remove the functions and modify the places it was used. The ME_StrRelPos2 and ME_PosToVPos were just simple wrappers around ME_StrRelPos, and ME_PosToVPos wasn't being used. --- dlls/riched20/caret.c | 10 +++++----- dlls/riched20/editor.h | 3 --- dlls/riched20/run.c | 27 ++++++++++++--------------- dlls/riched20/string.c | 46 +++++++--------------------------------------- dlls/riched20/wrap.c | 6 ++---- 5 files changed, 26 insertions(+), 66 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index e0298d2..43ad44c 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -576,7 +576,7 @@ static BOOL ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) { ME_DisplayItem *pRun = pCursor->pRun; - + if (nRelOfs == -1) { if (!pCursor->nOffset) @@ -608,17 +608,17 @@ ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) else pCursor->nOffset = pRun->member.run.strText->nLen; } - + if (pCursor->nOffset) - pCursor->nOffset = ME_StrRelPos2(pCursor->pRun->member.run.strText, pCursor->nOffset, nRelOfs); + pCursor->nOffset = pCursor->nOffset + nRelOfs; return TRUE; } else { if (!(pRun->member.run.nFlags & MERF_ENDPARA)) { - int new_ofs = ME_StrRelPos2(pRun->member.run.strText, pCursor->nOffset, nRelOfs); - + int new_ofs = pCursor->nOffset + nRelOfs; + if (new_ofs < pRun->member.run.strText->nLen) { pCursor->nOffset = new_ofs; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 4c87eed..68ab596 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -100,9 +100,6 @@ int ME_IsSplitable(const ME_String *s); int ME_FindNonWhitespaceV(const ME_String *s, int nVChar); int ME_FindWhitespaceV(ME_String *s, int nVChar); int ME_CallWordBreakProc(ME_TextEditor *editor, ME_String *str, INT start, INT code); -int ME_StrRelPos(const ME_String *s, int nVChar, int *pRelChars); -int ME_StrRelPos2(const ME_String *s, int nVChar, int nRelChars); -int ME_PosToVPos(const ME_String *s, int nPos); void ME_StrDeleteV(ME_String *s, int nVChar, int nChars); /* smart helpers for A<->W conversions, they reserve/free memory and call MultiByte<->WideChar functions */ LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index c36f25f..d4aaaa2 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -500,21 +500,21 @@ int ME_CharFromPoint(ME_Context *c, int cx, ME_Run *run) /****************************************************************************** * ME_CharFromPointCursor - * + * * Returns a character position inside the run given a run-relative - * pixel horizontal position. This version rounds to the nearest character edge - * (ie. if the second character is at pixel position 8, then for cx=0..3 + * pixel horizontal position. This version rounds to the nearest character edge + * (ie. if the second character is at pixel position 8, then for cx=0..3 * it returns 0, and for cx=4..7 it returns 1). - * + * * It is used for mouse click handling, for better usability (and compatibility - * with the native control). - */ + * with the native control). + */ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) { ME_String *strRunText; /* This could point to either the run's real text, or it's masked form in a password control */ - - int fit = 0, fit1 = 0; + + int fit = 0; ME_Context c; HGDIOBJ hOldFont; SIZE sz, sz2, sz3; @@ -548,18 +548,15 @@ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) cx, &fit, NULL, &sz); if (fit != strRunText->nLen) { - int chars = 1; - GetTextExtentPoint32W(c.hDC, strRunText->szData, fit, &sz2); - fit1 = ME_StrRelPos(strRunText, fit, &chars); - GetTextExtentPoint32W(c.hDC, strRunText->szData, fit1, &sz3); + GetTextExtentPoint32W(c.hDC, strRunText->szData, fit + 1, &sz3); if (cx >= (sz2.cx+sz3.cx)/2) - fit = fit1; + fit = fit + 1; } - + if (editor->cPasswordMask) ME_DestroyString(strRunText); - + ME_UnselectStyleFont(&c, run->style, hOldFont); ME_DestroyContext(&c); return fit; diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 2b6b559..128e3c2 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -141,49 +141,17 @@ int ME_IsSplitable(const ME_String *s) return 0; } -int ME_StrRelPos(const ME_String *s, int nVChar, int *pRelChars) -{ - int nRelChars = *pRelChars; - - TRACE("%s,%d,&%d\n", debugstr_w(s->szData), nVChar, *pRelChars); - - assert(*pRelChars); - if (!nRelChars) - return nVChar; - - if (nRelChars>0) - nRelChars = min(*pRelChars, s->nLen - nVChar); - else - nRelChars = max(*pRelChars, -nVChar); - nVChar += nRelChars; - *pRelChars -= nRelChars; - return nVChar; -} - -int ME_StrRelPos2(const ME_String *s, int nVChar, int nRelChars) -{ - return ME_StrRelPos(s, nVChar, &nRelChars); -} - -int ME_PosToVPos(const ME_String *s, int nPos) -{ - if (!nPos) - return 0; - return ME_StrRelPos2(s, 0, nPos); -} - void ME_StrDeleteV(ME_String *s, int nVChar, int nChars) { - int end_ofs; - - assert(nVChar >=0 && nVChar <= s->nLen); + int end_ofs = nVChar + nChars; + assert(nChars >= 0); - assert(nVChar+nChars <= s->nLen); - - end_ofs = ME_StrRelPos2(s, nVChar, nChars); + assert(nVChar >= 0); assert(end_ofs <= s->nLen); - memmove(s->szData+nVChar, s->szData+end_ofs, 2*(s->nLen+1-end_ofs)); - s->nLen -= (end_ofs - nVChar); + + memmove(s->szData + nVChar, s->szData + end_ofs, + (s->nLen - end_ofs + 1) * sizeof(WCHAR)); + s->nLen -= nChars; } int ME_FindNonWhitespaceV(const ME_String *s, int nVChar) { diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index a51e2db..54c90eb 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -316,11 +316,9 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem else { /* split point inside first character - no choice but split after that char */ - int chars = 1; - int pos2 = ME_StrRelPos(run->strText, 0, &chars); - if (pos2 != len) { + if (len != 1) { /* the run is more than 1 char, so we may split */ - return ME_SplitRun(wc, piter, pos2); + return ME_SplitRun(wc, piter, 1); } /* the run is one char, can't split it */ return piter;

1 0

Dylan Smith : richedit: Got rid of ME_GetCharFwd and ME_GetCharBack.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 1eb0f73ab026a302cdde1fa4fe7a7d7e9cb86711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb0f73ab026a302cdde1fa4f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Feb 7 13:21:23 2009 -0500 richedit: Got rid of ME_GetCharFwd and ME_GetCharBack. These two functions were being used for simple operations, to get the first or last character when pre-computing flags for splitting runs. The call to ME_GetCharBack wasn't even giving the correct result, it would always return -1 since it is being called with nPos of 0. This patch simplifies the code by removing the functions and getting the characters directly from the string. --- dlls/riched20/editor.h | 2 -- dlls/riched20/run.c | 19 ++++++++++--------- dlls/riched20/string.c | 26 -------------------------- 3 files changed, 10 insertions(+), 37 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 2e53c22..4c87eed 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -100,8 +100,6 @@ int ME_IsSplitable(const ME_String *s); int ME_FindNonWhitespaceV(const ME_String *s, int nVChar); int ME_FindWhitespaceV(ME_String *s, int nVChar); int ME_CallWordBreakProc(ME_TextEditor *editor, ME_String *str, INT start, INT code); -int ME_GetCharFwd(const ME_String *s, int nPos); /* get char starting from start */ -int ME_GetCharBack(const ME_String *s, int nPos); /* get char starting from \0 */ int ME_StrRelPos(const ME_String *s, int nVChar, int *pRelChars); int ME_StrRelPos2(const ME_String *s, int nVChar, int nRelChars); int ME_PosToVPos(const ME_String *s, int nPos); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index ed066ea..c36f25f 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -406,38 +406,39 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, /****************************************************************************** * ME_UpdateRunFlags - * + * * Determine some of run attributes given its content (style, text content). - * Some flags cannot be determined by this function (MERF_GRAPHICS, - * MERF_ENDPARA) - */ + * Some flags cannot be determined by this function (MERF_GRAPHICS, + * MERF_ENDPARA) + */ void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) { - assert(run->nCharOfs != -1); + ME_String *strText = run->strText; + assert(run->nCharOfs >= 0); if (RUN_IS_HIDDEN(run) || run->nFlags & MERF_TABLESTART) run->nFlags |= MERF_HIDDEN; else run->nFlags &= ~MERF_HIDDEN; - if (ME_IsSplitable(run->strText)) + if (ME_IsSplitable(strText)) run->nFlags |= MERF_SPLITTABLE; else run->nFlags &= ~MERF_SPLITTABLE; if (!(run->nFlags & MERF_NOTEXT)) { - if (ME_IsWhitespaces(run->strText)) + if (ME_IsWhitespaces(strText)) run->nFlags |= MERF_WHITESPACE | MERF_STARTWHITE | MERF_ENDWHITE; else { run->nFlags &= ~MERF_WHITESPACE; - if (ME_IsWSpace(ME_GetCharFwd(run->strText,0))) + if (ME_IsWSpace(strText->szData[0])) run->nFlags |= MERF_STARTWHITE; else run->nFlags &= ~MERF_STARTWHITE; - if (ME_IsWSpace(ME_GetCharBack(run->strText,0))) + if (ME_IsWSpace(strText->szData[strText->nLen - 1])) run->nFlags |= MERF_ENDWHITE; else run->nFlags &= ~MERF_ENDWHITE; diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 7cc0001..2b6b559 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -186,32 +186,6 @@ void ME_StrDeleteV(ME_String *s, int nVChar, int nChars) s->nLen -= (end_ofs - nVChar); } -int ME_GetCharFwd(const ME_String *s, int nPos) -{ - int nVPos = 0; - - assert(nPos < s->nLen); - if (nPos) - nVPos = ME_StrRelPos2(s, nVPos, nPos); - - if (nVPos < s->nLen) - return s->szData[nVPos]; - return -1; -} - -int ME_GetCharBack(const ME_String *s, int nPos) -{ - int nVPos = s->nLen; - - assert(nPos < s->nLen); - if (nPos) - nVPos = ME_StrRelPos2(s, nVPos, -nPos); - - if (nVPos < s->nLen) - return s->szData[nVPos]; - return -1; -} - int ME_FindNonWhitespaceV(const ME_String *s, int nVChar) { int i; for (i = nVChar; i<s->nLen && ME_IsWSpace(s->szData[i]); i++)

1 0

Dylan Smith : richedit: Removed ME_StrLen and ME_StrVLen field access functions.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 5f15de0690da4b289360da55f740a61fad7ad2cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f15de0690da4b289360da55f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Feb 7 13:21:17 2009 -0500 richedit: Removed ME_StrLen and ME_StrVLen field access functions. These functions were probably previously needed because of some wierd special handling of backspace characters, but currently there is no reason why the nLen field can't be accessed directly. Having to functions that just access the string length field just causes slightly more effort for someone to look at the code, because they need to enter the function to find out what it actually is doing. --- dlls/riched20/caret.c | 10 +++++----- dlls/riched20/editor.c | 22 +++++++++++----------- dlls/riched20/editor.h | 3 --- dlls/riched20/paint.c | 6 +++--- dlls/riched20/run.c | 14 +++++++------- dlls/riched20/string.c | 25 +++---------------------- dlls/riched20/wrap.c | 6 +++--- dlls/riched20/writer.c | 4 ++-- 8 files changed, 34 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f15de0690da4b289360d…

1 0

Dylan Smith : richedit: Got rid of useless function ME_VPosToPos.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: f148d82093fe44d8e405ad4ab9704b185fa3c2ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=f148d82093fe44d8e405ad4ab… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Feb 7 13:21:10 2009 -0500 richedit: Got rid of useless function ME_VPosToPos. The function was just returning the second parameter. It had some commented out code that indicated that previously backslashes weren't included in the length. Native wordpad doesn't handle backspaces in a special way, so this must have been an internal representation that complicated finding the position of characters. --- dlls/riched20/editor.h | 1 - dlls/riched20/run.c | 3 +-- dlls/riched20/string.c | 19 ------------------- 3 files changed, 1 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 90dcd2a..8064450 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -107,7 +107,6 @@ int ME_GetCharFwd(const ME_String *s, int nPos); /* get char starting from start int ME_GetCharBack(const ME_String *s, int nPos); /* get char starting from \0 */ int ME_StrRelPos(const ME_String *s, int nVChar, int *pRelChars); int ME_StrRelPos2(const ME_String *s, int nVChar, int nRelChars); -int ME_VPosToPos(ME_String *s, int nVPos); int ME_PosToVPos(const ME_String *s, int nPos); void ME_StrDeleteV(ME_String *s, int nVChar, int nChars); /* smart helpers for A<->W conversions, they reserve/free memory and call MultiByte<->WideChar functions */ diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index fae7603..265c0ab 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -310,8 +310,7 @@ ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_DisplayItem *item, i item2 = ME_MakeRun(run->style, ME_VSplitString(run->strText, nVChar), run->nFlags&MERF_SPLITMASK); - item2->member.run.nCharOfs = item->member.run.nCharOfs+ - ME_VPosToPos(item->member.run.strText, nVChar); + item2->member.run.nCharOfs = item->member.run.nCharOfs + nVChar; run2 = &item2->member.run; ME_InsertBefore(item->next, item2); diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index d8852fb..f534d7e 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -184,25 +184,6 @@ int ME_StrRelPos2(const ME_String *s, int nVChar, int nRelChars) return ME_StrRelPos(s, nVChar, &nRelChars); } -int ME_VPosToPos(ME_String *s, int nVPos) -{ - return nVPos; - /* - int i = 0, len = 0; - if (!nVPos) - return 0; - while (i < s->nLen) - { - if (i == nVPos) - return len; - if (s->szData[i]=='\\') i++; - i++; - len++; - } - return len; - */ -} - int ME_PosToVPos(const ME_String *s, int nPos) { if (!nPos)

1 0

Dylan Smith : richedit: Removed some conditions that are always taken.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: d306b6b5e901f02c52bb2596b855e4d03a43e650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d306b6b5e901f02c52bb2596b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Feb 7 13:21:03 2009 -0500 richedit: Removed some conditions that are always taken. ME_GetCursorCoordinates had two conditions that were always taken. The first condition was if(pCursor->pRun->type == diRun) was following an assertion making the exact same check. The next one, if(row), should always be taken, otherwise the richedit controls are in a corrupt state, therefore an assertion is more appropriate. --- dlls/riched20/caret.c | 107 ++++++++++++++++++++++--------------------------- 1 files changed, 48 insertions(+), 59 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index edbdf46..02dbc56 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -168,69 +168,58 @@ void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height) { - ME_DisplayItem *pCursorRun = pCursor->pRun; - ME_DisplayItem *pSizeRun = pCursor->pRun; + ME_DisplayItem *row; + ME_DisplayItem *run = pCursor->pRun; + ME_DisplayItem *para = ME_GetParagraph(run); + ME_DisplayItem *pSizeRun = run; + ME_Context c; + SIZE sz = {0, 0}; assert(height && x && y); - assert(!(ME_GetParagraph(pCursorRun)->member.para.nFlags & MEPF_REWRAP)); - assert(pCursor->pRun); - assert(pCursor->pRun->type == diRun); - - if (pCursorRun->type == diRun) { - ME_DisplayItem *row = ME_FindItemBack(pCursorRun, diStartRowOrParagraph); + assert(~para->member.para.nFlags & MEPF_REWRAP); + assert(run && run->type == diRun); + assert(para && para->type == diParagraph); - if (row) { - HDC hDC = ITextHost_TxGetDC(editor->texthost); - ME_Context c; - ME_DisplayItem *run = pCursorRun; - ME_DisplayItem *para = NULL; - SIZE sz = {0, 0}; + row = ME_FindItemBack(run, diStartRowOrParagraph); + assert(row && row->type == diStartRow); - ME_InitContext(&c, editor, hDC); - - if (!pCursor->nOffset) - { - ME_DisplayItem *prev = ME_FindItemBack(pCursorRun, diRunOrParagraph); - assert(prev); - if (prev->type == diRun) - pSizeRun = prev; - } - assert(row->type == diStartRow); /* paragraph -> run without start row ?*/ - para = ME_FindItemBack(row, diParagraph); - assert(para); - assert(para->type == diParagraph); - if (editor->bCaretAtEnd && !pCursor->nOffset && - run == ME_FindItemFwd(row, diRun)) - { - ME_DisplayItem *tmp = ME_FindItemBack(row, diRunOrParagraph); - assert(tmp); - if (tmp->type == diRun) - { - row = ME_FindItemBack(tmp, diStartRow); - pSizeRun = run = tmp; - assert(run); - assert(run->type == diRun); - sz = ME_GetRunSize(&c, &para->member.para, - &run->member.run, ME_StrLen(run->member.run.strText), - row->member.row.nLMargin); - } - } - if (pCursor->nOffset) { - sz = ME_GetRunSize(&c, &para->member.para, &run->member.run, pCursor->nOffset, - row->member.row.nLMargin); - } + ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - *height = pSizeRun->member.run.nAscent + pSizeRun->member.run.nDescent; - *x = c.rcView.left + run->member.run.pt.x + sz.cx - editor->horz_si.nPos; - *y = c.rcView.top + para->member.para.pt.y + row->member.row.nBaseline - + run->member.run.pt.y - pSizeRun->member.run.nAscent - editor->vert_si.nPos; - ME_DestroyContext(&c); - return; + if (!pCursor->nOffset) + { + ME_DisplayItem *prev = ME_FindItemBack(run, diRunOrParagraph); + assert(prev); + if (prev->type == diRun) + pSizeRun = prev; + } + if (editor->bCaretAtEnd && !pCursor->nOffset && + run == ME_FindItemFwd(row, diRun)) + { + ME_DisplayItem *tmp = ME_FindItemBack(row, diRunOrParagraph); + assert(tmp); + if (tmp->type == diRun) + { + row = ME_FindItemBack(tmp, diStartRow); + pSizeRun = run = tmp; + assert(run); + assert(run->type == diRun); + sz = ME_GetRunSize(&c, &para->member.para, + &run->member.run, ME_StrLen(run->member.run.strText), + row->member.row.nLMargin); } } - *height = 10; /* FIXME use global font */ - *x = 0; - *y = 0; + if (pCursor->nOffset) { + sz = ME_GetRunSize(&c, &para->member.para, &run->member.run, + pCursor->nOffset, row->member.row.nLMargin); + } + + *height = pSizeRun->member.run.nAscent + pSizeRun->member.run.nDescent; + *x = c.rcView.left + run->member.run.pt.x + sz.cx - editor->horz_si.nPos; + *y = c.rcView.top + para->member.para.pt.y + row->member.row.nBaseline + + run->member.run.pt.y - pSizeRun->member.run.nAscent + - editor->vert_si.nPos; + ME_DestroyContext(&c); + return; }

1 0

Dylan Smith : richedit: Avoid duplication in make string functions using ME_MakeStringB.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 4b7e8f185b223c7c712f4102b91ef64877a58053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b7e8f185b223c7c712f4102b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Feb 7 13:20:55 2009 -0500 richedit: Avoid duplication in make string functions using ME_MakeStringB. I found that ME_MakeStringB was previously unused, and that the other ME_MakeString functions repeated code that was already in ME_MakeStringB. Making ME_MakeStringB static and using it to avoid duplicate code seemed like a better idea than removing the function. --- dlls/riched20/editor.h | 1 - dlls/riched20/string.c | 56 ++++++++++++++++++----------------------------- 2 files changed, 22 insertions(+), 35 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e06a86d..90dcd2a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -91,7 +91,6 @@ const char *ME_GetDITypeName(ME_DIType type); ME_String *ME_MakeString(LPCWSTR szText); ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars); ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars); -ME_String *ME_MakeStringB(int nMaxChars); ME_String *ME_StrDup(const ME_String *s); void ME_DestroyString(ME_String *s); void ME_AppendString(ME_String *s1, const ME_String *s2); diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 67b4d9c..d8852fb 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -18,61 +18,49 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "editor.h" +#include "editor.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); static int ME_GetOptimalBuffer(int nLen) { - return ((2*nLen+1)+128)&~63; + /* FIXME: This seems wasteful for tabs and end of lines strings, + * since they have a small fixed length. */ + return ((sizeof(WCHAR) * nLen) + 128) & ~63; } -ME_String *ME_MakeString(LPCWSTR szText) +/* Create a buffer (uninitialized string) of size nMaxChars */ +static ME_String *ME_MakeStringB(int nMaxChars) { ME_String *s = ALLOC_OBJ(ME_String); - s->nLen = lstrlenW(szText); - s->nBuffer = ME_GetOptimalBuffer(s->nLen+1); + + s->nLen = nMaxChars; + s->nBuffer = ME_GetOptimalBuffer(s->nLen + 1); s->szData = ALLOC_N_OBJ(WCHAR, s->nBuffer); - lstrcpyW(s->szData, szText); + s->szData[s->nLen] = 0; return s; } ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) { - ME_String *s = ALLOC_OBJ(ME_String); - - s->nLen = nMaxChars; - s->nBuffer = ME_GetOptimalBuffer(s->nLen+1); - s->szData = ALLOC_N_OBJ(WCHAR, s->nBuffer); - /* Native allows NUL chars */ - memmove(s->szData, szText, s->nLen * sizeof(WCHAR)); - s->szData[s->nLen] = 0; + ME_String *s = ME_MakeStringB(nMaxChars); + /* Native allows NULL chars */ + memcpy(s->szData, szText, s->nLen * sizeof(WCHAR)); return s; } +ME_String *ME_MakeString(LPCWSTR szText) +{ + return ME_MakeStringN(szText, lstrlenW(szText)); +} + +/* Make a string by repeating a char nMaxChars times */ ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars) -{ /* Make a string by repeating a char nMaxChars times */ +{ int i; - ME_String *s = ALLOC_OBJ(ME_String); - - s->nLen = nMaxChars; - s->nBuffer = ME_GetOptimalBuffer(s->nLen+1); - s->szData = ALLOC_N_OBJ(WCHAR, s->nBuffer); - - for (i = 0;i<nMaxChars;i++) + ME_String *s = ME_MakeStringB(nMaxChars); + for (i = 0; i < nMaxChars; i++) s->szData[i] = cRepeat; - s->szData[s->nLen] = 0; - return s; -} - -ME_String *ME_MakeStringB(int nMaxChars) -{ /* Create a buffer (uninitialized string) of size nMaxChars */ - ME_String *s = ALLOC_OBJ(ME_String); - - s->nLen = nMaxChars; - s->nBuffer = ME_GetOptimalBuffer(s->nLen+1); - s->szData = ALLOC_N_OBJ(WCHAR, s->nBuffer); - s->szData[s->nLen] = 0; return s; }

1 0

Dylan Smith : richedit: Directly get start and end of text on Ctrl-Home or Ctrl-End.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 71d797c55c07247771e2dae908fa2a8c38de4e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d797c55c07247771e2dae90… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Feb 7 13:20:31 2009 -0500 richedit: Directly get start and end of text on Ctrl-Home or Ctrl-End. Previously it found the start or end by traversing the linked lists of run, rows, paragraphs, and cells from the current position of the cursors. Clearly it is better to get the start or end directly to make it a constant time operation. --- dlls/riched20/caret.c | 28 +++++++++------------------- 1 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 46e16d4..edbdf46 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1436,32 +1436,26 @@ static void ME_ArrowHome(ME_TextEditor *editor, ME_Cursor *pCursor) static void ME_ArrowCtrlHome(ME_TextEditor *editor, ME_Cursor *pCursor) { - ME_DisplayItem *pRow = ME_FindItemBack(pCursor->pRun, diTextStart); - if (pRow) { - ME_DisplayItem *pRun = ME_FindItemFwd(pRow, diRun); - if (pRun) { - pCursor->pRun = pRun; - pCursor->nOffset = 0; - } - } + pCursor->pRun = ME_FindItemFwd(editor->pBuffer->pFirst, diRun); + pCursor->nOffset = 0; + editor->bCaretAtEnd = FALSE; } static void ME_ArrowEnd(ME_TextEditor *editor, ME_Cursor *pCursor) { ME_DisplayItem *pRow; - + if (editor->bCaretAtEnd && !pCursor->nOffset) return; - + pRow = ME_FindItemFwd(pCursor->pRun, diStartRowOrParagraphOrEnd); assert(pRow); if (pRow->type == diStartRow) { - /* FIXME WTF was I thinking about here ? */ ME_DisplayItem *pRun = ME_FindItemFwd(pRow, diRun); assert(pRun); pCursor->pRun = pRun; pCursor->nOffset = 0; - editor->bCaretAtEnd = 1; + editor->bCaretAtEnd = TRUE; return; } pCursor->pRun = ME_FindItemBack(pRow, diRun); @@ -1469,15 +1463,11 @@ static void ME_ArrowEnd(ME_TextEditor *editor, ME_Cursor *pCursor) pCursor->nOffset = 0; editor->bCaretAtEnd = FALSE; } - + static void ME_ArrowCtrlEnd(ME_TextEditor *editor, ME_Cursor *pCursor) { - ME_DisplayItem *p = ME_FindItemFwd(pCursor->pRun, diTextEnd); - assert(p); - p = ME_FindItemBack(p, diRun); - assert(p); - assert(p->member.run.nFlags & MERF_ENDPARA); - pCursor->pRun = p; + pCursor->pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); + assert(pCursor->pRun->member.run.nFlags & MERF_ENDPARA); pCursor->nOffset = 0; editor->bCaretAtEnd = FALSE; }

1 0

Dylan Smith : richedit: Prevent string trunction due to NULL characters.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: f53f40bcb36f012355ed8e325cbafd68aff6a5ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53f40bcb36f012355ed8e325… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Feb 7 13:20:46 2009 -0500 richedit: Prevent string trunction due to NULL characters. --- dlls/riched20/editor.h | 1 - dlls/riched20/string.c | 28 +++++++++------------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 1312363..e06a86d 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -95,7 +95,6 @@ ME_String *ME_MakeStringB(int nMaxChars); ME_String *ME_StrDup(const ME_String *s); void ME_DestroyString(ME_String *s); void ME_AppendString(ME_String *s1, const ME_String *s2); -ME_String *ME_ConcatString(const ME_String *s1, const ME_String *s2); ME_String *ME_VSplitString(ME_String *orig, int nVPos); int ME_IsWhitespaces(const ME_String *s); int ME_IsSplitable(const ME_String *s); diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 0bd751c..67b4d9c 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -90,35 +90,25 @@ void ME_DestroyString(ME_String *s) void ME_AppendString(ME_String *s1, const ME_String *s2) { - if (s1->nLen+s2->nLen+1 <= s1->nBuffer) { - lstrcpyW(s1->szData+s1->nLen, s2->szData); - s1->nLen += s2->nLen; - } - else + if (s1->nLen+s2->nLen+1 <= s1->nBuffer) { + memcpy(s1->szData + s1->nLen, s2->szData, s2->nLen * sizeof(WCHAR)); + s1->nLen += s2->nLen; + s1->szData[s1->nLen] = 0; + } else { WCHAR *buf; s1->nBuffer = ME_GetOptimalBuffer(s1->nLen+s2->nLen+1); - buf = ALLOC_N_OBJ(WCHAR, s1->nBuffer); - lstrcpyW(buf, s1->szData); - lstrcpyW(buf+s1->nLen, s2->szData); + buf = ALLOC_N_OBJ(WCHAR, s1->nBuffer); + memcpy(buf, s1->szData, s1->nLen * sizeof(WCHAR)); + memcpy(buf + s1->nLen, s2->szData, s2->nLen * sizeof(WCHAR)); FREE_OBJ(s1->szData); s1->szData = buf; s1->nLen += s2->nLen; + s1->szData[s1->nLen] = 0; } } -ME_String *ME_ConcatString(const ME_String *s1, const ME_String *s2) -{ - ME_String *s = ALLOC_OBJ(ME_String); - s->nLen = s1->nLen+s2->nLen; - s->nBuffer = ME_GetOptimalBuffer(s1->nLen+s2->nLen+1); - s->szData = ALLOC_N_OBJ(WCHAR, s->nBuffer); - lstrcpyW(s->szData, s1->szData); - lstrcpyW(s->szData+s1->nLen, s2->szData); - return s; -} - ME_String *ME_VSplitString(ME_String *orig, int charidx) { ME_String *s;

1 0

Dylan Smith : richedit: Simplified ME_UpdateSelectionLinkAttribute.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 1ceb903f9d27f2e3d1fd4525b080024f22099e11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ceb903f9d27f2e3d1fd4525b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Feb 7 13:20:38 2009 -0500 richedit: Simplified ME_UpdateSelectionLinkAttribute. --- dlls/riched20/editor.c | 36 ++++++++++-------------------------- 1 files changed, 10 insertions(+), 26 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 032e99c..46179d9 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2033,40 +2033,24 @@ ME_FilterEvent(ME_TextEditor *editor, UINT msg, WPARAM* wParam, LPARAM* lParam) static void ME_UpdateSelectionLinkAttribute(ME_TextEditor *editor) { - ME_DisplayItem * startPara, * endPara; - ME_DisplayItem * item; - ME_Cursor cursor; + ME_DisplayItem *startPara, *endPara; + ME_DisplayItem *prev_para; int from, to; ME_GetSelection(editor, &from, &to); - if (from > to) from ^= to, to ^=from, from ^= to; - startPara = NULL; endPara = NULL; /* Find paragraph previous to the one that contains start cursor */ - ME_CursorFromCharOfs(editor, from, &cursor); - item = cursor.pRun; - if (item) { - startPara = ME_FindItemBack(item, diParagraph); - item = startPara->member.para.prev_para; - if (item && item->type == diParagraph) startPara = item; - } + ME_RunOfsFromCharOfs(editor, from, &startPara, NULL, NULL); + prev_para = startPara->member.para.prev_para; + if (prev_para->type == diParagraph) startPara = prev_para; /* Find paragraph that contains end cursor */ - ME_CursorFromCharOfs(editor, to, &cursor); - item = cursor.pRun; - if (item) { - endPara = ME_FindItemFwd(item, diParagraph); - } + ME_RunOfsFromCharOfs(editor, to, &endPara, NULL, NULL); + endPara = endPara->member.para.next_para; - if (startPara && endPara) { - ME_UpdateLinkAttribute(editor, - startPara->member.para.nCharOfs, - endPara->member.para.nCharOfs); - } else if (startPara) { - ME_UpdateLinkAttribute(editor, - startPara->member.para.nCharOfs, - -1); - } + ME_UpdateLinkAttribute(editor, + startPara->member.para.nCharOfs, + endPara->member.para.nCharOfs); } static BOOL

1 0