July 2010 - Wine-Commits - list.winehq.org

Thomas Mullaly : urlmon/tests: Added some more test URIs.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: b5c89b6de37696923ba5d8f47d5ac75310e2846d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c89b6de37696923ba5d8f47… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jul 12 18:22:23 2010 -0400 urlmon/tests: Added some more test URIs. --- dlls/urlmon/tests/uri.c | 80 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 73 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 04f7213..e17c50a 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -65,6 +65,7 @@ typedef struct _uri_str_property { const char* value; HRESULT expected; BOOL todo; + const char* broken_value; } uri_str_property; typedef struct _uri_dword_property { @@ -1867,6 +1868,64 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_UNKNOWN,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + /* Port is just copied over. */ + { "http://google.com:00035", Uri_CREATE_NO_CANONICALIZE, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_DOMAIN| + Uri_HAS_HOST|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_PORT|Uri_HAS_SCHEME, + TRUE, + { + {"http://google.com:00035",S_OK,TRUE}, + {"google.com:00035",S_OK,TRUE}, + {"http://google.com:00035",S_OK,TRUE,"http://google.com:35"}, + {"google.com",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"google.com",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"http://google.com:00035",S_OK,FALSE}, + {"http",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_DNS,S_OK,TRUE}, + {35,S_OK,FALSE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + /* Default port is copied over. */ + { "http://google.com:80", Uri_CREATE_NO_CANONICALIZE, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_DOMAIN| + Uri_HAS_HOST|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_PORT|Uri_HAS_SCHEME, + TRUE, + { + {"http://google.com:80",S_OK,TRUE}, + {"google.com:80",S_OK,TRUE}, + {"http://google.com:80",S_OK,TRUE}, + {"google.com",S_OK,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"google.com",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"",S_FALSE,TRUE}, + {"http://google.com:80",S_OK,FALSE}, + {"http",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_DNS,S_OK,TRUE}, + {80,S_OK,FALSE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } }; @@ -2108,7 +2167,8 @@ static void test_IUri_GetPropertyBSTR(void) { hr, prop.expected, i, j); } todo_wine { - ok(!strcmp_aw(prop.value, received), "Expected %s but got %s on uri_tests[%d].str_props[%d].\n", + ok(!strcmp_aw(prop.value, received) || broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), + "Expected %s but got %s on uri_tests[%d].str_props[%d].\n", prop.value, wine_dbgstr_w(received), i, j); } if (hr == E_NOTIMPL) /* no point in continuing */ @@ -2120,7 +2180,8 @@ static void test_IUri_GetPropertyBSTR(void) { } else { ok(hr == prop.expected, "GetPropertyBSTR returned 0x%08x, expected 0x%08x. On uri_tests[%d].str_props[%d].\n", hr, prop.expected, i, j); - ok(!strcmp_aw(prop.value, received), "Expected %s but got %s on uri_tests[%d].str_props[%d].\n", + ok(!strcmp_aw(prop.value, received) || broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), + "Expected %s but got %s on uri_tests[%d].str_props[%d].\n", prop.value, wine_dbgstr_w(received), i, j); } @@ -2339,13 +2400,15 @@ static void test_IUri_GetStrProperties(void) { hr, prop.expected, i); } todo_wine { - ok(!strcmp_aw(prop.value, received), "Error: Expected %s but got %s on uri_test[%d].\n", + ok(!strcmp_aw(prop.value, received) || broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), + "Error: Expected %s but got %s on uri_test[%d].\n", prop.value, wine_dbgstr_w(received), i); } } else { ok(hr == prop.expected, "Error: GetDisplayUri returned 0x%08x, expected 0x%08x on uri_tests[%d].\n", hr, prop.expected, i); - ok(!strcmp_aw(prop.value, received), "Error: Expected %s but got %s on uri_tests[%d].\n", + ok(!strcmp_aw(prop.value, received) || broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), + "Error: Expected %s but got %s on uri_tests[%d].\n", prop.value, wine_dbgstr_w(received), i); } SysFreeString(received); @@ -2780,10 +2843,11 @@ static void test_IUri_GetPropertyLength(void) { DWORD j; for(j = Uri_PROPERTY_STRING_START; j <= Uri_PROPERTY_STRING_LAST; ++j) { - DWORD expectedLen, receivedLen; + DWORD expectedLen, brokenLen, receivedLen; uri_str_property prop = test.str_props[j]; expectedLen = lstrlen(prop.value); + brokenLen = lstrlen(prop.broken_value); /* This won't be necessary once GetPropertyLength is implemented. */ receivedLen = -1; @@ -2795,7 +2859,8 @@ static void test_IUri_GetPropertyLength(void) { hr, prop.expected, i, j); } todo_wine { - ok(receivedLen == expectedLen, "Error: Expected a length of %d but got %d on uri_tests[%d].str_props[%d].\n", + ok(receivedLen == expectedLen || broken(receivedLen == brokenLen), + "Error: Expected a length of %d but got %d on uri_tests[%d].str_props[%d].\n", expectedLen, receivedLen, i, j); } if (hr == E_NOTIMPL) /* no point in continuing */ @@ -2807,7 +2872,8 @@ static void test_IUri_GetPropertyLength(void) { } else { ok(hr == prop.expected, "Error: GetPropertyLength returned 0x%08x, expected 0x%08x on uri_tests[%d].str_props[%d].\n", hr, prop.expected, i, j); - ok(receivedLen == expectedLen, "Error: Expected a length of %d but got %d on uri_tests[%d].str_props[%d].\n", + ok(receivedLen == expectedLen || broken(receivedLen == brokenLen), + "Error: Expected a length of %d but got %d on uri_tests[%d].str_props[%d].\n", expectedLen, receivedLen, i, j); } }

1 0

Dylan Smith : richedit: Avoid redundant calls to ME_CalcRunExtent.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: c0ee555e8f2684317ecf5baddd87cd966d59cbbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ee555e8f2684317ecf5badd… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 29 14:07:50 2010 -0400 richedit: Avoid redundant calls to ME_CalcRunExtent. ME_SplitRun is only called by wrapping code. In all but one call the returned second half of the split run will be returned, get passed back to ME_WrapHandleRun, then ME_CalcRunExtent will be called at the start of ME_WrapHandleRun through ME_WrapSizeRun. --- dlls/riched20/run.c | 1 - dlls/riched20/wrap.c | 3 +++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 09cad59..3682d13 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -273,7 +273,6 @@ ME_DisplayItem *ME_SplitRun(ME_WrapContext *wc, ME_DisplayItem *item, int nVChar run2 = &cursor.pRun->member.run; ME_CalcRunExtent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); - ME_CalcRunExtent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run2); run2->pt.x = run->pt.x+run->nWidth; run2->pt.y = run->pt.y; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index a7c7fd3..2ec67ab 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -361,6 +361,9 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) if (black) { wc->bOverflown = FALSE; pp = ME_SplitRun(wc, p, black); + ME_CalcRunExtent(wc->context, &wc->pPara->member.para, + wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, + &pp->member.run); ME_InsertRowStart(wc, pp); return pp; }

1 0

Dylan Smith : richedit: Use ME_Cursor as parameter to ME_SplitRunSimple.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 8b8e4f89b224fee0a6eb674d4d1aec9c0805e354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8e4f89b224fee0a6eb674d4… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 29 14:07:40 2010 -0400 richedit: Use ME_Cursor as parameter to ME_SplitRunSimple. The paragraph needed to be included in the parameters to avoid needing traverse the linked list of display items to find the paragraph. --- dlls/riched20/caret.c | 6 +-- dlls/riched20/editor.h | 2 +- dlls/riched20/run.c | 81 ++++++++++++++++++++--------------------------- dlls/riched20/table.c | 6 +-- dlls/riched20/undo.c | 2 +- 5 files changed, 41 insertions(+), 56 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 5750db9..536b89a 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -579,10 +579,8 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, } p = &editor->pCursors[nCursor]; - if (p->nOffset) { - ME_SplitRunSimple(editor, p->pRun, p->nOffset); - p = &editor->pCursors[nCursor]; - } + if (p->nOffset) + ME_SplitRunSimple(editor, p); tmp_style = ME_GetInsertStyle(editor, nCursor); /* ME_SplitParagraph increases style refcount */ tp = ME_SplitParagraph(editor, p->pRun, p->pRun->member.run.style, eol_str, 0); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 10a1f2c..f85ec2e 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -137,7 +137,7 @@ int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset); int ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2); void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p); ME_DisplayItem *ME_SplitRun(ME_WrapContext *wc, ME_DisplayItem *item, int nChar); -ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_DisplayItem *item, int nChar); +ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor); void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run); void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Run *run); SIZE ME_GetRunSize(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index cd282ec..09cad59 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -251,9 +251,9 @@ void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) ME_DisplayItem *ME_SplitRun(ME_WrapContext *wc, ME_DisplayItem *item, int nVChar) { ME_TextEditor *editor = wc->context->editor; - ME_DisplayItem *item2 = NULL; ME_Run *run, *run2; - ME_Paragraph *para = &ME_GetParagraph(item)->member.para; + ME_Paragraph *para = &wc->pPara->member.para; + ME_Cursor cursor = {wc->pPara, item, nVChar}; assert(item->member.run.nCharOfs != -1); if(TRACE_ON(richedit)) @@ -268,9 +268,9 @@ ME_DisplayItem *ME_SplitRun(ME_WrapContext *wc, ME_DisplayItem *item, int nVChar TRACE("Before split: %s(%d, %d)\n", debugstr_w(run->strText->szData), run->pt.x, run->pt.y); - item2 = ME_SplitRunSimple(editor, item, nVChar); + ME_SplitRunSimple(editor, &cursor); - run2 = &item2->member.run; + run2 = &cursor.pRun->member.run; ME_CalcRunExtent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); ME_CalcRunExtent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run2); @@ -288,46 +288,45 @@ ME_DisplayItem *ME_SplitRun(ME_WrapContext *wc, ME_DisplayItem *item, int nVChar debugstr_w(run2->strText->szData), run2->pt.x, run2->pt.y); } - return item2; + return cursor.pRun; } /****************************************************************************** * ME_SplitRunSimple - * + * * Does the most basic job of splitting a run into two - it does not - * update the positions and extents. - */ -ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_DisplayItem *item, int nVChar) + * update the positions and extents. + */ +ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) { - ME_Run *run = &item->member.run; - ME_DisplayItem *item2; - ME_Run *run2; + ME_DisplayItem *run = cursor->pRun; + ME_DisplayItem *new_run; int i; - assert(nVChar > 0 && nVChar < run->strText->nLen); - assert(item->type == diRun); - assert(!(item->member.run.nFlags & MERF_NONTEXT)); - assert(item->member.run.nCharOfs != -1); + int nOffset = cursor->nOffset; - item2 = ME_MakeRun(run->style, - ME_VSplitString(run->strText, nVChar), run->nFlags&MERF_SPLITMASK); + assert(!(run->member.run.nFlags & MERF_NONTEXT)); - item2->member.run.nCharOfs = item->member.run.nCharOfs + nVChar; + new_run = ME_MakeRun(run->member.run.style, + ME_VSplitString(run->member.run.strText, nOffset), + run->member.run.nFlags & MERF_SPLITMASK); - run2 = &item2->member.run; - ME_InsertBefore(item->next, item2); + new_run->member.run.nCharOfs = run->member.run.nCharOfs + nOffset; + cursor->pRun = new_run; + cursor->nOffset = 0; - ME_UpdateRunFlags(editor, run); - ME_UpdateRunFlags(editor, run2); - for (i=0; i<editor->nCursors; i++) { - if (editor->pCursors[i].pRun == item && - editor->pCursors[i].nOffset >= nVChar) { - assert(item2->type == diRun); - editor->pCursors[i].pRun = item2; - editor->pCursors[i].nOffset -= nVChar; + ME_InsertBefore(run->next, new_run); + + ME_UpdateRunFlags(editor, &run->member.run); + ME_UpdateRunFlags(editor, &new_run->member.run); + for (i = 0; i < editor->nCursors; i++) { + if (editor->pCursors[i].pRun == run && + editor->pCursors[i].nOffset >= nOffset) { + editor->pCursors[i].pRun = new_run; + editor->pCursors[i].nOffset -= nOffset; } } - ME_GetParagraph(item)->member.para.nFlags |= MEPF_REWRAP; - return item2; + cursor->pPara->member.para.nFlags |= MEPF_REWRAP; + return run; } /****************************************************************************** @@ -361,12 +360,8 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, ME_DisplayItem *pDI; ME_UndoItem *pUI; - if (cursor->nOffset) { - /* We're inserting at the middle of the existing run, which means that - * that run must be split. It isn't always necessary, but */ - cursor->pRun = ME_SplitRunSimple(editor, cursor->pRun, cursor->nOffset); - cursor->nOffset = 0; - } + if (cursor->nOffset) + ME_SplitRunSimple(editor, cursor); pUI = ME_AddUndoItem(editor, diUndoDeleteRun, NULL); if (pUI) { @@ -756,10 +751,8 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C { /* SplitRunSimple may or may not update the cursors, depending on whether they * are selection cursors, but we need to make sure they are valid. */ - ME_DisplayItem *split_run = start->pRun; int split_offset = start->nOffset; - start->pRun = ME_SplitRunSimple(editor, split_run, split_offset); - start->nOffset = 0; + ME_DisplayItem *split_run = ME_SplitRunSimple(editor, start); if (end && end->pRun == split_run) { end->pRun = start->pRun; @@ -768,12 +761,8 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C } if (end && end->nOffset) - { - end_run = end->pRun = ME_SplitRunSimple(editor, end->pRun, end->nOffset); - end->nOffset = 0; - } else if (end) { - end_run = end->pRun; - } + ME_SplitRunSimple(editor, end); + end_run = end ? end->pRun : NULL; run = start->pRun; para = start->pPara; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index cbfa2b3..f184ff0 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -64,10 +64,8 @@ static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); ME_DisplayItem *tp; ME_Cursor* cursor = &editor->pCursors[nCursor]; - if (cursor->nOffset) { - ME_SplitRunSimple(editor, cursor->pRun, cursor->nOffset); - cursor = &editor->pCursors[nCursor]; - } + if (cursor->nOffset) + ME_SplitRunSimple(editor, cursor); tp = ME_SplitParagraph(editor, cursor->pRun, pStyle, eol_str, paraFlags); ME_ReleaseStyle(pStyle); diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index be7f0e1..9f43f0a 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -336,7 +336,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, ME_DisplayItem *pItem) int paraFlags = pItem->member.para.nFlags & (MEPF_ROWSTART|MEPF_CELL|MEPF_ROWEND); ME_CursorFromCharOfs(editor, pUItem->nStart, &tmp); if (tmp.nOffset) - tmp.pRun = ME_SplitRunSimple(editor, tmp.pRun, tmp.nOffset); + ME_SplitRunSimple(editor, &tmp); assert(pUItem->eol_str); this_para = tmp.pPara; bFixRowStart = this_para->member.para.nFlags & MEPF_ROWSTART;

1 0

Dylan Smith : richedit: Return correct values when EM_SETTEXTMODE fails.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 75eef418817912bf34a94f13e7195ce3bf02373d URL: http://source.winehq.org/git/wine.git/?a=commit;h=75eef418817912bf34a94f13e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 29 14:02:32 2010 -0400 richedit: Return correct values when EM_SETTEXTMODE fails. The checks for the text length and invalid parameters needed to be swapped, and the code could be easily simplified. --- dlls/riched20/editor.c | 38 ++++++++++++++------------------------ dlls/riched20/tests/editor.c | 8 +++++++- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 0ed1959..a6ca2b8 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4316,35 +4316,25 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return editor->mode; case EM_SETTEXTMODE: { - LRESULT ret; int mask = 0; int changes = 0; - GETTEXTLENGTHEX how; - /* CR/LF conversion required in 2.0 mode, verbatim in 1.0 mode */ - how.flags = GTL_CLOSE | (editor->bEmulateVersion10 ? 0 : GTL_USECRLF) | GTL_NUMCHARS; - how.codepage = unicode ? 1200 : CP_ACP; - ret = ME_GetTextLengthEx(editor, &how); - if (!ret) + if (ME_GetTextLength(editor)) + return E_UNEXPECTED; + + /* Check for mutually exclusive flags in adjacent bits of wParam */ + if ((wParam & (TM_RICHTEXT | TM_MULTILEVELUNDO | TM_MULTICODEPAGE)) & + (wParam & (TM_PLAINTEXT | TM_SINGLELEVELUNDO | TM_SINGLECODEPAGE)) << 1) + return E_INVALIDARG; + + if (wParam & (TM_RICHTEXT | TM_PLAINTEXT)) { - /*Check for valid wParam*/ - if ((((wParam & TM_RICHTEXT) && ((wParam & TM_PLAINTEXT) << 1))) || - (((wParam & TM_MULTILEVELUNDO) && ((wParam & TM_SINGLELEVELUNDO) << 1))) || - (((wParam & TM_MULTICODEPAGE) && ((wParam & TM_SINGLECODEPAGE) << 1)))) - return 1; - else - { - if (wParam & (TM_RICHTEXT | TM_PLAINTEXT)) - { - mask |= (TM_RICHTEXT | TM_PLAINTEXT); - changes |= (wParam & (TM_RICHTEXT | TM_PLAINTEXT)); - } - /*FIXME: Currently no support for undo level and code page options*/ - editor->mode = (editor->mode & (~mask)) | changes; - return 0; - } + mask |= TM_RICHTEXT | TM_PLAINTEXT; + changes |= wParam & (TM_RICHTEXT | TM_PLAINTEXT); } - return ret; + /* FIXME: Currently no support for undo level and code page options */ + editor->mode = (editor->mode & ~mask) | changes; + return 0; } case EM_SETPASSWORDCHAR: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 685eead..3422536 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1053,6 +1053,11 @@ static void test_EM_SETTEXTMODE(void) CHARRANGE cr; int rc = 0; + /*Attempt to use mutually exclusive modes*/ + rc = SendMessage(hwndRichEdit, EM_SETTEXTMODE, (WPARAM) TM_PLAINTEXT|TM_RICHTEXT, 0); + ok(rc == E_INVALIDARG, + "EM_SETTEXTMODE: using mutually exclusive mode flags - returned: %x\n", rc); + /*Test that EM_SETTEXTMODE fails if text exists within the control*/ /*Insert text into the control*/ @@ -1060,7 +1065,8 @@ static void test_EM_SETTEXTMODE(void) /*Attempt to change the control to plain text mode*/ rc = SendMessage(hwndRichEdit, EM_SETTEXTMODE, (WPARAM) TM_PLAINTEXT, 0); - ok(rc != 0, "EM_SETTEXTMODE: changed text mode in control containing text - returned: %d\n", rc); + ok(rc == E_UNEXPECTED, + "EM_SETTEXTMODE: changed text mode in control containing text - returned: %x\n", rc); /*Test that EM_SETTEXTMODE does not allow rich edit text to be pasted. If rich text is pasted, it should have the same formatting as the rest

1 0

Dylan Smith : richedit: Don't change text mode with undo or redo stack.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 16d789042657d37734173aa2bff81ff5f8a014b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d789042657d37734173aa2b… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 29 14:02:42 2010 -0400 richedit: Don't change text mode with undo or redo stack. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a6ca2b8..842b159 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4319,7 +4319,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, int mask = 0; int changes = 0; - if (ME_GetTextLength(editor)) + if (ME_GetTextLength(editor) || editor->pUndoStack || editor->pRedoStack) return E_UNEXPECTED; /* Check for mutually exclusive flags in adjacent bits of wParam */

1 0

André Hentschel : msi: Prevent cryptic error.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 428e8a5a01579f8b5190d47d699a9b4f8c21b149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=428e8a5a01579f8b5190d47d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jul 29 19:58:30 2010 +0200 msi: Prevent cryptic error. --- dlls/msi/package.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index d332168..323968c 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1119,7 +1119,10 @@ static UINT copy_package_to_temp( LPCWSTR szPackage, LPWSTR filename ) if( !CopyFileW( szPackage, filename, FALSE ) ) { UINT error = GetLastError(); - ERR("failed to copy package %s to %s (%u)\n", debugstr_w(szPackage), debugstr_w(filename), error); + if ( error == ERROR_FILE_NOT_FOUND ) + ERR("can't find %s\n", debugstr_w(szPackage)); + else + ERR("failed to copy package %s to %s (%u)\n", debugstr_w(szPackage), debugstr_w(filename), error); DeleteFileW( filename ); return error; }

1 0

Dylan Smith : richedit: Remove checks for converting internal CHARFORMAT structs.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 68b44f740c2fa5aee5ed00908ce42acbdc02fe5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b44f740c2fa5aee5ed00908… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 29 14:06:08 2010 -0400 richedit: Remove checks for converting internal CHARFORMAT structs. Prevents extra copying from having to be done for converting between unicode/ascii or between the normal or extended version of the structure. --- dlls/riched20/style.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index bb2f808..605faeb 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -139,21 +139,16 @@ void ME_CopyToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) CopyMemory(to, from, to->cbSize); } -ME_Style *ME_MakeStyle(CHARFORMAT2W *style) { - CHARFORMAT2W styledata; +ME_Style *ME_MakeStyle(CHARFORMAT2W *style) +{ ME_Style *s = ALLOC_OBJ(ME_Style); - - style = ME_ToCF2W(&styledata, style); - memset(s, 0, sizeof(ME_Style)); - if (style->cbSize <= sizeof(CHARFORMAT2W)) - CopyMemory(&s->fmt, style, style->cbSize); - else - s->fmt = *style; - s->fmt.cbSize = sizeof(CHARFORMAT2W); + assert(style->cbSize == sizeof(CHARFORMAT2W)); + s->fmt = *style; s->nSequence = -2; s->nRefs = 1; s->hFont = NULL; + memset(&s->tm, 0, sizeof(s->tm)); s->tm.tmAscent = -1; all_refs++; TRACE_(richedit_style)("ME_MakeStyle %p, total refs=%d\n", s, all_refs); @@ -171,7 +166,7 @@ ME_Style *ME_MakeStyle(CHARFORMAT2W *style) { s->fmt.dwMask |= mask;\ CopyMemory(s->fmt.member, style->member, sizeof(style->member));\ } - + void ME_InitCharFormat2W(CHARFORMAT2W *pFmt) { ZeroMemory(pFmt, sizeof(CHARFORMAT2W)); @@ -180,9 +175,8 @@ void ME_InitCharFormat2W(CHARFORMAT2W *pFmt) ME_Style *ME_ApplyStyle(ME_Style *sSrc, CHARFORMAT2W *style) { - CHARFORMAT2W styledata; ME_Style *s = ME_MakeStyle(&sSrc->fmt); - style = ME_ToCF2W(&styledata, style); + assert(style->cbSize == sizeof(CHARFORMAT2W)); COPY_STYLE_ITEM(CFM_ANIMATION, bAnimation); COPY_STYLE_ITEM(CFM_BACKCOLOR, crBackColor); COPY_STYLE_ITEM(CFM_CHARSET, bCharSet);

1 0

Alexandre Julliard : gdi32: Refresh the DC transforms when the visible rectangle is changed.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: 9dba4840faae7766a73e7ff93370793036080e9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dba4840faae7766a73e7ff93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 30 11:35:33 2010 +0200 gdi32: Refresh the DC transforms when the visible rectangle is changed. --- dlls/gdi32/clipping.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index b71ecf6..b8d9ed5 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -211,6 +211,7 @@ void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ) dc->dirty = 0; dc->vis_rect = *vis_rect; dc->hVisRgn = hrgn; + DC_UpdateXforms( dc ); CLIPPING_UpdateGCRegion( dc ); release_dc_ptr( dc ); }

1 0

Alexandre Julliard : winex11: Fix the positioning of some graphics primitives on mirrored contexts.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: b3dd20706a370df6d69d6dfd97b46b59d9189c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3dd20706a370df6d69d6dfd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 29 17:32:42 2010 +0200 winex11: Fix the positioning of some graphics primitives on mirrored contexts. --- dlls/winex11.drv/graphics.c | 63 ++++++++++++++++++++++++------------------- 1 files changed, 35 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 9cb509a..4c2d266 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -73,6 +73,37 @@ const int X11DRV_XROPfunction[16] = }; +/* get the rectangle in device coordinates, with optional mirroring */ +static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom ) +{ + RECT rect; + + rect.left = left; + rect.top = top; + rect.right = right; + rect.bottom = bottom; + LPtoDP( hdc, (POINT *)&rect, 2 ); + if (GetLayout( hdc ) & LAYOUT_RTL) + { + int tmp = rect.left; + rect.left = rect.right + 1; + rect.right = tmp + 1; + } + if (rect.left > rect.right) + { + int tmp = rect.left; + rect.left = rect.right; + rect.right = tmp; + } + if (rect.top > rect.bottom) + { + int tmp = rect.top; + rect.top = rect.bottom; + rect.bottom = tmp; + } + return rect; +} + /*********************************************************************** * X11DRV_GetRegionData * @@ -483,19 +514,15 @@ X11DRV_DrawArc( X11DRV_PDEVICE *physDev, INT left, INT top, INT right, XPoint points[4]; BOOL update = FALSE; POINT start, end; - RECT rc; + RECT rc = get_device_rect( physDev->hdc, left, top, right, bottom ); - SetRect(&rc, left, top, right, bottom); start.x = xstart; start.y = ystart; end.x = xend; end.y = yend; - LPtoDP(physDev->hdc, (POINT*)&rc, 2); LPtoDP(physDev->hdc, &start, 1); LPtoDP(physDev->hdc, &end, 1); - if (rc.right < rc.left) { INT tmp = rc.right; rc.right = rc.left; rc.left = tmp; } - if (rc.bottom < rc.top) { INT tmp = rc.bottom; rc.bottom = rc.top; rc.top = tmp; } if ((rc.left == rc.right) || (rc.top == rc.bottom) ||(lines && ((rc.right-rc.left==1)||(rc.bottom-rc.top==1)))) return TRUE; @@ -673,16 +700,10 @@ X11DRV_Ellipse( X11DRV_PDEVICE *physDev, INT left, INT top, INT right, INT botto { INT width, oldwidth; BOOL update = FALSE; - RECT rc; - - SetRect(&rc, left, top, right, bottom); - LPtoDP(physDev->hdc, (POINT*)&rc, 2); + RECT rc = get_device_rect( physDev->hdc, left, top, right, bottom ); if ((rc.left == rc.right) || (rc.top == rc.bottom)) return TRUE; - if (rc.right < rc.left) { INT tmp = rc.right; rc.right = rc.left; rc.left = tmp; } - if (rc.bottom < rc.top) { INT tmp = rc.bottom; rc.bottom = rc.top; rc.top = tmp; } - oldwidth = width = physDev->pen.width; if (!width) width = 1; if(physDev->pen.style == PS_NULL) width = 0; @@ -737,18 +758,12 @@ X11DRV_Rectangle(X11DRV_PDEVICE *physDev, INT left, INT top, INT right, INT bott { INT width, oldwidth, oldjoinstyle; BOOL update = FALSE; - RECT rc; + RECT rc = get_device_rect( physDev->hdc, left, top, right, bottom ); TRACE("(%d %d %d %d)\n", left, top, right, bottom); - SetRect(&rc, left, top, right, bottom); - LPtoDP(physDev->hdc, (POINT*)&rc, 2); - if ((rc.left == rc.right) || (rc.top == rc.bottom)) return TRUE; - if (rc.right < rc.left) { INT tmp = rc.right; rc.right = rc.left; rc.left = tmp; } - if (rc.bottom < rc.top) { INT tmp = rc.bottom; rc.bottom = rc.top; rc.top = tmp; } - oldwidth = width = physDev->pen.width; if (!width) width = 1; if(physDev->pen.style == PS_NULL) width = 0; @@ -811,15 +826,12 @@ X11DRV_RoundRect( X11DRV_PDEVICE *physDev, INT left, INT top, INT right, { INT width, oldwidth, oldendcap; BOOL update = FALSE; - RECT rc; POINT pts[2]; + RECT rc = get_device_rect( physDev->hdc, left, top, right, bottom ); TRACE("(%d %d %d %d %d %d\n", left, top, right, bottom, ell_width, ell_height); - SetRect(&rc, left, top, right, bottom); - LPtoDP(physDev->hdc, (POINT*)&rc, 2); - if ((rc.left == rc.right) || (rc.top == rc.bottom)) return TRUE; @@ -832,11 +844,6 @@ X11DRV_RoundRect( X11DRV_PDEVICE *physDev, INT left, INT top, INT right, ell_width = max(abs( pts[1].x - pts[0].x ), 1); ell_height = max(abs( pts[1].y - pts[0].y ), 1); - /* Fix the coordinates */ - - if (rc.right < rc.left) { INT tmp = rc.right; rc.right = rc.left; rc.left = tmp; } - if (rc.bottom < rc.top) { INT tmp = rc.bottom; rc.bottom = rc.top; rc.top = tmp; } - oldwidth = width = physDev->pen.width; oldendcap = physDev->pen.endcap; if (!width) width = 1;

1 0

Dylan Smith : richedit: Check for bits instead of equality in EM_SETCHARFORMAT.
by Alexandre Julliard July 30, 2010

July 30, 2010

Module: wine Branch: master Commit: ad056fe7d785bc41fdab57a642818fed73f6d709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad056fe7d785bc41fdab57a64… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 29 14:05:58 2010 -0400 richedit: Check for bits instead of equality in EM_SETCHARFORMAT. There are unsupported flags documented on MSDN which would cause problems for the equality checks used in EM_SETCHARFORMAT. Also, to handle a combined set of flags they must be checked for in the right order. --- dlls/riched20/editor.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 842b159..48b64c9 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3359,26 +3359,27 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, BOOL bRepaint = TRUE; p = ME_ToCF2W(&buf, (CHARFORMAT2W *)lParam); if (p == NULL) return 0; - if (!wParam) - ME_SetDefaultCharFormat(editor, p); - else if (wParam == (SCF_WORD | SCF_SELECTION)) { - FIXME("EM_SETCHARFORMAT: word selection not supported\n"); - return 0; - } else if (wParam == SCF_ALL) { - if (editor->mode & TM_PLAINTEXT) + if (wParam & SCF_ALL) { + if (editor->mode & TM_PLAINTEXT) { ME_SetDefaultCharFormat(editor, p); - else { + } else { ME_Cursor start; ME_SetCursorToStart(editor, &start); ME_SetCharFormat(editor, &start, NULL, p); editor->nModifyStep = 1; } - } else if (editor->mode & TM_PLAINTEXT) { - return 0; - } else { + } else if (wParam & SCF_SELECTION) { + if (editor->mode & TM_PLAINTEXT) + return 0; + if (wParam & SCF_WORD) { + FIXME("EM_SETCHARFORMAT: word selection not supported\n"); + return 0; + } bRepaint = ME_IsSelection(editor); ME_SetSelectionCharFormat(editor, p); if (bRepaint) editor->nModifyStep = 1; + } else { /* SCF_DEFAULT */ + ME_SetDefaultCharFormat(editor, p); } ME_CommitUndo(editor); if (bRepaint)

1 0