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

Dylan Smith : richedit: Removed redundant code for getting the insert style .
by Alexandre Julliard June 27, 2008

June 27, 2008

Module: wine Branch: master Commit: 461830a83d46f1867a6097e1498eaf10ce0a2680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=461830a83d46f1867a6097e14… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jun 26 16:17:17 2008 -0400 richedit: Removed redundant code for getting the insert style. The function ME_GetInsertStyle already checks for the case where there is a selection, so there is no need to duplicate this code for ME_GetSelectionInsertStyle. --- dlls/riched20/caret.c | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index dcaab0c..9f012be 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1291,19 +1291,7 @@ void ME_DeleteSelection(ME_TextEditor *editor) ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor) { - ME_Style *style; - int from, to; - - ME_GetSelection(editor, &from, &to); - if (from != to) { - ME_Cursor c; - ME_CursorFromCharOfs(editor, from, &c); - style = c.pRun->member.run.style; - ME_AddRefStyle(style); /* ME_GetInsertStyle has already done that */ - } - else - style = ME_GetInsertStyle(editor, 0); - return style; + return ME_GetInsertStyle(editor, 0); } void ME_SendSelChange(ME_TextEditor *editor)

1 0

Nikolay Sivov : gdiplus: Implementation of GdipAddPathPolygon with tests.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 629761acde13283e0dfc6c42cab3e91e11fbbd88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=629761acde13283e0dfc6c42c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jun 26 18:07:04 2008 +0400 gdiplus: Implementation of GdipAddPathPolygon with tests. --- dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/graphicspath.c | 49 +++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/graphicspath.c | 47 +++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + 4 files changed, 100 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 57e0de6..264127d 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -23,8 +23,8 @@ @ stdcall GdipAddPathPath(ptr ptr long) @ stub GdipAddPathPie @ stub GdipAddPathPieI -@ stub GdipAddPathPolygon -@ stub GdipAddPathPolygonI +@ stdcall GdipAddPathPolygon(ptr ptr long) +@ stdcall GdipAddPathPolygonI(ptr ptr long) @ stdcall GdipAddPathRectangle(ptr long long long long) @ stdcall GdipAddPathRectangleI(ptr long long long long) @ stdcall GdipAddPathRectangles(ptr ptr long) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index c474e99..1da6866 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -346,6 +346,55 @@ GpStatus WINGDIPAPI GdipAddPathPath(GpPath *path, GDIPCONST GpPath* addingPath, return Ok; } +GpStatus WINGDIPAPI GdipAddPathPolygon(GpPath *path, GDIPCONST GpPointF *points, INT count) +{ + INT old_count; + + if(!path || !points || count < 3) + return InvalidParameter; + + if(!lengthen_path(path, count)) + return OutOfMemory; + + old_count = path->pathdata.Count; + + memcpy(&path->pathdata.Points[old_count], points, count*sizeof(GpPointF)); + memset(&path->pathdata.Types[old_count + 1], PathPointTypeLine, count - 1); + + /* A polygon is an intrinsic figure */ + path->pathdata.Types[old_count] = PathPointTypeStart; + path->pathdata.Types[old_count + count - 1] |= PathPointTypeCloseSubpath; + path->newfigure = TRUE; + path->pathdata.Count += count; + + return Ok; +} + +GpStatus WINGDIPAPI GdipAddPathPolygonI(GpPath *path, GDIPCONST GpPoint *points, INT count) +{ + GpPointF *ptf; + GpStatus status; + INT i; + + if(!points || count < 3) + return InvalidParameter; + + ptf = GdipAlloc(sizeof(GpPointF) * count); + if(!ptf) + return OutOfMemory; + + for(i = 0; i < count; i++){ + ptf[i].X = (REAL)points[i].X; + ptf[i].Y = (REAL)points[i].Y; + } + + status = GdipAddPathPolygon(path, ptf, count); + + GdipFree(ptf); + + return status; +} + GpStatus WINGDIPAPI GdipClonePath(GpPath* path, GpPath **clone) { if(!path || !clone) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 262a527..9f65898 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -575,6 +575,52 @@ static void test_linei(void) GdipDeletePath(path); } +static path_test_t poly_path[] = { + {5.00, 5.00, PathPointTypeStart, 0, 0}, /*1*/ + {6.00, 8.00, PathPointTypeLine, 0, 0}, /*2*/ + {0.00, 0.00, PathPointTypeStart, 0, 0}, /*3*/ + {10.00, 10.00, PathPointTypeLine, 0, 0}, /*4*/ + {10.00, 20.00, PathPointTypeLine, 0, 0}, /*5*/ + {30.00, 10.00, PathPointTypeLine, 0, 0}, /*6*/ + {20.00, 0.00, PathPointTypeLine | PathPointTypeCloseSubpath, 0, 0}, /*7*/ + }; + +static void test_polygon(void) +{ + GpStatus status; + GpPath *path; + GpPointF points[5]; + + points[0].X = 0.0; + points[0].Y = 0.0; + points[1].X = 10.0; + points[1].Y = 10.0; + points[2].X = 10.0; + points[2].Y = 20.0; + points[3].X = 30.0; + points[3].Y = 10.0; + points[4].X = 20.0; + points[4].Y = 0.0; + + /* NULL args */ + status = GdipAddPathPolygon(NULL, points, 5); + expect(InvalidParameter, status); + status = GdipAddPathPolygon(path, NULL, 5); + expect(InvalidParameter, status); + /* Polygon should have 3 points at least */ + status = GdipAddPathPolygon(path, points, 2); + expect(InvalidParameter, status); + + GdipCreatePath(FillModeAlternate, &path); + /* to test how it prolongs not empty path */ + status = GdipAddPathLine(path, 5.0, 5.0, 6.0, 8.0); + expect(Ok, status); + status = GdipAddPathPolygon(path, points, 5); + expect(Ok, status); + /* check resulting path */ + ok_path(path, poly_path, sizeof(poly_path)/sizeof(path_test_t), FALSE); +} + static path_test_t rect_path[] = { {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ {105.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ @@ -643,6 +689,7 @@ START_TEST(graphicspath) test_ellipse(); test_linei(); test_rect(); + test_polygon(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c20efdc..3891f0f 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -215,6 +215,8 @@ GpStatus WINGDIPAPI GdipAddPathLine2(GpPath*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipAddPathLine2I(GpPath*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipAddPathLineI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathPath(GpPath*,GDIPCONST GpPath*,BOOL); +GpStatus WINGDIPAPI GdipAddPathPolygon(GpPath*,GDIPCONST GpPointF*,INT); +GpStatus WINGDIPAPI GdipAddPathPolygonI(GpPath*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathRectangleI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathRectangles(GpPath*,GDIPCONST GpRectF*,INT);

1 0

Jon Griffiths : c2man: Correct extension for non-dlls ( based on a patch by Vijay Kamuju).
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 3ef22e56f25e83555dc5762409a0a97fc863fe92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef22e56f25e83555dc576240… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Tue Jun 24 13:54:59 2008 -0700 c2man: Correct extension for non-dlls (based on a patch by Vijay Kamuju). --- tools/c2man.pl | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index dfd1877..30c2186 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -90,14 +90,15 @@ sub process_extra_comment($); sub process_spec_file($) { my $spec_name = shift; - my $dll_name = $spec_name; - $dll_name =~ s/\..*//; # Strip the file extension + my ($dll_name, $dll_ext) = split(/\./, $spec_name); + $dll_ext = "dll" if ( $dll_ext eq "spec" ); my $uc_dll_name = uc $dll_name; my $spec_details = { NAME => $spec_name, DLL_NAME => $dll_name, + DLL_EXT => $dll_ext, NUM_EXPORTS => 0, NUM_STUBS => 0, NUM_FUNCS => 0, @@ -227,6 +228,7 @@ sub process_source_file($) COMMENT_NAME => "", ALT_NAME => "", DLL_NAME => "", + DLL_EXT => "", ORDINAL => "", RETURNS => "", PROTOTYPE => [], @@ -1095,7 +1097,7 @@ sub output_spec($) my $comment = { FILE => $spec_details->{DLL_NAME}, - COMMENT_NAME => $spec_details->{DLL_NAME}.".dll", + COMMENT_NAME => $spec_details->{DLL_NAME}.".".$spec_details->{DLL_EXT}, ALT_NAME => $spec_details->{DLL_NAME}, DLL_NAME => "", ORDINAL => "",

1 0

Dylan Smith : richedit: Implemented undo coalescing to group typing events.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: d1f1346f5495ab53502702fc048ada39c8de74bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f1346f5495ab53502702fc0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 25 10:29:19 2008 -0400 richedit: Implemented undo coalescing to group typing events. Consecutively typed characters are grouped together to be undone together. The grouping of typed characters can be stopped by certain events that are mentioned in MSDN's remarks on the EM_STOPGROUPTYPING message, which is also implemented by this patch. --- dlls/riched20/editor.c | 37 ++++++++++--- dlls/riched20/editor.h | 6 ++- dlls/riched20/editstr.h | 3 +- dlls/riched20/list.c | 1 + dlls/riched20/tests/editor.c | 30 +++++----- dlls/riched20/undo.c | 118 ++++++++++++++++++++++++++++++++++++++--- 6 files changed, 159 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1f1346f5495ab5350270…

1 0

Dylan Smith : richedit: Make cursor visible when selecting via mouse above/ below editor.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 9b67a38f1a514c9f20d0c99ad2b721abd2c37e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b67a38f1a514c9f20d0c99ad… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 25 11:51:17 2008 -0400 richedit: Make cursor visible when selecting via mouse above/below editor. --- dlls/riched20/caret.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 5ed2329..dcaab0c 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -966,6 +966,7 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) ME_InvalidateSelection(editor); ShowCaret(editor->hWnd); ME_SendSelChange(editor); + SendMessageW(editor->hWnd, EM_SCROLLCARET, 0, 0); } static ME_DisplayItem *ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow,

1 0

Dylan Smith : richedit: Fixed bug preventing bold from being set with EM_SETCHARFORMAT.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: cb1d7becf9057e87b736f4590b89b27409f86ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1d7becf9057e87b736f4590… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 25 11:47:37 2008 -0400 richedit: Fixed bug preventing bold from being set with EM_SETCHARFORMAT. Previously bold needed to be set by setting CFM_WEIGHT in the CHARFORMAT2 structure, and then setting the appropriate wWeight value. This approach isn't even supported in version 3.0 of the richedit control. Now bold can be set/unset properly for Windows or Wine using CFE_BOLD in dwEffects and with CFM_BOLD set in the dwMask flag. --- dlls/riched20/style.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index b483be0..66e45f5 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -221,6 +221,15 @@ ME_Style *ME_ApplyStyle(ME_Style *sSrc, CHARFORMAT2W *style) s->fmt.bUnderlineType = (style->dwEffects & CFM_UNDERLINE) ? CFU_CF1UNDERLINE : CFU_UNDERLINENONE; } + if (style->dwMask & CFM_BOLD && !(style->dwMask & CFM_WEIGHT)) + { + s->fmt.wWeight = (style->dwEffects & CFE_BOLD) ? FW_BOLD : FW_NORMAL; + } else if (style->dwMask & CFM_WEIGHT && !(style->dwMask & CFM_BOLD)) { + if (style->wWeight > FW_NORMAL) + s->fmt.dwEffects |= CFE_BOLD; + else + s->fmt.dwEffects &= ~CFE_BOLD; + } return s; }

1 0

Dylan Smith : richedit: Corrected the conversion used for the initial font size.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 60757ca6d5ceb79a5599ca5be0c17225d9a86555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60757ca6d5ceb79a5599ca5be… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 25 11:40:39 2008 -0400 richedit: Corrected the conversion used for the initial font size. The LOGFONT's lfHeight member is in logical units, and is being used to set the yHeight member of CHARFORMAT2 which is supposed to be in twips. --- dlls/riched20/para.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index d6a06d3..de69794 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -52,7 +52,8 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) cf.dwEffects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; lstrcpyW(cf.szFaceName, lf.lfFaceName); - cf.yHeight = ME_twips2pointsY(&c, lf.lfHeight); + /* Convert system font height from logical units to twips for cf.yHeight */ + cf.yHeight = (lf.lfHeight * 72 * 1440) / (c.dpi.cy * c.dpi.cy); if (lf.lfWeight > FW_NORMAL) cf.dwEffects |= CFE_BOLD; cf.wWeight = lf.lfWeight; if (lf.lfItalic) cf.dwEffects |= CFE_ITALIC;

1 0

Dylan Smith : richedit: Moved function declarations in header to reflect locations of definitions.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: c96a273f91bbdd4ba4810aec738097022f9207d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c96a273f91bbdd4ba4810aec7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 25 11:33:40 2008 -0400 richedit: Moved function declarations in header to reflect locations of definitions. --- dlls/riched20/editor.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 61ecf1b..0a8af53 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -214,8 +214,6 @@ void ME_DestroyContext(ME_Context *c, HWND release); BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor); void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor); void ME_SendRequestResize(ME_TextEditor *editor, BOOL force); -int ME_twips2pointsX(ME_Context *c, int x); -int ME_twips2pointsY(ME_Context *c, int y); /* para.c */ ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *run); @@ -244,6 +242,8 @@ void ME_EnsureVisible(ME_TextEditor *editor, ME_DisplayItem *pRun); void ME_InvalidateSelection(ME_TextEditor *editor); void ME_QueueInvalidateFromCursor(ME_TextEditor *editor, int nCursor); BOOL ME_SetZoom(ME_TextEditor *editor, int numerator, int denominator); +int ME_twips2pointsX(ME_Context *c, int x); +int ME_twips2pointsY(ME_Context *c, int y); /* scroll functions in paint.c */

1 0

Dylan Smith : richedit: Added tests reveal a problem with EM_SETCHARFORMAT' s affect on the undo stack.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 903423286c9be1900dab08fc5f488f60b69bcf47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=903423286c9be1900dab08fc5… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 25 11:33:32 2008 -0400 richedit: Added tests reveal a problem with EM_SETCHARFORMAT's affect on the undo stack. --- dlls/riched20/run.c | 1 + dlls/riched20/tests/editor.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 805975c..a64c9f5 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -834,6 +834,7 @@ void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) ME_Style *style; ME_UndoItem *undo; + /* FIXME: Should this be removed? It breaks a test. */ assert(mod->cbSize == sizeof(CHARFORMAT2W)); undo = ME_AddUndoItem(editor, diUndoSetDefaultCharFormat, NULL); if (undo) { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 409c600..318cece 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -569,6 +569,9 @@ static void test_EM_SETCHARFORMAT(void) rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) 0xfffffff0, (LPARAM) &cf2); ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); + rc = SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0); + ok(rc == FALSE, "Should not be able to undo here.\n"); + SendMessage(hwndRichEdit, EM_EMPTYUNDOBUFFER, 0, 0); /* A valid flag, CHARFORMAT2 structure minimally filled */ memset(&cf2, 0, sizeof(cf2)); @@ -576,6 +579,9 @@ static void test_EM_SETCHARFORMAT(void) rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_DEFAULT, (LPARAM) &cf2); ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); + rc = SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0); + todo_wine ok(rc == FALSE, "Should not be able to undo here.\n"); + SendMessage(hwndRichEdit, EM_EMPTYUNDOBUFFER, 0, 0); /* A valid flag, CHARFORMAT2 structure minimally filled */ memset(&cf2, 0, sizeof(cf2)); @@ -583,6 +589,9 @@ static void test_EM_SETCHARFORMAT(void) rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_SELECTION, (LPARAM) &cf2); ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); + rc = SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0); + ok(rc == FALSE, "Should not be able to undo here.\n"); + SendMessage(hwndRichEdit, EM_EMPTYUNDOBUFFER, 0, 0); /* A valid flag, CHARFORMAT2 structure minimally filled */ memset(&cf2, 0, sizeof(cf2)); @@ -590,6 +599,9 @@ static void test_EM_SETCHARFORMAT(void) rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_WORD, (LPARAM) &cf2); ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); + rc = SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0); + todo_wine ok(rc == TRUE, "Should not be able to undo here.\n"); + SendMessage(hwndRichEdit, EM_EMPTYUNDOBUFFER, 0, 0); /* A valid flag, CHARFORMAT2 structure minimally filled */ memset(&cf2, 0, sizeof(cf2)); @@ -597,6 +609,9 @@ static void test_EM_SETCHARFORMAT(void) rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); + rc = SendMessage(hwndRichEdit, EM_CANUNDO, 0, 0); + todo_wine ok(rc == TRUE, "Should not be able to undo here.\n"); + SendMessage(hwndRichEdit, EM_EMPTYUNDOBUFFER, 0, 0); cf2.cbSize = sizeof(CHARFORMAT2); SendMessage(hwndRichEdit, EM_GETCHARFORMAT, (WPARAM) SCF_DEFAULT,

1 0

Dylan Smith : richedit: Fixed a bug preventing NULL pointers from being in text.
by Alexandre Julliard June 26, 2008

June 26, 2008

Module: wine Branch: master Commit: 6d76d4371829143acede26018913af952f8976b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d76d4371829143acede26018… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jun 25 11:33:26 2008 -0400 richedit: Fixed a bug preventing NULL pointers from being in text. Opening a text file with a NULL terminated character in it was causing an assertion error after a run was being split due to word wrap. Windows allows NULL terminated characters to be in the text. --- dlls/riched20/editor.c | 2 +- dlls/riched20/string.c | 2 +- dlls/riched20/tests/editor.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e71c384..7fab00c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2618,7 +2618,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, buffer = heap_alloc((crlfmul*nCount + 1) * sizeof(WCHAR)); buflen = ME_GetTextW(editor, buffer, nStart, nCount, ex->flags & GT_USECRLF); - rc = WideCharToMultiByte(ex->codepage, flags, buffer, -1, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefChar); + rc = WideCharToMultiByte(ex->codepage, flags, buffer, buflen+1, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefChar); if (rc) rc--; /* do not count 0 terminator */ heap_free(buffer); diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 84efdbe..97b5a67 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -128,7 +128,7 @@ ME_String *ME_VSplitString(ME_String *orig, int charidx) assert(charidx>=0); assert(charidx<=orig->nLen); - s = ME_MakeString(orig->szData+charidx); + s = ME_MakeStringN(orig->szData+charidx, orig->nLen-charidx); orig->nLen = charidx; orig->szData[charidx] = '\0'; return s; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 50b69b8..409c600 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3616,6 +3616,30 @@ static DWORD CALLBACK test_EM_STREAMIN_esCallback(DWORD_PTR dwCookie, return 0; } +struct StringWithLength { + int length; + char *buffer; +}; + +/* This callback is used to handled the null characters in a string. */ +static DWORD CALLBACK test_EM_STREAMIN_esCallback2(DWORD_PTR dwCookie, + LPBYTE pbBuff, + LONG cb, + LONG *pcb) +{ + struct StringWithLength* str = (struct StringWithLength*)dwCookie; + int size = str->length; + *pcb = cb; + if (*pcb > size) { + *pcb = size; + } + if (*pcb > 0) { + memcpy(pbBuff, str->buffer, *pcb); + str->buffer += *pcb; + str->length -= *pcb; + } + return 0; +} static void test_EM_STREAMIN(void) { @@ -3645,6 +3669,15 @@ static void test_EM_STREAMIN(void) const char * streamText3 = "RichEdit1"; + struct StringWithLength cookieForStream4; + const char * streamText4 = + "This text just needs to be long enough to cause run to be split onto "\ + "two seperate lines and make sure the null terminating character is "\ + "handled properly.\0"; + int length4 = strlen(streamText4) + 1; + cookieForStream4.buffer = (char *)streamText4; + cookieForStream4.length = length4; + /* Minimal test without \par at the end */ es.dwCookie = (DWORD_PTR)&streamText0; es.dwError = 0; @@ -3728,6 +3761,17 @@ static void test_EM_STREAMIN(void) "EM_STREAMIN: Test 3 set wrong text: Result: %s\n",buffer); ok(es.dwError == -16, "EM_STREAMIN: Test 3 set error %d, expected %d\n", es.dwError, -16); + es.dwCookie = (DWORD_PTR)&cookieForStream4; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback2; + SendMessage(hwndRichEdit, EM_STREAMIN, + (WPARAM)(SF_TEXT), (LPARAM)&es); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok (result == length4, + "EM_STREAMIN: Test 4 returned %ld, expected %d\n", result, length4); + ok(es.dwError == 0, "EM_STREAMIN: Test 4 set error %d, expected %d\n", es.dwError, 0); + DestroyWindow(hwndRichEdit); }

1 0