June 2008 - Wine-commits - list.winehq.org

Alex Villacís Lasso : richedit: Insertion style must NOT be cleared unless selection actually changed.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: c7873afbb2c0eb61a8999b64ad4e59a72bb9a577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7873afbb2c0eb61a8999b64a… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sun May 4 22:51:52 2008 -0500 richedit: Insertion style must NOT be cleared unless selection actually changed. --- dlls/riched20/caret.c | 4 +- dlls/riched20/tests/editor.c | 111 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index b2172ac..3451301 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1316,8 +1316,6 @@ void ME_SendSelChange(ME_TextEditor *editor) { SELCHANGE sc; - ME_ClearTempStyle(editor); - if (!(editor->nEventMask & ENM_SELCHANGE)) return; @@ -1336,6 +1334,8 @@ void ME_SendSelChange(ME_TextEditor *editor) (sc.seltyp & SEL_MULTICHAR) ? "SEL_MULTICHAR" : ""); if (sc.chrg.cpMin != editor->notified_cr.cpMin || sc.chrg.cpMax != editor->notified_cr.cpMax) { + ME_ClearTempStyle(editor); + editor->notified_cr = sc.chrg; SendMessageW(GetParent(editor->hWnd), WM_NOTIFY, sc.nmhdr.idFrom, (LPARAM)&sc); } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 0a9ca9b..9ed600b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -414,6 +414,7 @@ static void test_EM_SETCHARFORMAT(void) 0 }; int i; + CHARRANGE cr; /* Invalid flags, CHARFORMAT2 structure blanked out */ memset(&cf2, 0, sizeof(cf2)); @@ -639,6 +640,116 @@ static void test_EM_SETCHARFORMAT(void) DestroyWindow(hwndRichEdit); } + + /* Effects applied on an empty selection should take effect when selection is + replaced with text */ + hwndRichEdit = new_richedit(NULL); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); + SendMessage(hwndRichEdit, EM_SETSEL, 2, 2); /* Empty selection */ + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + cf2.dwMask = CFM_BOLD; + cf2.dwEffects = CFE_BOLD; + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + /* Selection is now nonempty */ + SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"newi"); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 2, 6); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + ok (((cf2.dwMask & CFM_BOLD) == CFM_BOLD), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, CFM_BOLD); + ok((cf2.dwEffects & CFE_BOLD) == CFE_BOLD, + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x\n", i, cf2.dwEffects, CFE_BOLD); + + + /* Set two effects on an empty selection */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); + SendMessage(hwndRichEdit, EM_SETSEL, 2, 2); /* Empty selection */ + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + cf2.dwMask = CFM_BOLD; + cf2.dwEffects = CFE_BOLD; + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + cf2.dwMask = CFM_ITALIC; + cf2.dwEffects = CFE_ITALIC; + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + /* Selection is now nonempty */ + SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"newi"); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 2, 6); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + ok (((cf2.dwMask & (CFM_BOLD|CFM_ITALIC)) == (CFM_BOLD|CFM_ITALIC)), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, (CFM_BOLD|CFM_ITALIC)); + ok((cf2.dwEffects & (CFE_BOLD|CFE_ITALIC)) == (CFE_BOLD|CFE_ITALIC), + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x\n", i, cf2.dwEffects, (CFE_BOLD|CFE_ITALIC)); + + /* Setting the (empty) selection to exactly the same place as before should + NOT clear the insertion style! */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); + SendMessage(hwndRichEdit, EM_SETSEL, 2, 2); /* Empty selection */ + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + cf2.dwMask = CFM_BOLD; + cf2.dwEffects = CFE_BOLD; + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + /* Empty selection in same place, insert style should NOT be forgotten here. */ + SendMessage(hwndRichEdit, EM_SETSEL, 2, 2); + + /* Selection is now nonempty */ + SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"newi"); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 2, 6); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + ok (((cf2.dwMask & CFM_BOLD) == CFM_BOLD), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, CFM_BOLD); + ok((cf2.dwEffects & CFE_BOLD) == CFE_BOLD, + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x\n", i, cf2.dwEffects, CFE_BOLD); + + /* Ditto with EM_EXSETSEL */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); + cr.cpMin = 2; cr.cpMax = 2; + SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); /* Empty selection */ + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + cf2.dwMask = CFM_BOLD; + cf2.dwEffects = CFE_BOLD; + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + /* Empty selection in same place, insert style should NOT be forgotten here. */ + cr.cpMin = 2; cr.cpMax = 2; + SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); /* Empty selection */ + + /* Selection is now nonempty */ + SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)"newi"); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + cr.cpMin = 2; cr.cpMax = 6; + SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&cr); /* Empty selection */ + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + ok (((cf2.dwMask & CFM_BOLD) == CFM_BOLD), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, CFM_BOLD); + ok((cf2.dwEffects & CFE_BOLD) == CFE_BOLD, + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x\n", i, cf2.dwEffects, CFE_BOLD); + + DestroyWindow(hwndRichEdit); } static void test_EM_SETTEXTMODE(void)

1 0

Alex Villacís Lasso : richedit: Add tests for URL autodetection for EM_REPLACESEL, make them pass under Wine.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: d2900a53e181d3c9cbf0ee8bf079543632adbc20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2900a53e181d3c9cbf0ee8bf… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sun May 4 15:59:39 2008 -0500 richedit: Add tests for URL autodetection for EM_REPLACESEL, make them pass under Wine. --- dlls/riched20/editor.c | 1 + dlls/riched20/tests/editor.c | 115 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index fec9940..8acb74d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2380,6 +2380,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ME_ClearTempStyle(editor); ME_EndToUnicode(unicode, wszText); ME_CommitUndo(editor); + if (editor->AutoURLDetect_bEnable) ME_UpdateSelectionLinkAttribute(editor); if (!wParam) ME_EmptyUndoStack(editor); ME_UpdateRepaint(editor); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 4bd3c63..0a9ca9b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1685,6 +1685,121 @@ static void test_EM_AUTOURLDETECT(void) hwndRichEdit = NULL; } + /* Test detection of URLs within normal text - EM_REPLACESEL case. */ + for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) { + hwndRichEdit = new_richedit(parent); + + /* Set selection with X to the URL */ + for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) { + char * at_pos; + int at_offset; + int end_offset; + + at_pos = strchr(templates_delim[j], 'X'); + at_offset = at_pos - templates_delim[j]; + end_offset = at_offset + strlen(urls[i].text); + + SendMessage(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) templates_delim[j]); + SendMessage(hwndRichEdit, EM_SETSEL, at_offset, at_offset+1); + SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) urls[i].text); + SendMessage(hwndRichEdit, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + + /* This assumes no templates start with the URL itself, and that they + have at least two characters before the URL text */ + ok(!check_CFE_LINK_selection(hwndRichEdit, 0, 1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", 0, 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -2, at_offset -1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -2, at_offset -1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -1, at_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -1, at_offset, buffer); + + if (urls[i].is_url) + { + ok(check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK not set in (%d-%d), text: %s\n", at_offset, at_offset +1, buffer); + ok(check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK not set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + else + { + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset, at_offset + 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + if (buffer[end_offset] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset, end_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset, end_offset + 1, buffer); + if (buffer[end_offset +1] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset +1, end_offset +2), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer); + } + } + } + + /* Set selection with X to the first character of the URL, then the rest */ + for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) { + char * at_pos; + int at_offset; + int end_offset; + + at_pos = strchr(templates_delim[j], 'X'); + at_offset = at_pos - templates_delim[j]; + end_offset = at_offset + strlen(urls[i].text); + + strcpy(buffer, "YY"); + buffer[0] = urls[i].text[0]; + + SendMessage(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) templates_delim[j]); + SendMessage(hwndRichEdit, EM_SETSEL, at_offset, at_offset+1); + SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM) buffer); + SendMessage(hwndRichEdit, EM_SETSEL, at_offset+1, at_offset+2); + SendMessage(hwndRichEdit, EM_REPLACESEL, 0, (LPARAM)(urls[i].text + 1)); + SendMessage(hwndRichEdit, WM_GETTEXT, sizeof(buffer), (LPARAM)buffer); + + /* This assumes no templates start with the URL itself, and that they + have at least two characters before the URL text */ + ok(!check_CFE_LINK_selection(hwndRichEdit, 0, 1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", 0, 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -2, at_offset -1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -2, at_offset -1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset -1, at_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset -1, at_offset, buffer); + + if (urls[i].is_url) + { + ok(check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK not set in (%d-%d), text: %s\n", at_offset, at_offset +1, buffer); + ok(check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK not set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + else + { + ok(!check_CFE_LINK_selection(hwndRichEdit, at_offset, at_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", at_offset, at_offset + 1, buffer); + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset -1, end_offset), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset -1, end_offset, buffer); + } + if (buffer[end_offset] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset, end_offset +1), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset, end_offset + 1, buffer); + if (buffer[end_offset +1] != '\0') + { + ok(!check_CFE_LINK_selection(hwndRichEdit, end_offset +1, end_offset +2), + "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer); + } + } + } + + DestroyWindow(hwndRichEdit); + hwndRichEdit = NULL; + } + DestroyWindow(parent); }

1 0

Alex Villacís Lasso : richedit: Add tests for URL autodetection for EM_SETTEXTEX, make them pass under Wine.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 892a0b5f1e2af34e593de0398e7b4a155c8bfc2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=892a0b5f1e2af34e593de0398… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sun May 4 15:20:31 2008 -0500 richedit: Add tests for URL autodetection for EM_SETTEXTEX, make them pass under Wine. --- dlls/riched20/editor.c | 4 + dlls/riched20/tests/editor.c | 187 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 191 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=892a0b5f1e2af34e593de…

1 0

Alex Villacís Lasso : richedit: Fix for the semantics of the flags for some effects reported by EM_GETCHARFORMAT .
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: f213af37955673eac2410d8e6abd563801240c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f213af37955673eac2410d8e6… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sat May 3 23:36:17 2008 -0500 richedit: Fix for the semantics of the flags for some effects reported by EM_GETCHARFORMAT. Remove workaround put in place by a previous patch, due to buggy flag reporting. Tests to verify fixed behavior. --- dlls/riched20/editor.c | 7 --- dlls/riched20/run.c | 14 ++++- dlls/riched20/tests/editor.c | 119 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index fc6e4ea..2860952 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3929,13 +3929,8 @@ BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, int sel_min, int sel_max) /* CFE_LINK effect should be consistently unset */ link.cbSize = sizeof(link); ME_GetCharFormat(editor, beforeURL[0], beforeURL[1], &link); - /* FIXME: Workaround for what looks like a bug - ME_GetCharFormat does not - clear the CFM_LINK flag when selection spans text without CFE_LINK, - followed by CFE_LINK set. This needs a test for EM_GETCHARFORMAT */ -#if 0 if (!(link.dwMask & CFM_LINK) || (link.dwEffects & CFE_LINK)) { -#endif /* CFE_LINK must be unset from this range */ memset(&link, 0, sizeof(CHARFORMAT2W)); link.cbSize = sizeof(link); @@ -3943,9 +3938,7 @@ BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, int sel_min, int sel_max) link.dwEffects = 0; ME_SetCharFormat(editor, beforeURL[0], beforeURL[1] - beforeURL[0], &link); modified = TRUE; -#if 0 } -#endif } if (inURL[0] < inURL[1]) { diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index c49eb16..0af3ba0 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -857,6 +857,16 @@ void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) static void ME_GetRunCharFormat(ME_TextEditor *editor, ME_DisplayItem *run, CHARFORMAT2W *pFmt) { ME_CopyCharFormat(pFmt, &run->member.run.style->fmt); + if ((pFmt->dwMask & CFM_UNDERLINETYPE) && (pFmt->bUnderlineType == CFU_CF1UNDERLINE)) + { + pFmt->dwMask |= CFM_UNDERLINE; + pFmt->dwEffects |= CFE_UNDERLINE; + } + if ((pFmt->dwMask & CFM_UNDERLINETYPE) && (pFmt->bUnderlineType == CFU_UNDERLINENONE)) + { + pFmt->dwMask |= CFM_UNDERLINE; + pFmt->dwEffects &= ~CFE_UNDERLINE; + } } /****************************************************************************** @@ -928,7 +938,7 @@ void ME_GetCharFormat(ME_TextEditor *editor, int nFrom, int nTo, CHARFORMAT2W *p do { /* FIXME add more style feature comparisons */ int nAttribs = CFM_SIZE | CFM_FACE | CFM_COLOR | CFM_UNDERLINETYPE; - int nEffects = CFM_BOLD | CFM_ITALIC; + int nEffects = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_STRIKEOUT | CFM_PROTECTED | CFM_LINK | CFM_SUPERSCRIPT; run = ME_FindItemFwd(run, diRun); @@ -937,7 +947,6 @@ void ME_GetCharFormat(ME_TextEditor *editor, int nFrom, int nTo, CHARFORMAT2W *p ME_GetRunCharFormat(editor, run, &tmp); assert((tmp.dwMask & nAttribs) == nAttribs); - assert((tmp.dwMask & nEffects) == nEffects); /* reset flags that differ */ if (pFmt->yHeight != tmp.yHeight) @@ -964,6 +973,7 @@ void ME_GetCharFormat(ME_TextEditor *editor, int nFrom, int nTo, CHARFORMAT2W *p } pFmt->dwMask &= ~((pFmt->dwEffects ^ tmp.dwEffects) & nEffects); + pFmt->dwEffects = tmp.dwEffects; } while(run != run_end); } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 05824bb..e57b5a9 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -402,6 +402,18 @@ static void test_EM_SETCHARFORMAT(void) HWND hwndRichEdit = new_richedit(NULL); CHARFORMAT2 cf2; int rc = 0; + int tested_effects[] = { + CFE_BOLD, + CFE_ITALIC, + CFE_UNDERLINE, + CFE_STRIKEOUT, + CFE_PROTECTED, + CFE_LINK, + CFE_SUBSCRIPT, + CFE_SUPERSCRIPT, + 0 + }; + int i; /* Invalid flags, CHARFORMAT2 structure blanked out */ memset(&cf2, 0, sizeof(cf2)); @@ -520,6 +532,113 @@ static void test_EM_SETCHARFORMAT(void) ok(rc == -1, "Text not marked as modified, expected modified! (%d)\n", rc); DestroyWindow(hwndRichEdit); + + /* EM_GETCHARFORMAT tests */ + for (i = 0; tested_effects[i]; i++) + { + hwndRichEdit = new_richedit(NULL); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + cf2.dwMask = tested_effects[i]; + if (cf2.dwMask == CFE_SUBSCRIPT || cf2.dwMask == CFE_SUPERSCRIPT) + cf2.dwMask = CFM_SUPERSCRIPT; + cf2.dwEffects = tested_effects[i]; + SendMessage(hwndRichEdit, EM_SETSEL, 0, 2); + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 0, 2); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + ok ((((tested_effects[i] == CFE_SUBSCRIPT || tested_effects[i] == CFE_SUPERSCRIPT) && + (cf2.dwMask & CFM_SUPERSCRIPT) == CFM_SUPERSCRIPT) + || + (cf2.dwMask & tested_effects[i]) == tested_effects[i]), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, tested_effects[i]); + ok((cf2.dwEffects & tested_effects[i]) == tested_effects[i], + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x\n", i, cf2.dwEffects, tested_effects[i]); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 2, 4); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + ok ((((tested_effects[i] == CFE_SUBSCRIPT || tested_effects[i] == CFE_SUPERSCRIPT) && + (cf2.dwMask & CFM_SUPERSCRIPT) == CFM_SUPERSCRIPT) + || + (cf2.dwMask & tested_effects[i]) == tested_effects[i]), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, tested_effects[i]); + ok((cf2.dwEffects & tested_effects[i]) == 0, + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x clear\n", i, cf2.dwEffects, tested_effects[i]); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 1, 3); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + ok ((((tested_effects[i] == CFE_SUBSCRIPT || tested_effects[i] == CFE_SUPERSCRIPT) && + (cf2.dwMask & CFM_SUPERSCRIPT) == 0) + || + (cf2.dwMask & tested_effects[i]) == 0), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x clear\n", i, cf2.dwMask, tested_effects[i]); + ok((cf2.dwEffects & tested_effects[i]) == 0, + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x clear\n", i, cf2.dwEffects, tested_effects[i]); + + DestroyWindow(hwndRichEdit); + } + + for (i = 0; tested_effects[i]; i++) + { + hwndRichEdit = new_richedit(NULL); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + cf2.dwMask = tested_effects[i]; + if (cf2.dwMask == CFE_SUBSCRIPT || cf2.dwMask == CFE_SUPERSCRIPT) + cf2.dwMask = CFM_SUPERSCRIPT; + cf2.dwEffects = tested_effects[i]; + SendMessage(hwndRichEdit, EM_SETSEL, 2, 4); + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 0, 2); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + ok ((((tested_effects[i] == CFE_SUBSCRIPT || tested_effects[i] == CFE_SUPERSCRIPT) && + (cf2.dwMask & CFM_SUPERSCRIPT) == CFM_SUPERSCRIPT) + || + (cf2.dwMask & tested_effects[i]) == tested_effects[i]), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, tested_effects[i]); + ok((cf2.dwEffects & tested_effects[i]) == 0, + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x clear\n", i, cf2.dwEffects, tested_effects[i]); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 2, 4); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + ok ((((tested_effects[i] == CFE_SUBSCRIPT || tested_effects[i] == CFE_SUPERSCRIPT) && + (cf2.dwMask & CFM_SUPERSCRIPT) == CFM_SUPERSCRIPT) + || + (cf2.dwMask & tested_effects[i]) == tested_effects[i]), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x\n", i, cf2.dwMask, tested_effects[i]); + ok((cf2.dwEffects & tested_effects[i]) == tested_effects[i], + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x\n", i, cf2.dwEffects, tested_effects[i]); + + memset(&cf2, 0, sizeof(CHARFORMAT2)); + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_SETSEL, 1, 3); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + ok ((((tested_effects[i] == CFE_SUBSCRIPT || tested_effects[i] == CFE_SUPERSCRIPT) && + (cf2.dwMask & CFM_SUPERSCRIPT) == 0) + || + (cf2.dwMask & tested_effects[i]) == 0), + "%d, cf2.dwMask == 0x%08x expected mask 0x%08x clear\n", i, cf2.dwMask, tested_effects[i]); + ok((cf2.dwEffects & tested_effects[i]) == tested_effects[i], + "%d, cf2.dwEffects == 0x%08x expected effect 0x%08x set\n", i, cf2.dwEffects, tested_effects[i]); + + DestroyWindow(hwndRichEdit); + } } static void test_EM_SETTEXTMODE(void)

1 0

Alex Villacís Lasso : richedit: Add more tests for URL autodetection on WM_CHAR, make them pass under Wine .
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 4a5d1000978ee8e976bee7e93c5ece8114cf7233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5d1000978ee8e976bee7e93… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Jun 18 11:05:52 2008 -0500 richedit: Add more tests for URL autodetection on WM_CHAR, make them pass under Wine. --- dlls/riched20/editor.c | 147 +++++++++++++++++++++++++++++++++++---- dlls/riched20/editor.h | 2 + dlls/riched20/tests/editor.c | 157 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 290 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a5d1000978ee8e976bee…

1 0

Alex Villacís Lasso : richedit: WM_SETTEXT must immediately autodetect URLs, without waiting for a WM_CHAR .
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 38d7ba6eff6757b83b54b0485b3452a41de25470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d7ba6eff6757b83b54b0485… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Jun 18 10:54:17 2008 -0500 richedit: WM_SETTEXT must immediately autodetect URLs, without waiting for a WM_CHAR. --- dlls/riched20/editor.c | 178 +++++++++++++++++++++++++++++++- dlls/riched20/editor.h | 3 + dlls/riched20/tests/editor.c | 239 ++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 410 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38d7ba6eff6757b83b54b…

1 0

Alex Villacís Lasso : richedit: Fix misreporting of match offset for EM_FINDTEXT and EM_FINDTEXTEX.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 60c42bd3dbf2ff39954c3aaaaebfafe0f959bad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c42bd3dbf2ff39954c3aaaa… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Apr 30 21:25:20 2008 -0500 richedit: Fix misreporting of match offset for EM_FINDTEXT and EM_FINDTEXTEX. --- dlls/riched20/editor.c | 2 +- dlls/riched20/tests/editor.c | 40 ++++++++++++++++++++++++++++++++++------ 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1ae0e23..f72f243 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1366,7 +1366,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH break; } - nStart += para->member.para.nCharOfs + pCurItem->member.run.nCharOfs; + nStart += para->member.para.nCharOfs + item->member.run.nCharOfs; if (chrgText) { chrgText->cpMin = nStart; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1d64580..a1d1127 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -141,14 +141,16 @@ static void check_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *f, int ft.lpstrText = f->needle; findloc = SendMessage(hwnd, EM_FINDTEXT, f->flags, (LPARAM) &ft); ok(findloc == f->expected_loc, - "EM_FINDTEXT(%s,%d) '%s' in range(%d,%d), flags %08x, got start at %d\n", - name, id, f->needle, f->start, f->end, f->flags, findloc); + "EM_FINDTEXT(%s,%d) '%s' in range(%d,%d), flags %08x, got start at %d, expected %d\n", + name, id, f->needle, f->start, f->end, f->flags, findloc, f->expected_loc); } static void check_EM_FINDTEXTEX(HWND hwnd, const char *name, struct find_s *f, int id) { int findloc; FINDTEXTEX ft; + int expected_end_loc; + memset(&ft, 0, sizeof(ft)); ft.chrg.cpMin = f->start; ft.chrg.cpMax = f->end; @@ -160,10 +162,11 @@ static void check_EM_FINDTEXTEX(HWND hwnd, const char *name, struct find_s *f, ok(ft.chrgText.cpMin == f->expected_loc, "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n", name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMin); - ok(ft.chrgText.cpMax == ((f->expected_loc == -1) ? -1 - : f->expected_loc + strlen(f->needle)), - "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, end at %d\n", - name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMax); + expected_end_loc = ((f->expected_loc == -1) ? -1 + : f->expected_loc + strlen(f->needle)); + ok(ft.chrgText.cpMax == expected_end_loc, + "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, end at %d, expected %d\n", + name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMax, expected_end_loc); } static void run_tests_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *find, @@ -187,6 +190,7 @@ static void run_tests_EM_FINDTEXT(HWND hwnd, const char *name, struct find_s *fi static void test_EM_FINDTEXT(void) { HWND hwndRichEdit = new_richedit(NULL); + CHARFORMAT2 cf2; /* Empty rich edit control */ run_tests_EM_FINDTEXT(hwndRichEdit, "1", find_tests, @@ -198,6 +202,30 @@ static void test_EM_FINDTEXT(void) run_tests_EM_FINDTEXT(hwndRichEdit, "2", find_tests2, sizeof(find_tests2)/sizeof(struct find_s)); + /* Setting a format on an arbitrary range should have no effect in search + results. This tests correct offset reporting across runs. */ + cf2.cbSize = sizeof(CHARFORMAT2); + SendMessage(hwndRichEdit, EM_GETCHARFORMAT, (WPARAM) SCF_DEFAULT, + (LPARAM) &cf2); + cf2.dwMask = CFM_ITALIC | cf2.dwMask; + cf2.dwEffects = CFE_ITALIC ^ cf2.dwEffects; + SendMessage(hwndRichEdit, EM_SETSEL, 6, 20); + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + /* Haystack text, again */ + run_tests_EM_FINDTEXT(hwndRichEdit, "2-bis", find_tests2, + sizeof(find_tests2)/sizeof(struct find_s)); + + /* Yet another range */ + cf2.dwMask = CFM_BOLD | cf2.dwMask; + cf2.dwEffects = CFE_BOLD ^ cf2.dwEffects; + SendMessage(hwndRichEdit, EM_SETSEL, 11, 15); + SendMessage(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf2); + + /* Haystack text, again */ + run_tests_EM_FINDTEXT(hwndRichEdit, "2-bisbis", find_tests2, + sizeof(find_tests2)/sizeof(struct find_s)); + DestroyWindow(hwndRichEdit); }

1 0

Vladimir Pankratov : regedit: Update Russian translation.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 56c1ea6af415e76bfe562f796543c7dce87503bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c1ea6af415e76bfe562f796… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jun 19 11:26:03 2008 +0500 regedit: Update Russian translation. --- programs/regedit/Ru.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/Ru.rc b/programs/regedit/Ru.rc index 0e9b6e6..743d8ec 100644 --- a/programs/regedit/Ru.rc +++ b/programs/regedit/Ru.rc @@ -285,7 +285,7 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "��" + IDS_ERROR "��" IDS_BAD_KEY "�� '%s'" IDS_BAD_VALUE "�� '%s'" IDS_UNSUPPORTED_TYPE "�� (%ld) �� "

1 0

Paul Vriens : oleaut32/tests: Remove some stray spaces from the ok message.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 698d1111d6f22ef46fd29b21f57f99fdb484e30f URL: http://source.winehq.org/git/wine.git/?a=commit;h=698d1111d6f22ef46fd29b21f… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jun 19 10:52:48 2008 +0200 oleaut32/tests: Remove some stray spaces from the ok message. --- dlls/oleaut32/tests/safearray.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 2350eb4..53896ef 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -492,7 +492,7 @@ static void test_safearray(void) ok(hres == S_OK, "SAGVT of arra y with vt %d failed with %x\n", vttypes[i].vt, hres); if (vttypes[i].vt == VT_DISPATCH) { /* Special case. Checked against Windows. */ - ok(vt == VT_UNKNOWN, "SAGVT of a rray with VT_DISPATCH returned not VT_UNKNOWN, but %d\n", vt); + ok(vt == VT_UNKNOWN, "SAGVT of array with VT_DISPATCH returned not VT_UNKNOWN, but %d\n", vt); } else { ok(vt == vttypes[i].vt, "SAGVT of array with vt %d returned %d\n", vttypes[i].vt, vt); }

1 0

Paul Vriens : setupapi/tests: Fix some typos.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 5f2de1f61f1b3677fb4f826b10102c5d57f226ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2de1f61f1b3677fb4f826b1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jun 19 10:45:02 2008 +0200 setupapi/tests: Fix some typos. --- dlls/setupapi/tests/devinst.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 7c0c182..481eaa4 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -987,14 +987,14 @@ static void testDevRegKey(void) todo_wine ok(key == INVALID_HANDLE_VALUE && GetLastError() == ERROR_KEY_DOES_NOT_EXIST, - "Expected ERROR_KEY_DOES_NOT_EXIST_EXIST, got %08x\n", GetLastError()); + "Expected ERROR_KEY_DOES_NOT_EXIST, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); key = pSetupDiOpenDevRegKey(set, &devInfo, DICS_FLAG_GLOBAL, 0, DIREG_DEV, 0); todo_wine ok(key == INVALID_HANDLE_VALUE && GetLastError() == ERROR_KEY_DOES_NOT_EXIST, - "Expected ERROR_KEY_DOES_NOT_EXIST_EXIST, got %08x\n", GetLastError()); + "Expected ERROR_KEY_DOES_NOT_EXIST, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); /* The class key shouldn't be there */ res = RegOpenKeyW(HKEY_LOCAL_MACHINE, classKey, &key);

1 0