August 2009 - Wine-commits - list.winehq.org

Dylan Smith : richedit: Use ME_Cursor instead of offsets for ME_GetCharFormat.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: ade37203a533354d1806aea93176bdacd181e249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ade37203a533354d1806aea93… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Aug 12 09:06:09 2009 -0400 richedit: Use ME_Cursor instead of offsets for ME_GetCharFormat. Prevent extra conversions from character offset to ME_Cursor. --- dlls/riched20/editor.c | 10 ++++++++-- dlls/riched20/editor.h | 3 ++- dlls/riched20/run.c | 33 +++++++++++++++++---------------- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index fcfd3c4..6eab00c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4846,9 +4846,12 @@ static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, int sel_min, int sel_m if (beforeURL[0] < beforeURL[1]) { + ME_Cursor from, to; + ME_CursorFromCharOfs(editor, beforeURL[0], &from); + ME_CursorFromCharOfs(editor, beforeURL[1], &to); /* CFE_LINK effect should be consistently unset */ link.cbSize = sizeof(link); - ME_GetCharFormat(editor, beforeURL[0], beforeURL[1], &link); + ME_GetCharFormat(editor, &from, &to, &link); if (!(link.dwMask & CFM_LINK) || (link.dwEffects & CFE_LINK)) { /* CFE_LINK must be unset from this range */ @@ -4862,9 +4865,12 @@ static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, int sel_min, int sel_m } if (inURL[0] < inURL[1]) { + ME_Cursor from, to; + ME_CursorFromCharOfs(editor, inURL[0], &from); + ME_CursorFromCharOfs(editor, inURL[1], &to); /* CFE_LINK effect should be consistently set */ link.cbSize = sizeof(link); - ME_GetCharFormat(editor, inURL[0], inURL[1], &link); + ME_GetCharFormat(editor, &from, &to, &link); if (!(link.dwMask & CFM_LINK) || !(link.dwEffects & CFE_LINK)) { /* CFE_LINK must be set on this range */ diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 2d2e248..88bb4db 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -149,7 +149,8 @@ int ME_CharOfsFromRunOfs(ME_TextEditor *editor, const ME_DisplayItem *pPara, con void ME_SkipAndPropagateCharOffset(ME_DisplayItem *p, int shift); void ME_SetCharFormat(ME_TextEditor *editor, int nFrom, int nLen, CHARFORMAT2W *pFmt); void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt); -void ME_GetCharFormat(ME_TextEditor *editor, int nFrom, int nLen, CHARFORMAT2W *pFmt); +void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, + const ME_Cursor *to, CHARFORMAT2W *pFmt); void ME_GetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt); void ME_GetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt); void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index dce419b..18b19f4 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -842,20 +842,20 @@ void ME_GetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) /****************************************************************************** * ME_GetSelectionCharFormat - * + * * If selection exists, it returns all style elements that are set consistently - * in the whole selection. If not, it just returns the current style. - */ + * in the whole selection. If not, it just returns the current style. + */ void ME_GetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) { - int nFrom, nTo; - ME_GetSelectionOfs(editor, &nFrom, &nTo); - if (nFrom == nTo && editor->pBuffer->pCharStyle) + ME_Cursor *from, *to; + if (!ME_IsSelection(editor) && editor->pBuffer->pCharStyle) { ME_CopyCharFormat(pFmt, &editor->pBuffer->pCharStyle->fmt); return; } - ME_GetCharFormat(editor, nFrom, nTo, pFmt); + ME_GetSelection(editor, &from, &to); + ME_GetCharFormat(editor, from, to, pFmt); } /****************************************************************************** @@ -864,16 +864,17 @@ void ME_GetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) * Returns the style consisting of those attributes which are consistently set * in the whole character range. */ -void ME_GetCharFormat(ME_TextEditor *editor, int nFrom, int nTo, CHARFORMAT2W *pFmt) +void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, + const ME_Cursor *to, CHARFORMAT2W *pFmt) { ME_DisplayItem *run, *run_end; - int nOffset, nOffset2; CHARFORMAT2W tmp; - ME_RunOfsFromCharOfs(editor, nFrom, NULL, &run, &nOffset); - if (nFrom == nTo) /* special case - if selection is empty, take previous char's formatting */ + run = from->pRun; + /* special case - if selection is empty, take previous char's formatting */ + if (from->pRun == to->pRun && from->nOffset == to->nOffset) { - if (!nOffset) + if (!from->nOffset) { ME_DisplayItem *tmp_run = ME_FindItemBack(run, diRunOrParagraph); if (tmp_run->type == diRun) { @@ -884,10 +885,10 @@ void ME_GetCharFormat(ME_TextEditor *editor, int nFrom, int nTo, CHARFORMAT2W *p ME_GetRunCharFormat(editor, run, pFmt); return; } - - if (nTo>nFrom) /* selection consists of chars from nFrom up to nTo-1 */ - nTo--; - ME_RunOfsFromCharOfs(editor, nTo, NULL, &run_end, &nOffset2); + + run_end = to->pRun; + if (!to->nOffset) + run_end = ME_FindItemBack(run_end, diRun); ME_GetRunCharFormat(editor, run, pFmt);

1 0

Dylan Smith : richedit: Add helpers for setting cursor to start/end of text .
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 2bc726930f1a1f6a05070a015a9f116a87169932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc726930f1a1f6a05070a015… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Aug 12 09:06:05 2009 -0400 richedit: Add helpers for setting cursor to start/end of text. --- dlls/riched20/caret.c | 58 ++++++++++++++++++++++------------------------- dlls/riched20/editor.c | 8 ++---- dlls/riched20/editor.h | 2 + 3 files changed, 32 insertions(+), 36 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 5e7bee2..328109d 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -27,6 +27,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static BOOL ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs); +void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) +{ + cursor->pPara = editor->pBuffer->pFirst->member.para.next_para; + cursor->pRun = ME_FindItemFwd(cursor->pPara, diRun); + cursor->nOffset = 0; +} + +void ME_SetCursorToEnd(ME_TextEditor *editor, ME_Cursor *cursor) +{ + cursor->pPara = editor->pBuffer->pLast->member.para.prev_para; + cursor->pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); + cursor->nOffset = 0; +} + + int ME_GetSelectionOfs(ME_TextEditor *editor, int *from, int *to) { *from = ME_GetCursorOfs(&editor->pCursors[0]); @@ -58,9 +73,9 @@ int ME_GetSelection(ME_TextEditor *editor, ME_Cursor **from, ME_Cursor **to) int ME_GetTextLength(ME_TextEditor *editor) { - ME_DisplayItem *pLast = editor->pBuffer->pLast; - return ME_CharOfsFromRunOfs(editor, pLast->member.para.prev_para, - ME_FindItemBack(pLast, diRun), 0); + ME_Cursor cursor; + ME_SetCursorToEnd(editor, &cursor); + return ME_GetCursorOfs(&cursor); } @@ -111,12 +126,8 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) /* select all */ if (from == 0 && to == -1) { - editor->pCursors[1].pPara = editor->pBuffer->pFirst->member.para.next_para; - editor->pCursors[1].pRun = ME_FindItemFwd(editor->pCursors[1].pPara, diRun); - editor->pCursors[1].nOffset = 0; - editor->pCursors[0].pPara = editor->pBuffer->pLast->member.para.prev_para; - editor->pCursors[0].pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); - editor->pCursors[0].nOffset = 0; + ME_SetCursorToStart(editor, &editor->pCursors[1]); + ME_SetCursorToEnd(editor, &editor->pCursors[0]); ME_InvalidateSelection(editor); ME_ClearTempStyle(editor); return len + 1; @@ -164,9 +175,7 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) if (selectionEnd) { - editor->pCursors[0].pPara = editor->pBuffer->pLast->member.para.prev_para; - editor->pCursors[0].pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); - editor->pCursors[0].nOffset = 0; + ME_SetCursorToEnd(editor, &editor->pCursors[0]); editor->pCursors[1] = editor->pCursors[0]; ME_InvalidateSelection(editor); ME_ClearTempStyle(editor); @@ -812,12 +821,8 @@ ME_SelectByType(ME_TextEditor *editor, ME_SelectionType selectionType) case stDocument: /* Select everything with cursor anchored from the start of the text */ editor->nSelectionType = stDocument; - editor->pCursors[1].pPara = editor->pBuffer->pFirst->member.para.next_para; - editor->pCursors[1].pRun = ME_FindItemFwd(editor->pCursors[1].pPara, diRun); - editor->pCursors[1].nOffset = 0; - editor->pCursors[0].pPara = editor->pBuffer->pLast->member.para.prev_para; - editor->pCursors[0].pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); - editor->pCursors[0].nOffset = 0; + ME_SetCursorToStart(editor, &editor->pCursors[1]); + ME_SetCursorToEnd(editor, &editor->pCursors[0]); break; default: assert(0); } @@ -1331,9 +1336,7 @@ static void ME_ArrowPageUp(ME_TextEditor *editor, ME_Cursor *pCursor) if (editor->vert_si.nPos < p->member.row.nHeight) { - pCursor->pPara = editor->pBuffer->pFirst->member.para.next_para; - pCursor->pRun = ME_FindItemFwd(pCursor->pPara, diRun); - pCursor->nOffset = 0; + ME_SetCursorToStart(editor, pCursor); editor->bCaretAtEnd = FALSE; /* Native clears seems to clear this x value on page up at the top * of the text, but not on page down at the end of the text. @@ -1398,9 +1401,7 @@ static void ME_ArrowPageDown(ME_TextEditor *editor, ME_Cursor *pCursor) if (editor->vert_si.nPos >= y - editor->sizeWindow.cy) { - pCursor->pPara = editor->pBuffer->pLast->member.para.prev_para; - pCursor->pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); - pCursor->nOffset = 0; + ME_SetCursorToEnd(editor, pCursor); editor->bCaretAtEnd = FALSE; } else { ME_DisplayItem *pRun = pCursor->pRun; @@ -1469,9 +1470,7 @@ static void ME_ArrowHome(ME_TextEditor *editor, ME_Cursor *pCursor) static void ME_ArrowCtrlHome(ME_TextEditor *editor, ME_Cursor *pCursor) { - pCursor->pPara = editor->pBuffer->pFirst->member.para.next_para; - pCursor->pRun = ME_FindItemFwd(pCursor->pPara, diRun); - pCursor->nOffset = 0; + ME_SetCursorToStart(editor, pCursor); editor->bCaretAtEnd = FALSE; } @@ -1502,10 +1501,7 @@ static void ME_ArrowEnd(ME_TextEditor *editor, ME_Cursor *pCursor) static void ME_ArrowCtrlEnd(ME_TextEditor *editor, ME_Cursor *pCursor) { - pCursor->pPara = editor->pBuffer->pLast->member.para.prev_para; - pCursor->pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); - assert(pCursor->pRun->member.run.nFlags & MERF_ENDPARA); - pCursor->nOffset = 0; + ME_SetCursorToEnd(editor, pCursor); editor->bCaretAtEnd = FALSE; } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 0eddc0e..fcfd3c4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1882,7 +1882,7 @@ static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText) } else { - ME_CursorFromCharOfs(editor, 0, &start); + ME_SetCursorToStart(editor, &start); nChars = INT_MAX; } if (ex->codepage == 1200) @@ -2623,9 +2623,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) */ ed->nCursors = 4; ed->pCursors = ALLOC_N_OBJ(ME_Cursor, ed->nCursors); - ed->pCursors[0].pPara = ed->pBuffer->pFirst->member.para.next_para; - ed->pCursors[0].pRun = ME_FindItemFwd(ed->pCursors[0].pPara, diRun); - ed->pCursors[0].nOffset = 0; + ME_SetCursorToStart(ed, &ed->pCursors[0]); ed->pCursors[1] = ed->pCursors[0]; ed->pCursors[2] = ed->pCursors[0]; ed->pCursors[3] = ed->pCursors[1]; @@ -2645,7 +2643,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->nUndoMode = umAddToUndo; ed->nParagraphs = 1; ed->nLastSelStart = ed->nLastSelEnd = 0; - ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); + ed->pLastSelStartPara = ed->pLastSelEndPara = ed->pCursors[0].pPara; ed->bHideSelection = FALSE; ed->pfnWordBreak = NULL; ed->lpOleCallback = NULL; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index cbd2a41..2d2e248 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -155,6 +155,8 @@ void ME_GetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt); void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod); /* caret.c */ +void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor); +void ME_SetCursorToEnd(ME_TextEditor *editor, ME_Cursor *cursor); int ME_SetSelection(ME_TextEditor *editor, int from, int to); void ME_HideCaret(ME_TextEditor *ed); void ME_ShowCaret(ME_TextEditor *ed);

1 0

Dylan Smith : richedit: Created functions to move between runs and track paragraphs.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 32dcd3bbe1064b6012fc01541716c88588eaa7bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=32dcd3bbe1064b6012fc01541… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Aug 12 09:06:00 2009 -0400 richedit: Created functions to move between runs and track paragraphs. Plenty of places in the code find following or preceding runs, then afterwards find the paragraph from the run. This is inefficient because the same linked list is used for both runs and paragraphs, so changes in paragraphs can be detected while returning the next or previous run. --- dlls/riched20/caret.c | 35 +++++++++++++++++++---------------- dlls/riched20/editor.c | 21 ++++++++------------- dlls/riched20/editor.h | 2 ++ dlls/riched20/list.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/riched20/table.c | 11 ++++++++--- dlls/riched20/writer.c | 2 +- 6 files changed, 79 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32dcd3bbe1064b6012fc0…

1 0

Dylan Smith : richedit: Improve efficiency of ME_IsCandidateAnURL.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 0362b1b0870a212f80489627ea568e8503d28b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0362b1b0870a212f80489627e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Aug 12 09:05:56 2009 -0400 richedit: Improve efficiency of ME_IsCandidateAnURL. The code was previously getting the same text in the loop from the editor, and it was converting each of the prefixes to compare against for each URL candidate. --- dlls/riched20/editor.c | 62 ++++++++++++++++++++--------------------------- 1 files changed, 26 insertions(+), 36 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 79f6be2..c326ae8 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4766,51 +4766,38 @@ static BOOL ME_FindNextURLCandidate(ME_TextEditor *editor, int sel_min, int sel_ /** * This proc evaluates the selection and returns TRUE if it can be considered an URL */ -static BOOL ME_IsCandidateAnURL(ME_TextEditor *editor, int sel_min, int sel_max) +static BOOL ME_IsCandidateAnURL(ME_TextEditor *editor, const ME_Cursor *start, int nChars) { +#define MAX_PREFIX_LEN 9 struct prefix_s { - const char *text; + const WCHAR text[MAX_PREFIX_LEN]; int length; - } prefixes[12] = { - /* Code below depends on these being in decreasing length order! */ - {"prospero:", 10}, - {"telnet:", 8}, - {"gopher:", 8}, - {"mailto:", 8}, - {"https:", 7}, - {"file:", 6}, - {"news:", 6}, - {"wais:", 6}, - {"nntp:", 6}, - {"http:", 5}, - {"www.", 5}, - {"ftp:", 5}, + }prefixes[] = { + {{'p','r','o','s','p','e','r','o',':'}, 9}, + {{'t','e','l','n','e','t',':'}, 7}, + {{'g','o','p','h','e','r',':'}, 7}, + {{'m','a','i','l','t','o',':'}, 7}, + {{'h','t','t','p','s',':'}, 6}, + {{'f','i','l','e',':'}, 5}, + {{'n','e','w','s',':'}, 5}, + {{'w','a','i','s',':'}, 5}, + {{'n','n','t','p',':'}, 5}, + {{'h','t','t','p',':'}, 5}, + {{'w','w','w','.'}, 4}, + {{'f','t','p',':'}, 4}, }; - LPWSTR bufferW = NULL; - WCHAR bufW[32]; + WCHAR bufferW[MAX_PREFIX_LEN + 1]; unsigned int i; - ME_Cursor sel_start; - ME_CursorFromCharOfs(editor, sel_min, &sel_start); - if (sel_max == -1) sel_max = ME_GetTextLength(editor); - assert(sel_min <= sel_max); - for (i = 0; i < sizeof(prefixes) / sizeof(struct prefix_s); i++) + ME_GetTextW(editor, bufferW, MAX_PREFIX_LEN, start, nChars, 0); + for (i = 0; i < sizeof(prefixes) / sizeof(*prefixes); i++) { - if (sel_max - sel_min < prefixes[i].length) continue; - if (bufferW == NULL) { - bufferW = heap_alloc((sel_max - sel_min + 1) * sizeof(WCHAR)); - } - ME_GetTextW(editor, bufferW, sel_max - sel_min, &sel_start, - lstrlenA(prefixes[i].text), 0); - MultiByteToWideChar(CP_ACP, 0, prefixes[i].text, -1, bufW, 32); - if (!lstrcmpW(bufW, bufferW)) - { - heap_free(bufferW); + if (nChars < prefixes[i].length) continue; + if (!memcmp(prefixes[i].text, bufferW, prefixes[i].length * sizeof(WCHAR))) return TRUE; - } } - heap_free(bufferW); return FALSE; +#undef MAX_PREFIX_LEN } /** @@ -4837,11 +4824,14 @@ static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, int sel_min, int sel_m if (ME_FindNextURLCandidate(editor, sel_min, sel_max, &cMin, &cMax)) { + ME_Cursor candidateStart; /* Section before candidate is not an URL */ beforeURL[0] = sel_min; beforeURL[1] = cMin; - if (ME_IsCandidateAnURL(editor, cMin, cMax)) + ME_CursorFromCharOfs(editor, cMin, &candidateStart); + if (ME_IsCandidateAnURL(editor, &candidateStart, + (cMax == -1 ? INT_MAX : cMax) - cMin)) { inURL[0] = cMin; inURL[1] = cMax; }

1 0

Dylan Smith : richedit: ME_GetTextW must use source and destination lengths .
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 82e102107c8a03566032f15f1f4d173c0850a9aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=82e102107c8a03566032f15f1… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Aug 12 09:05:51 2009 -0400 richedit: ME_GetTextW must use source and destination lengths. Before a single length was used for the number of characters to retrieve from the text, and to keep track of the size of the buffer. These are not equivalent, since there is a possible end of line conversion. --- dlls/riched20/clipboard.c | 16 ++++- dlls/riched20/editor.c | 160 +++++++++++++++++++++++---------------------- dlls/riched20/editor.h | 4 +- dlls/riched20/editstr.h | 1 + dlls/riched20/table.c | 4 +- dlls/riched20/txtsrv.c | 4 +- 6 files changed, 101 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82e102107c8a03566032f…

1 0

Dylan Smith : richedit: Added function to get selection cursors in order.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 46b84aed4a27883984613a6dac7e6f35a2981778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46b84aed4a27883984613a6da… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Aug 12 09:05:46 2009 -0400 richedit: Added function to get selection cursors in order. Previously the only convenient way to get the start and end of the selection was through offsets, which eventually need to get converted back into items in the linked list storing the text. The new function will help with eliminating these inefficiencies. --- dlls/riched20/caret.c | 43 ++++++++++++++++++++++++------------------- dlls/riched20/editor.c | 47 ++++++++++++++++++++++------------------------- dlls/riched20/editor.h | 3 ++- dlls/riched20/paint.c | 6 +++--- dlls/riched20/richole.c | 2 +- dlls/riched20/run.c | 4 ++-- dlls/riched20/style.c | 13 ++++++------- dlls/riched20/writer.c | 2 +- 8 files changed, 61 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46b84aed4a27883984613…

1 0

Dylan Smith : richedit: Make the ME_GetCursorOfs function more flexible.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: be0fb1ef5dfcf3031e4b230523f8288ecc6d215c URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0fb1ef5dfcf3031e4b23052… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Aug 12 09:05:42 2009 -0400 richedit: Make the ME_GetCursorOfs function more flexible. This function will make it easier to work with ME_Cursor objects, which should be used in a lot of places instead of character offsets (which often require seeking through the linked lists to perform operations with). --- dlls/riched20/caret.c | 26 +++++++++++++------------- dlls/riched20/editor.c | 16 ++++++++-------- dlls/riched20/editor.h | 2 +- dlls/riched20/table.c | 4 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index ca34977..2f93f0d 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -29,8 +29,8 @@ ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs); void ME_GetSelection(ME_TextEditor *editor, int *from, int *to) { - *from = ME_GetCursorOfs(editor, 0); - *to = ME_GetCursorOfs(editor, 1); + *from = ME_GetCursorOfs(&editor->pCursors[0]); + *to = ME_GetCursorOfs(&editor->pCursors[1]); if (*from > *to) { @@ -426,8 +426,8 @@ BOOL ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars) assert(nCursor>=0 && nCursor<editor->nCursors); /* text operations set modified state */ editor->nModifyStep = 1; - return ME_InternalDeleteText(editor, ME_GetCursorOfs(editor, nCursor), nChars, - FALSE); + return ME_InternalDeleteText(editor, ME_GetCursorOfs(&editor->pCursors[nCursor]), + nChars, FALSE); } static ME_DisplayItem * @@ -807,11 +807,10 @@ ME_SelectByType(ME_TextEditor *editor, ME_SelectionType selectionType) editor->pCursors[3] = editor->pCursors[1]; } -int ME_GetCursorOfs(ME_TextEditor *editor, int nCursor) +int ME_GetCursorOfs(const ME_Cursor *cursor) { - ME_Cursor *pCursor = &editor->pCursors[nCursor]; - return pCursor->pPara->member.para.nCharOfs - + pCursor->pRun->member.run.nCharOfs + pCursor->nOffset; + return cursor->pPara->member.para.nCharOfs + + cursor->pRun->member.run.nCharOfs + cursor->nOffset; } /* Helper function for ME_FindPixelPos to find paragraph within tables */ @@ -1019,9 +1018,9 @@ static void ME_ExtendAnchorSelection(ME_TextEditor *editor) int curOfs, anchorStartOfs, anchorEndOfs; if (editor->nSelectionType == stPosition || editor->nSelectionType == stDocument) return; - curOfs = ME_GetCursorOfs(editor, 0); - anchorStartOfs = ME_GetCursorOfs(editor, 3); - anchorEndOfs = ME_GetCursorOfs(editor, 2); + curOfs = ME_GetCursorOfs(&editor->pCursors[0]); + anchorStartOfs = ME_GetCursorOfs(&editor->pCursors[3]); + anchorEndOfs = ME_GetCursorOfs(&editor->pCursors[2]); tmp_cursor = editor->pCursors[0]; editor->pCursors[0] = editor->pCursors[2]; @@ -1499,8 +1498,9 @@ BOOL ME_IsSelection(ME_TextEditor *editor) static int ME_GetSelCursor(ME_TextEditor *editor, int dir) { - int cdir = ME_GetCursorOfs(editor, 0) - ME_GetCursorOfs(editor, 1); - + int cdir = ME_GetCursorOfs(&editor->pCursors[0]) + - ME_GetCursorOfs(&editor->pCursors[1]); + if (cdir*dir>0) return 0; else diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2b6f61f..2a37584 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1013,8 +1013,8 @@ void ME_RTFSpecialCharHook(RTF_Info *info) info->editor->pCursors[1].pRun = run; info->editor->pCursors[1].pPara = ME_GetParagraph(run); info->editor->pCursors[1].nOffset = 0; - nOfs = ME_GetCursorOfs(info->editor, 1); - nChars = ME_GetCursorOfs(info->editor, 0) - nOfs; + nOfs = ME_GetCursorOfs(&info->editor->pCursors[1]); + nChars = ME_GetCursorOfs(&info->editor->pCursors[0]) - nOfs; ME_InternalDeleteText(info->editor, nOfs, nChars, TRUE); } @@ -1516,8 +1516,8 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre editor->pCursors[1].pPara = para; editor->pCursors[1].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[1].nOffset = 0; - nOfs = ME_GetCursorOfs(editor, 1); - nChars = ME_GetCursorOfs(editor, 0) - nOfs; + nOfs = ME_GetCursorOfs(&editor->pCursors[1]); + nChars = ME_GetCursorOfs(&editor->pCursors[0]) - nOfs; ME_InternalDeleteText(editor, nOfs, nChars, TRUE); if (parser.tableDef) parser.tableDef->tableRowStart = NULL; @@ -2352,7 +2352,7 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, para = cursor.pPara; if (ME_IsSelection(editor) && cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && - to == ME_GetCursorOfs(editor, 0) && + to == ME_GetCursorOfs(&editor->pCursors[0]) && para->member.para.prev_para->type == diParagraph) { para = para->member.para.prev_para; @@ -3675,14 +3675,14 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_LINEFROMCHAR: { if (wParam == -1) - return ME_RowNumberFromCharOfs(editor, ME_GetCursorOfs(editor, 1)); + return ME_RowNumberFromCharOfs(editor, ME_GetCursorOfs(&editor->pCursors[1])); else return ME_RowNumberFromCharOfs(editor, wParam); } case EM_EXLINEFROMCHAR: { if (lParam == -1) - return ME_RowNumberFromCharOfs(editor, ME_GetCursorOfs(editor,1)); + return ME_RowNumberFromCharOfs(editor, ME_GetCursorOfs(&editor->pCursors[1])); else return ME_RowNumberFromCharOfs(editor, lParam); } @@ -4171,7 +4171,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; case WM_IME_STARTCOMPOSITION: { - editor->imeStartIndex=ME_GetCursorOfs(editor,0); + editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]); ME_DeleteSelection(editor); ME_CommitUndo(editor); ME_UpdateRepaint(editor); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7d9f704..7fa0566 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -166,7 +166,7 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor); BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl); -int ME_GetCursorOfs(ME_TextEditor *editor, int nCursor); +int ME_GetCursorOfs(const ME_Cursor *cursor); void ME_GetSelection(ME_TextEditor *editor, int *from, int *to); int ME_CountParagraphsBetween(ME_TextEditor *editor, int from, int to); BOOL ME_IsSelection(ME_TextEditor *editor); diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 0d2dab5..10e276a 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -551,8 +551,8 @@ void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) ME_InvalidateSelection(editor); { int from, to; - from = ME_GetCursorOfs(editor, 0); - to = ME_GetCursorOfs(editor, 1); + from = ME_GetCursorOfs(&editor->pCursors[0]); + to = ME_GetCursorOfs(&editor->pCursors[1]); if (from <= to) { fromCursor = editor->pCursors[0];

1 0

André Hentschel : winhlp32: Update German translation.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: e726a5cca186db7e28aed52559abdf4e9751d9fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e726a5cca186db7e28aed5255… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 12 14:25:00 2009 +0200 winhlp32: Update German translation. --- programs/winhlp32/De.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/De.rc b/programs/winhlp32/De.rc index fa59b42..2e14f70 100644 --- a/programs/winhlp32/De.rc +++ b/programs/winhlp32/De.rc @@ -97,13 +97,13 @@ STID_INFO, "Information" STID_NOT_IMPLEMENTED, "Nicht implementiert" STID_HLPFILE_ERROR_s, "Fehler beim Lesen der Hilfe-Datei `%s'" STID_INDEX, "&Inhalt" -STID_CONTENTS, "Summary" +STID_CONTENTS, "Zusammenfassung" STID_BACK, "&Zurück" STID_ALL_FILES, "Alle Dateien (*.*)" STID_HELP_FILES_HLP, "Hilfe-Dateien (*.hlp)" STID_FILE_NOT_FOUND_s "'%s' konnte nicht gefunden werden. Wollen Sie selber nach dieser Datei suchen?" STID_NO_RICHEDIT "Die Richedit Implementation konnte nicht gefunden werden... Breche ab." -STID_PSH_INDEX, "Help topics: " +STID_PSH_INDEX, "Hilfethemen: " } CONTEXT_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

1 0

André Hentschel : shlwapi: Update German translation.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: 7a8495fa75823c25799486f95c28343e47ddec02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8495fa75823c25799486f95… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 12 14:24:37 2009 +0200 shlwapi: Update German translation. --- dlls/shlwapi/shlwapi_De.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/shlwapi_De.rc b/dlls/shlwapi/shlwapi_De.rc index f74600f..8980769 100644 --- a/dlls/shlwapi/shlwapi_De.rc +++ b/dlls/shlwapi/shlwapi_De.rc @@ -41,7 +41,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { IDS_BYTES_FORMAT "%ld Bytes" - IDS_TIME_INTERVAL_HOURS " hr" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sec" + IDS_TIME_INTERVAL_HOURS " Std" + IDS_TIME_INTERVAL_MINUTES " Min" + IDS_TIME_INTERVAL_SECONDS " Sek" }

1 0

André Hentschel : oledlg: Update German translation.
by Alexandre Julliard 12 Aug '09

12 Aug '09

Module: wine Branch: master Commit: b55825ab22225e15620680a2dba1de61ae3ae1cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55825ab22225e15620680a2d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 12 14:24:32 2009 +0200 oledlg: Update German translation. --- dlls/oledlg/oledlg_De.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oledlg/oledlg_De.rc b/dlls/oledlg/oledlg_De.rc index 71dff20..9aad9ba 100644 --- a/dlls/oledlg/oledlg_De.rc +++ b/dlls/oledlg/oledlg_De.rc @@ -75,11 +75,11 @@ BEGIN CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 CONTROL "Abbrechen", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 CONTROL "&Hilfe", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 - CONTROL "Als Symbol &darstellen", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "Als Sym&bol", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 CONTROL "&Symbol ändern...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 - CONTROL "<< result text goes here >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "<< Ergebnis Text hier her >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 CONTROL "Ergebnis", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 END

1 0