January 2009 - Wine-commits

Dylan Smith : richedit: Removed redundant ME_FindItemAtOffset using ME_RunOfsFromCharOfs.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 61308257f238c2cdd079b0fb1fb35f6bac2127a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61308257f238c2cdd079b0fb1… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 27 03:39:23 2009 -0500 richedit: Removed redundant ME_FindItemAtOffset using ME_RunOfsFromCharOfs. The two functions ME_FindItemAtOffset and ME_RunOfsFromCharOfs were almost identically used, since ME_FindItemAtOffset was always used to find a run. The only difference was how they returned the offset within the run for an end of paragraph run. For ME_FindItemAtOffset it would return the next run if it was in between \r and \n. ME_RunOfsFromCharOfs would instead return an nOffset of 0 for end paragraph runs. This subtle difference introduced bugs, so I decided to avoid having special case in this function when creating this patch, and instead let the caller handle this case. --- dlls/riched20/caret.c | 9 ++++- dlls/riched20/editor.c | 73 +++++++----------------------------------- dlls/riched20/editor.h | 1 - dlls/riched20/run.c | 83 ++++++++++++++++++++--------------------------- dlls/riched20/writer.c | 5 ++- 5 files changed, 57 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61308257f238c2cdd079b…

1 0

Dylan Smith : riched32: Test EM_FINDTEXT searching for end of line characters.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 8ec60e97755fb7fc2fc95cab7832563df7964841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec60e97755fb7fc2fc95cab7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 27 03:40:03 2009 -0500 riched32: Test EM_FINDTEXT searching for end of line characters. EM_FINDTEXT should be able to find end of line characters, but currently it doesn't. --- dlls/riched32/tests/editor.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 115c4f7..b8bd6eb 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -535,6 +535,8 @@ static void test_EM_GETSELTEXT(void) static const char haystack[] = "WINEWine wineWine wine WineWine"; /* ^0 ^10 ^20 ^30 */ +static const char haystack2[] = "first\r\r\nsecond"; + struct find_s { int start; int end; @@ -620,6 +622,13 @@ struct find_s find_tests2[] = { {4, -1, "INEW", 0, 10}, }; +struct find_s find_tests3[] = { + /* Searching for end of line characters */ + {0, -1, "t\r\r\ns", FR_DOWN | FR_MATCHCASE, 4}, + {6, -1, "\r\n", FR_DOWN | FR_MATCHCASE, 6}, + {7, -1, "\n", FR_DOWN | FR_MATCHCASE, 7}, +}; + static void check_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *f, int id) { int findloc; FINDTEXT ft; @@ -682,6 +691,12 @@ static void test_EM_FINDTEXT(void) run_tests_EM_FINDTEXT(hwndRichEdit, "2", find_tests2, sizeof(find_tests2)/sizeof(struct find_s)); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) haystack2); + + /* Haystack text 2 (with EOL characters) */ + todo_wine run_tests_EM_FINDTEXT(hwndRichEdit, "3", find_tests3, + sizeof(find_tests3)/sizeof(struct find_s)); + DestroyWindow(hwndRichEdit); }

1 0

Dylan Smith : richedit: Handle starting in EOL sequence in EM_GETTEXTRANGE.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 61f189cec8cb9bcca8f60ac0f10cedb59bcf1cd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f189cec8cb9bcca8f60ac0f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 27 03:39:17 2009 -0500 richedit: Handle starting in EOL sequence in EM_GETTEXTRANGE. EM_GETTEXTRANGE allows the start character offset and end characters offset to be used to specify the range of text to retrieve. If the start offset is in the middle of an end of paragraph run (i.e. \r\n), then it should only retrieve the characters after the specified character offset. --- dlls/riched20/editor.c | 119 +++++++++++++++--------------------------- dlls/riched32/tests/editor.c | 2 +- 2 files changed, 43 insertions(+), 78 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 86f89d0..c66026d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4568,108 +4568,73 @@ int ME_CountParagraphsBetween(ME_TextEditor *editor, int from, int to) } -int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int nStart, int nChars, int bCRLF) +int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int nStart, + int nChars, int bCRLF) { - ME_DisplayItem *item = ME_FindItemAtOffset(editor, diRun, nStart, &nStart); - int nWritten = 0; + ME_DisplayItem *pRun; + int nOffset, nWritten = 0; WCHAR *pStart = buffer; - - if (!item) { - *buffer = 0; - return 0; - } - + + ME_RunOfsFromCharOfs(editor, nStart, &pRun, &nOffset); + /* Get actual offset within run (ME_RunOfsFromCharOfs sets to 0 if MERF_ENDPARA) */ + nOffset = nStart - ME_GetParagraph(pRun)->member.para.nCharOfs - pRun->member.run.nCharOfs; + /* bCRLF flag is only honored in 2.0 and up. 1.0 must always return text verbatim */ if (editor->bEmulateVersion10) bCRLF = 0; - if (nStart) - { - int nLen = ME_StrLen(item->member.run.strText) - nStart; - if (nLen > nChars) - nLen = nChars; - CopyMemory(buffer, item->member.run.strText->szData + nStart, sizeof(WCHAR)*nLen); - nChars -= nLen; - nWritten += nLen; - buffer += nLen; - if (!nChars) { - *buffer = 0; - return nWritten; - } - nStart = 0; - item = ME_FindItemFwd(item, diRun); - } - - while(nChars && item) + while (nChars && pRun) { - int nLen = ME_StrLen(item->member.run.strText); - if (item->member.run.nFlags & MERF_ENDPARA) - nLen = item->member.run.nCR + item->member.run.nLF; - if (nLen > nChars) - nLen = nChars; + int nLen; - if (item->member.run.nFlags & MERF_ENDCELL && - item->member.run.nFlags & MERF_ENDPARA) + if (pRun->member.run.nFlags & MERF_ENDCELL && + pRun->member.run.nFlags & MERF_ENDPARA) { *buffer = '\t'; - } - else if (item->member.run.nFlags & MERF_ENDPARA) - { - if (!ME_FindItemFwd(item, diRun)) + nLen = 1; + } else if (pRun->member.run.nFlags & MERF_ENDPARA) { + if (!ME_FindItemFwd(pRun, diRun)) { /* No '\r' is appended to the last paragraph. */ nLen = 0; - else if (bCRLF && nChars == 1) { + } else if (bCRLF && nChars == 1) { nLen = 0; nChars = 0; } else { + int numCR, numLF; + int i, j; + if (bCRLF) { - /* richedit 2.0 case - actual line-break is \r but should report \r\n */ - if (ME_GetParagraph(item)->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND)) - assert(nLen == 2); - else - assert(nLen == 1); - *buffer++ = '\r'; - *buffer = '\n'; /* Later updated by nLen==1 at the end of the loop */ - if (nLen == 1) - nWritten++; - else - buffer--; + numCR = 1; + numLF = 1; + } else { + numCR = pRun->member.run.nCR; + numLF = pRun->member.run.nLF; } - else - { - int i, j; + numCR -= nOffset; - /* richedit 2.0 verbatim has only \r. richedit 1.0 should honor encodings */ - i = 0; - while (nChars - i > 0 && i < item->member.run.nCR) - { - buffer[i] = '\r'; i++; - } - j = 0; - while (nChars - i - j > 0 && j < item->member.run.nLF) - { - buffer[i+j] = '\n'; j++; - } - } + nLen = min(nChars, numCR + numLF); + + for (i = 0; i < nLen && i < numCR; i++) + buffer[i] = '\r'; + + for (j = 0; i + j < nLen && j < numLF; j++) + buffer[i+j] = '\n'; } + } else { + nLen = min(nChars, ME_StrLen(pRun->member.run.strText) - nOffset); + CopyMemory(buffer, pRun->member.run.strText->szData + nOffset, + sizeof(WCHAR) * nLen); } - else - CopyMemory(buffer, item->member.run.strText->szData, sizeof(WCHAR)*nLen); nChars -= nLen; nWritten += nLen; - buffer += nLen; - - if (!nChars) - { - TRACE("nWritten=%d, actual=%d\n", nWritten, buffer-pStart); - *buffer = 0; - return nWritten; - } - item = ME_FindItemFwd(item, diRun); + buffer += nLen; + nOffset = 0; + + pRun = ME_FindItemFwd(pRun, diRun); } *buffer = 0; TRACE("nWritten=%d, actual=%d\n", nWritten, buffer-pStart); - return nWritten; + return nWritten; } static BOOL ME_RegisterEditorClass(HINSTANCE hInstance) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 58e0bae..115c4f7 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -487,7 +487,7 @@ static void test_EM_GETTEXTRANGE(void) textRange.chrg.cpMax = 12; result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); ok(result == 4, "EM_GETTEXTRANGE returned %ld\n", result); - todo_wine ok(!strcmp(expect2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(!strcmp(expect2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3);

1 0

Dylan Smith : riched32: Test for EM_GETTEXTRANGE from middle of end of paragraph run.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 5bf9e73dd097eecc7739cff3329db8aa8ec1901f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bf9e73dd097eecc7739cff33… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 27 03:39:10 2009 -0500 riched32: Test for EM_GETTEXTRANGE from middle of end of paragraph run. EM_GETTEXTRANGE should be able to get part of the end of paragraph run, for instance just the line feed in a carraige return line feed pair. --- dlls/riched32/tests/editor.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 7332536..58e0bae 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -465,9 +465,10 @@ static void test_EM_GETTEXTRANGE(void) { HWND hwndRichEdit = new_richedit(NULL); const char * text1 = "foo bar\r\nfoo bar"; - const char * text2 = "foo bar\rfoo bar"; + const char * text3 = "foo bar\rfoo bar"; const char * expect1 = "bar\r\nfoo"; - const char * expect2 = "bar\rfoo"; + const char * expect2 = "\nfoo"; + const char * expect3 = "bar\rfoo"; char buffer[1024] = {0}; LRESULT result; TEXTRANGEA textRange; @@ -481,7 +482,14 @@ static void test_EM_GETTEXTRANGE(void) ok(result == 8, "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(expect1, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); - SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); + textRange.lpstrText = buffer; + textRange.chrg.cpMin = 8; + textRange.chrg.cpMax = 12; + result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + ok(result == 4, "EM_GETTEXTRANGE returned %ld\n", result); + todo_wine ok(!strcmp(expect2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text3); textRange.lpstrText = buffer; textRange.chrg.cpMin = 4; @@ -489,7 +497,7 @@ static void test_EM_GETTEXTRANGE(void) result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); - ok(!strcmp(expect2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + ok(!strcmp(expect3, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); DestroyWindow(hwndRichEdit);

1 0

Dylan Smith : richedit: Handle case for EM_LINELENGTH when offset is between \r\n.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: c94e78a5728ecc8ddde5b1d9f8395b2a11c99256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94e78a5728ecc8ddde5b1d9f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 27 03:39:03 2009 -0500 richedit: Handle case for EM_LINELENGTH when offset is between \r\n. I found that ME_FindItemAtOffset and ME_CursorFromCharOfs are used almost identically, except for how they handle a character offset that is between a carriage return and line feed. In this case ME_CursorFromCharOfs sets the cursor's run offset to 0, but ME_FindItemAtOffset instead returns the next run which is what was causing ME_LINELENGTH to incorrectly return the length of the next line. --- dlls/riched20/editor.c | 7 ++++--- dlls/riched32/tests/editor.c | 8 ++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f10dddc..86f89d0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3786,7 +3786,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { ME_DisplayItem *item, *item_end; int nChars = 0, nThisLineOfs = 0, nNextLineOfs = 0; - + ME_Cursor cursor; + if (wParam > ME_GetTextLength(editor)) return 0; if (wParam == -1) @@ -3794,8 +3795,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, FIXME("EM_LINELENGTH: returning number of unselected characters on lines with selection unsupported.\n"); return 0; } - item = ME_FindItemAtOffset(editor, diRun, wParam, NULL); - item = ME_RowStart(item); + ME_CursorFromCharOfs(editor, wParam, &cursor); + item = ME_RowStart(cursor.pRun); nThisLineOfs = ME_CharOfsFromRunOfs(editor, ME_FindItemFwd(item, diRun), 0); item_end = ME_FindItemFwd(item, diStartRowOrParagraphOrEnd); if (item_end->type == diStartRow) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 113dbd0..7332536 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -454,12 +454,8 @@ static void test_EM_LINELENGTH(void) for (i = 0; i < sizeof(offset_test)/sizeof(offset_test[0]); i++) { result = SendMessage(hwndRichEdit, EM_LINELENGTH, offset_test[i][0], 0); - if (i == 6) - todo_wine ok(result == offset_test[i][1], "Length of line at offset %d is %ld, expected %d\n", - offset_test[i][0], result, offset_test[i][1]); - else - ok(result == offset_test[i][1], "Length of line at offset %d is %ld, expected %d\n", - offset_test[i][0], result, offset_test[i][1]); + ok(result == offset_test[i][1], "Length of line at offset %d is %ld, expected %d\n", + offset_test[i][0], result, offset_test[i][1]); } DestroyWindow(hwndRichEdit);

1 0

Dylan Smith : riched32: Test EM_LINELENGTH between carriage return & line feed.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 83ff6a5c5d3f9bf9fe7c5198362ead6afdda817c URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ff6a5c5d3f9bf9fe7c51983… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 27 03:38:56 2009 -0500 riched32: Test EM_LINELENGTH between carriage return & line feed. Previously this wasn't properly tested for, since all the lines had text of the same length, so it wasn't properly testing to see which line length it was getting. --- dlls/riched32/tests/editor.c | 47 ++++++++++++++++++++++++++++------------- 1 files changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index b01faee..113dbd0 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -421,28 +421,45 @@ static void test_EM_LINELENGTH(void) "richedit1\r" "richedit1\n" "richedit1\r\n" - "richedit1\r\r\r\r\r\n"; - int offset_test[10][2] = { - {0, 9}, - {5, 9}, - {10, 9}, - {15, 9}, - {20, 9}, - {25, 9}, - {30, 9}, - {35, 9}, - {40, 9}, /* <----- in the middle of the \r run, but run not counted */ - {45, 0}, + "short\r" + "richedit1\r" + "\r" + "\r" + "\r\r\n"; + int offset_test[16][2] = { + {0, 9}, /* Line 1: |richedit1\r */ + {5, 9}, /* Line 1: riche|dit1\r */ + {10, 9}, /* Line 2: |richedit1\n */ + {15, 9}, /* Line 2: riche|dit1\n */ + {20, 9}, /* Line 3: |richedit1\r\n */ + {25, 9}, /* Line 3: riche|dit1\r\n */ + {30, 9}, /* Line 3: richedit1\r|\n */ + {31, 5}, /* Line 4: |short\r */ + {42, 9}, /* Line 5: riche|dit1\r */ + {46, 9}, /* Line 5: richedit1|\r */ + {47, 0}, /* Line 6: |\r */ + {48, 0}, /* Line 7: |\r */ + {49, 0}, /* Line 8: |\r\r\n */ + {50, 0}, /* Line 8: \r|\r\n */ + {51, 0}, /* Line 8: \r\r|\n */ + {52, 0}, /* Line 9: \r\r\n| */ }; int i; LRESULT result; SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); - for (i = 0; i < 10; i++) { + result = SendMessage(hwndRichEdit, EM_GETLINECOUNT, 0, 0); + ok(result == 9, "Incorrect line count of %ld\n", result); + + for (i = 0; i < sizeof(offset_test)/sizeof(offset_test[0]); i++) { result = SendMessage(hwndRichEdit, EM_LINELENGTH, offset_test[i][0], 0); - ok(result == offset_test[i][1], "Length of line at offset %d is %ld, expected %d\n", - offset_test[i][0], result, offset_test[i][1]); + if (i == 6) + todo_wine ok(result == offset_test[i][1], "Length of line at offset %d is %ld, expected %d\n", + offset_test[i][0], result, offset_test[i][1]); + else + ok(result == offset_test[i][1], "Length of line at offset %d is %ld, expected %d\n", + offset_test[i][0], result, offset_test[i][1]); } DestroyWindow(hwndRichEdit);

1 0

Dylan Smith : richedit: End of line sequence limited to 2 carriage returns.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 083273742750e800b9d86ddf5d5ebc5cd14a5d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=083273742750e800b9d86ddf5… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 27 03:38:49 2009 -0500 richedit: End of line sequence limited to 2 carriage returns. riched32.dll does preserve the carriage returns and line feeds unlike later versions of the richedit control, however the tests previously missed the fact that a sequence of carriage returns followed by a line feed (e.g. \r\r\r\n) can actually cause multiple paragraph breaks. --- dlls/riched20/caret.c | 131 ++++++++++++++--------------------------- dlls/riched32/tests/editor.c | 27 ++------ 2 files changed, 52 insertions(+), 106 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index bd0b149..460f9be 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -517,107 +517,66 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, if(editor->nTextLimit < oldLen +len) editor->nTextLimit = oldLen + len; + pos = str; + while (len) { - pos = str; /* FIXME this sucks - no respect for unicode (what else can be a line separator in unicode?) */ - while(pos-str < len && *pos != '\r' && *pos != '\n' && *pos != '\t') + while(pos - str < len && *pos != '\r' && *pos != '\n' && *pos != '\t') pos++; - if (pos-str < len && *pos == '\t') { /* handle tabs */ - WCHAR tab = '\t'; - if (pos!=str) - ME_InternalInsertTextFromCursor(editor, nCursor, str, pos-str, style, 0); - + if (pos != str) { /* handle text */ + ME_InternalInsertTextFromCursor(editor, nCursor, str, pos-str, style, 0); + } else if (*pos == '\t') { /* handle tabs */ + WCHAR tab = '\t'; ME_InternalInsertTextFromCursor(editor, nCursor, &tab, 1, style, MERF_TAB); - pos++; - if(pos-str <= len) { - len -= pos - str; - str = pos; - continue; - } - } - /* handle special \r\r\n sequence (richedit 2.x and higher only) */ - if (!editor->bEmulateVersion10 && pos-str < len-2 && pos[0] == '\r' && pos[1] == '\r' && pos[2] == '\n') { - WCHAR space = ' '; - - if (pos!=str) - ME_InternalInsertTextFromCursor(editor, nCursor, str, pos-str, style, 0); - - ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, style, 0); - - pos+=3; - if(pos-str <= len) { - len -= pos - str; - str = pos; - continue; - } - } - if (pos-str < len) { /* handle EOLs */ + } else { /* handle EOLs */ ME_DisplayItem *tp, *end_run; ME_Style *tmp_style; int numCR, numLF; - if (pos!=str) - ME_InternalInsertTextFromCursor(editor, nCursor, str, pos-str, style, 0); - p = &editor->pCursors[nCursor]; - if (p->nOffset) { - ME_SplitRunSimple(editor, p->pRun, p->nOffset); - p = &editor->pCursors[nCursor]; - } - tmp_style = ME_GetInsertStyle(editor, nCursor); - /* ME_SplitParagraph increases style refcount */ - - /* Encode and fill number of CR and LF according to emulation mode */ - if (editor->bEmulateVersion10) { - const WCHAR * tpos; - - /* We have to find out how many consecutive \r are there, and if there - is a \n terminating the run of \r's. */ - numCR = 0; numLF = 0; - tpos = pos; - while (tpos-str < len && *tpos == '\r') { - tpos++; - numCR++; - } - if (tpos-str >= len) { - /* Reached end of text without finding anything but '\r' */ - if (tpos != pos) { - pos++; - } - numCR = 1; numLF = 0; - } else if (*tpos == '\n') { - /* The entire run of \r's plus the one \n is one single line break */ - pos = tpos + 1; - numLF = 1; - } else { - /* Found some other content past the run of \r's */ - pos++; - numCR = 1; numLF = 0; - } + /* Find number of CR and LF in end of paragraph run */ + numCR = 0; numLF = 0; + if (*pos =='\r') + { + numCR++; + if (len > 1 && pos[1] == '\n') + numLF++; + else if (len > 2 && pos[1] == '\r' && pos[2] == '\n') + numCR++, numLF++; } else { - if(pos-str < len && *pos =='\r') - pos++; - if(pos-str < len && *pos =='\n') - pos++; - numCR = 1; numLF = 0; + assert(*pos == '\n'); + numLF++; } - tp = ME_SplitParagraph(editor, p->pRun, p->pRun->member.run.style, numCR, numLF, 0); - p->pRun = ME_FindItemFwd(tp, diRun); - end_run = ME_FindItemBack(tp, diRun); - ME_ReleaseStyle(end_run->member.run.style); - end_run->member.run.style = tmp_style; - p->nOffset = 0; - - if(pos-str <= len) { - len -= pos - str; - str = pos; - continue; + pos += numCR + numLF; + + if (!editor->bEmulateVersion10 && numCR == 2 && numLF == 1) + { + /* handle special \r\r\n sequence (richedit 2.x and higher only) */ + WCHAR space = ' '; + ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, style, 0); + } else { + if (!editor->bEmulateVersion10) + numCR = 1, numLF = 0; + + p = &editor->pCursors[nCursor]; + if (p->nOffset) { + ME_SplitRunSimple(editor, p->pRun, p->nOffset); + p = &editor->pCursors[nCursor]; + } + tmp_style = ME_GetInsertStyle(editor, nCursor); + /* ME_SplitParagraph increases style refcount */ + tp = ME_SplitParagraph(editor, p->pRun, p->pRun->member.run.style, numCR, numLF, 0); + p->pRun = ME_FindItemFwd(tp, diRun); + end_run = ME_FindItemBack(tp, diRun); + ME_ReleaseStyle(end_run->member.run.style); + end_run->member.run.style = tmp_style; + p->nOffset = 0; } } - ME_InternalInsertTextFromCursor(editor, nCursor, str, len, style, 0); - len = 0; + len -= pos - str; + str = pos; } } diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 1fab410..b01faee 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -392,12 +392,8 @@ static void test_EM_GETLINE(void) /* EM_GETLINE appends a "\r\0" to the end of the line * nCopied counts up to and including the '\r' */ nCopied = SendMessage(hwndRichEdit, EM_GETLINE, gl[i].line, (LPARAM) dest); - if (i >= 1 && i <= 4) - todo_wine ok(nCopied == expected_nCopied, "%d: %d!=%d\n", i, nCopied, - expected_nCopied); - else - ok(nCopied == expected_nCopied, "%d: %d!=%d\n", i, nCopied, - expected_nCopied); + ok(nCopied == expected_nCopied, "%d: %d!=%d\n", i, nCopied, + expected_nCopied); /* two special cases since a parameter is passed via dest */ if (gl[i].buffer_len == 0) ok(!dest[0] && !dest[1] && !strncmp(dest+2, origdest+2, nBuf-2), @@ -407,20 +403,11 @@ static void test_EM_GETLINE(void) !strncmp(dest+2, origdest+2, nBuf-2), "buffer_len=1\n"); else { - if (i >= 1 && i <= 4) - todo_wine ok(!strncmp(dest, gl[i].text, expected_bytes_written), - "%d: expected_bytes_written=%d\n", i, expected_bytes_written); - else - ok(!strncmp(dest, gl[i].text, expected_bytes_written), - "%d: expected_bytes_written=%d\n", i, expected_bytes_written); - if (i >= 1 && i <= 2) - todo_wine ok(!strncmp(dest + expected_bytes_written, origdest - + expected_bytes_written, nBuf - expected_bytes_written), - "%d: expected_bytes_written=%d\n", i, expected_bytes_written); - else - ok(!strncmp(dest + expected_bytes_written, origdest - + expected_bytes_written, nBuf - expected_bytes_written), - "%d: expected_bytes_written=%d\n", i, expected_bytes_written); + ok(!strncmp(dest, gl[i].text, expected_bytes_written), + "%d: expected_bytes_written=%d\n", i, expected_bytes_written); + ok(!strncmp(dest + expected_bytes_written, origdest + + expected_bytes_written, nBuf - expected_bytes_written), + "%d: expected_bytes_written=%d\n", i, expected_bytes_written); } }

1 0

Dylan Smith : riched32: Modified tests to show paragraph break inconsistency.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 29ddbce2888b268efad21ac4b3d6e269000a7d9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ddbce2888b268efad21ac4b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jan 27 03:38:43 2009 -0500 riched32: Modified tests to show paragraph break inconsistency. Several carriage returns followed by a line break were being handled as a single paragraph break, when actually native richedit controls may count this as several line breaks. --- dlls/riched32/tests/editor.c | 62 +++++++++++++++++++++++++---------------- 1 files changed, 38 insertions(+), 24 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index d5a2149..1fab410 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -71,19 +71,18 @@ static void test_WM_SETTEXT() LRESULT result; /* This test attempts to show that WM_SETTEXT on a riched32 control does not - attempt to modify the text that is pasted into the control, and should - return it as is. In particular, \r\r\n is NOT converted, unlike riched20. - Currently, builtin riched32 mangles solitary \r or \n when not part of - a \r\n pair. - - For riched32, the rules for breaking lines seem to be the following: - - \r\n is one line break. This is the normal case. - - \r{0,N}\n is one line break. In particular, \n by itself is a line break. - - \n{1,N} are that many line breaks. - - \r with text or other characters (except \n) past it, is a line break. That - is, a run of \r{N} without a terminating \n is considered N line breaks - - \r at the end of the text is NOT a line break. This differs from riched20, - where \r at the end of the text is a proper line break. + * attempt to modify the text that is pasted into the control, and should + * return it as is. In particular, \r\r\n is NOT converted, unlike riched20. + * + * For riched32, the rules for breaking lines seem to be the following: + * - \r\n is one line break. This is the normal case. + * - \r{0,2}\n is one line break. In particular, \n by itself is a line break. + * - \r{0,N-1}\r\r\n is N line breaks. + * - \n{1,N} are that many line breaks. + * - \r with text or other characters (except \n) past it, is a line break. That + * is, a run of \r{N} without a terminating \n is considered N line breaks + * - \r at the end of the text is NOT a line break. This differs from riched20, + * where \r at the end of the text is a proper line break. */ #define TEST_SETTEXT(a, b, nlines) \ @@ -357,9 +356,10 @@ static const struct getline_s { const char *text; } gl[] = { {0, 10, "foo bar\r\n"}, - {1, 10, "\n"}, - {2, 10, "bar\n"}, - {3, 10, "\r\n"}, + {1, 10, "\r"}, + {2, 10, "\r\r\n"}, + {3, 10, "bar\n"}, + {4, 10, "\r\n"}, /* Buffer smaller than line length */ {0, 2, "foo bar\r"}, @@ -374,7 +374,8 @@ static void test_EM_GETLINE(void) static const int nBuf = 1024; char dest[1024], origdest[1024]; const char text[] = "foo bar\r\n" - "\n" + "\r" + "\r\r\n" "bar\n"; SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); @@ -391,8 +392,12 @@ static void test_EM_GETLINE(void) /* EM_GETLINE appends a "\r\0" to the end of the line * nCopied counts up to and including the '\r' */ nCopied = SendMessage(hwndRichEdit, EM_GETLINE, gl[i].line, (LPARAM) dest); - ok(nCopied == expected_nCopied, "%d: %d!=%d\n", i, nCopied, - expected_nCopied); + if (i >= 1 && i <= 4) + todo_wine ok(nCopied == expected_nCopied, "%d: %d!=%d\n", i, nCopied, + expected_nCopied); + else + ok(nCopied == expected_nCopied, "%d: %d!=%d\n", i, nCopied, + expected_nCopied); /* two special cases since a parameter is passed via dest */ if (gl[i].buffer_len == 0) ok(!dest[0] && !dest[1] && !strncmp(dest+2, origdest+2, nBuf-2), @@ -402,11 +407,20 @@ static void test_EM_GETLINE(void) !strncmp(dest+2, origdest+2, nBuf-2), "buffer_len=1\n"); else { - ok(!strncmp(dest, gl[i].text, expected_bytes_written), - "%d: expected_bytes_written=%d\n", i, expected_bytes_written); - ok(!strncmp(dest + expected_bytes_written, origdest - + expected_bytes_written, nBuf - expected_bytes_written), - "%d: expected_bytes_written=%d\n", i, expected_bytes_written); + if (i >= 1 && i <= 4) + todo_wine ok(!strncmp(dest, gl[i].text, expected_bytes_written), + "%d: expected_bytes_written=%d\n", i, expected_bytes_written); + else + ok(!strncmp(dest, gl[i].text, expected_bytes_written), + "%d: expected_bytes_written=%d\n", i, expected_bytes_written); + if (i >= 1 && i <= 2) + todo_wine ok(!strncmp(dest + expected_bytes_written, origdest + + expected_bytes_written, nBuf - expected_bytes_written), + "%d: expected_bytes_written=%d\n", i, expected_bytes_written); + else + ok(!strncmp(dest + expected_bytes_written, origdest + + expected_bytes_written, nBuf - expected_bytes_written), + "%d: expected_bytes_written=%d\n", i, expected_bytes_written); } }

1 0

Austin English : configure: Fix <netinet/tcp_var.h> detection on OpenBSD.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 53d3c46bf92b19d82f554bb1cc4d61530e4eddc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d3c46bf92b19d82f554bb1c… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 26 23:47:49 2009 -0600 configure: Fix <netinet/tcp_var.h> detection on OpenBSD. --- configure | 3 +++ configure.ac | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f7a5ea7..19d95a0 100755 --- a/configure +++ b/configure @@ -8049,6 +8049,9 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_SYS_SOCKETVAR_H # include <sys/socketvar.h> #endif + #ifdef HAVE_SYS_TIMEOUT_H + # include <sys/timeout.h> + #endif #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif diff --git a/configure.ac b/configure.ac index 122191d..063ea15 100644 --- a/configure.ac +++ b/configure.ac @@ -423,6 +423,9 @@ AC_CHECK_HEADERS([netinet/tcp_timer.h netinet/udp_var.h netinet/icmp_var.h netin #ifdef HAVE_SYS_SOCKETVAR_H # include <sys/socketvar.h> #endif + #ifdef HAVE_SYS_TIMEOUT_H + # include <sys/timeout.h> + #endif #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif

1 0

Austin English : configure: Fix <netinet/in_pcb.h> detection on OpenBSD.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: bb3f25848f5802eba802500171a357aef7735100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3f25848f5802eba80250017… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 26 23:34:42 2009 -0600 configure: Fix <netinet/in_pcb.h> detection on OpenBSD. --- configure | 3 +++ configure.ac | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 58aa461..f7a5ea7 100755 --- a/configure +++ b/configure @@ -7962,6 +7962,9 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_SYS_SOCKETVAR_H # include <sys/socketvar.h> #endif + #ifdef HAVE_NET_ROUTE_H + # include <net/route.h> + #endif #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif diff --git a/configure.ac b/configure.ac index 61c50b3..122191d 100644 --- a/configure.ac +++ b/configure.ac @@ -399,6 +399,9 @@ AC_CHECK_HEADERS(\ #ifdef HAVE_SYS_SOCKETVAR_H # include <sys/socketvar.h> #endif + #ifdef HAVE_NET_ROUTE_H + # include <net/route.h> + #endif #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif

1 0