January 2008 - Wine-commits

Rob Shearman : kernel32: Implement RegisterWaitForSingleObject and UnregisterWait.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 1822a722d90e1886e6650cb649c1bf39c80c030e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1822a722d90e1886e6650cb64… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 1 22:37:25 2008 +0000 kernel32: Implement RegisterWaitForSingleObject and UnregisterWait. --- dlls/kernel32/sync.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 975b914..168a00f 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -249,9 +249,18 @@ BOOL WINAPI RegisterWaitForSingleObject(PHANDLE phNewWaitObject, HANDLE hObject, WAITORTIMERCALLBACK Callback, PVOID Context, ULONG dwMilliseconds, ULONG dwFlags) { - FIXME("%p %p %p %p %d %d\n", + NTSTATUS status; + + TRACE("%p %p %p %p %d %d\n", phNewWaitObject,hObject,Callback,Context,dwMilliseconds,dwFlags); - return FALSE; + + status = RtlRegisterWait( phNewWaitObject, hObject, Callback, Context, dwMilliseconds, dwFlags ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; } /*********************************************************************** @@ -271,8 +280,17 @@ HANDLE WINAPI RegisterWaitForSingleObjectEx( HANDLE hObject, */ BOOL WINAPI UnregisterWait( HANDLE WaitHandle ) { - FIXME("%p\n",WaitHandle); - return FALSE; + NTSTATUS status; + + TRACE("%p\n",WaitHandle); + + status = RtlDeregisterWait( WaitHandle ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; } /***********************************************************************

1 0

Eric Pouech : richedit: Move init code after some sanity checks to avoid unneeded computations.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 4cecb5dc706d75f89410cd55cd84455adc3ce6c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cecb5dc706d75f89410cd55c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:05:22 2008 +0100 richedit: Move init code after some sanity checks to avoid unneeded computations. --- dlls/riched20/paint.c | 3 ++- dlls/riched20/run.c | 3 ++- dlls/riched20/wrap.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 3d43496..f9fb4ec 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -267,7 +267,7 @@ static void ME_DrawGraphics(ME_Context *c, int x, int y, ME_Run *run, static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Paragraph *para) { ME_Run *run = &rundi->member.run; - ME_DisplayItem *start = ME_FindItemBack(rundi, diStartRow); + ME_DisplayItem *start; int runofs = run->nCharOfs+para->nCharOfs; int nSelFrom, nSelTo; const WCHAR wszSpace[] = {' ', 0}; @@ -275,6 +275,7 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa if (run->nFlags & MERF_HIDDEN) return; + start = ME_FindItemBack(rundi, diStartRow); ME_GetSelection(c->editor, &nSelFrom, &nSelTo); /* Draw selected end-of-paragraph mark */ diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 71354fe..759ea29 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -606,7 +606,7 @@ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) { SIZE size; - HDC hDC = GetDC(editor->hWnd); + HDC hDC; HGDIOBJ hOldFont; ME_String *strRunText; /* This could point to either the run's real text, or it's masked form in a password control */ @@ -623,6 +623,7 @@ int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) else strRunText = pRun->strText; + hDC = GetDC(editor->hWnd); hOldFont = ME_SelectStyleFont(editor, hDC, pRun->style); GetTextExtentPoint32W(hDC, strRunText->szData, nOffset, &size); ME_UnselectStyleFont(editor, hDC, pRun->style, hOldFont); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index e72983e..f49c7ab 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -341,7 +341,7 @@ static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp); static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp, DWORD beginofs) { ME_DisplayItem *p; ME_WrapContext wc; - int dpi = GetDeviceCaps(c->hDC, LOGPIXELSX); + int dpi; int border = 0; int linespace = 0; @@ -351,6 +351,7 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp, DWORD begino } ME_PrepareParagraphForWrapping(c, tp); + dpi = GetDeviceCaps(c->hDC, LOGPIXELSX); wc.context = c; /* wc.para_style = tp->member.para.style; */ wc.style = NULL;

1 0

Eric Pouech : richedit: Don't recreate the DC all the time, but use uniformely a ME_Context structure where needed.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 475b45d8abdab2017553d92d491513e19b17406a URL: http://source.winehq.org/git/wine.git/?a=commit;h=475b45d8abdab2017553d92d4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:05:28 2008 +0100 richedit: Don't recreate the DC all the time, but use uniformely a ME_Context structure where needed. --- dlls/riched20/editor.h | 2 +- dlls/riched20/run.c | 20 +++++++++----------- dlls/riched20/wrap.c | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index c9baf98..4e16155 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -150,7 +150,7 @@ ME_DisplayItem *ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, void ME_CheckCharOffsets(ME_TextEditor *editor); void ME_PropagateCharOffset(ME_DisplayItem *p, int shift); void ME_GetGraphicsSize(ME_TextEditor *editor, ME_Run *run, SIZE *pSize); -int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run); +int ME_CharFromPoint(ME_Context *c, int cx, ME_Run *run); /* this one accounts for 1/2 char tolerance */ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run); int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 759ea29..a56f8a8 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -487,11 +487,10 @@ void ME_GetGraphicsSize(ME_TextEditor *editor, ME_Run *run, SIZE *pSize) * pixel horizontal position. This version rounds left (ie. if the second * character is at pixel position 8, then for cx=0..7 it returns 0). */ -int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run) +int ME_CharFromPoint(ME_Context *c, int cx, ME_Run *run) { int fit = 0; HGDIOBJ hOldFont; - HDC hDC; SIZE sz; if (!run->strText->nLen) return 0; @@ -505,29 +504,28 @@ int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run) if (run->nFlags & MERF_GRAPHICS) { SIZE sz; - ME_GetGraphicsSize(editor, run, &sz); + ME_GetGraphicsSize(c->editor, run, &sz); if (cx < sz.cx) return 0; return 1; } - hDC = GetDC(editor->hWnd); - hOldFont = ME_SelectStyleFont(editor, hDC, run->style); + hOldFont = ME_SelectStyleFont(c->editor, c->hDC, run->style); - if (editor->cPasswordMask) + if (c->editor->cPasswordMask) { - ME_String *strMasked = ME_MakeStringR(editor->cPasswordMask,ME_StrVLen(run->strText)); - GetTextExtentExPointW(hDC, strMasked->szData, run->strText->nLen, + ME_String *strMasked = ME_MakeStringR(c->editor->cPasswordMask,ME_StrVLen(run->strText)); + GetTextExtentExPointW(c->hDC, strMasked->szData, run->strText->nLen, cx, &fit, NULL, &sz); ME_DestroyString(strMasked); } else { - GetTextExtentExPointW(hDC, run->strText->szData, run->strText->nLen, + GetTextExtentExPointW(c->hDC, run->strText->szData, run->strText->nLen, cx, &fit, NULL, &sz); } - ME_UnselectStyleFont(editor, hDC, run->style, hOldFont); - ReleaseDC(editor->hWnd, hDC); + ME_UnselectStyleFont(c->editor, c->hDC, run->style, hOldFont); + return fit; } diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index f49c7ab..b5f10f7 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -168,7 +168,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem int i, idesp, len; ME_Run *run = &p->member.run; - idesp = i = ME_CharFromPoint(wc->context->editor, loc, run); + idesp = i = ME_CharFromPoint(wc->context, loc, run); len = ME_StrVLen(run->strText); assert(len>0); assert(i<len);

1 0

Eric Pouech : richedit: Optimizations for the style selection.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: f43570cbf0cc8b631287313718eeffdf76a29c6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43570cbf0cc8b63128731371… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:05:33 2008 +0100 richedit: Optimizations for the style selection. Use a ME_Context for style selection/unselection. Store the (x,y) dpi information for a given DC in the corresponding ME_Context structure. --- dlls/riched20/context.c | 2 + dlls/riched20/editor.h | 9 +++--- dlls/riched20/editstr.h | 1 + dlls/riched20/paint.c | 46 ++++++++++++++++++-------------- dlls/riched20/run.c | 68 +++++++++++++++++++++------------------------- dlls/riched20/style.c | 38 ++++++++++---------------- dlls/riched20/wrap.c | 14 ++++----- 7 files changed, 86 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f43570cbf0cc8b6312873…

1 0

Eric Pouech : richedit: Small optimisation in ME_GetSelectionInsertStyle.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: d48905cf21853f6d117e669cf69061a1d3ff4173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d48905cf21853f6d117e669cf… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:05:16 2008 +0100 richedit: Small optimisation in ME_GetSelectionInsertStyle. --- dlls/riched20/caret.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 2ca076d..2337107 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1244,11 +1244,11 @@ ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor) { ME_Style *style; int from, to; - ME_Cursor c; - + ME_GetSelection(editor, &from, &to); - ME_CursorFromCharOfs(editor, from, &c); 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 */ }

1 0

Eric Pouech : richedit: Added support for spaces above & below paragraphs.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: f1b029ef6a096eeef4b5234124314fb238cd295c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1b029ef6a096eeef4b523412… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:04:52 2008 +0100 richedit: Added support for spaces above & below paragraphs. --- dlls/riched20/paint.c | 136 ++++++++++++++++++++++++++++++------------------- dlls/riched20/wrap.c | 4 ++ 2 files changed, 88 insertions(+), 52 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index b5211e2..72c03f1 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -365,70 +365,102 @@ int ME_GetParaBorderWidth(ME_TextEditor* editor, int flags) return width; } -static int ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y) +static int ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, int dpi) { - HPEN pen, oldpen; - POINT pt; - int idx, pen_width, border_width; - COLORREF pencr; + int idx, border_width; + int ybefore, yafter; + RECT rc; - if (!(para->pFmt->dwMask & PFM_BORDER)) return 0; + if (!(para->pFmt->dwMask & (PFM_BORDER | PFM_SPACEBEFORE | PFM_SPACEAFTER))) return 0; - if (para->pFmt->wBorders & 0x00B0) - FIXME("Unsupported border flags %x\n", para->pFmt->wBorders); - border_width = ME_GetParaBorderWidth(c->editor, para->pFmt->wBorders); - if (border_width == 0 || !(para->pFmt->wBorders & 0xF)) return 0; + if (para->pFmt->dwMask & PFM_SPACEBEFORE) + { + rc.left = c->rcView.left; + rc.right = c->rcView.right; + rc.top = y; + ybefore = ME_twips2points(c, para->pFmt->dySpaceBefore, dpi); + rc.bottom = y + ybefore; + FillRect(c->hDC, &rc, c->editor->hbrBackground); + } + else ybefore = 0; + if (para->pFmt->dwMask & PFM_SPACEAFTER) + { + rc.left = c->rcView.left; + rc.right = c->rcView.right; + rc.bottom = y + para->nHeight; + yafter = ME_twips2points(c, para->pFmt->dySpaceAfter, dpi); + rc.top = rc.bottom - yafter; + FillRect(c->hDC, &rc, c->editor->hbrBackground); + } + else yafter = 0; + + border_width = 0; idx = (para->pFmt->wBorders >> 8) & 0xF; + if ((para->pFmt->dwMask & PFM_BORDER) && idx != 0 && (para->pFmt->wBorders & 0xF)) { + int pen_width; + COLORREF pencr; + HPEN pen = NULL, oldpen = NULL; + POINT pt; + + if (para->pFmt->wBorders & 0x00B0) + FIXME("Unsupported border flags %x\n", para->pFmt->wBorders); + border_width = ME_GetParaBorderWidth(c->editor, para->pFmt->wBorders); - if (para->pFmt->wBorders & 64) /* autocolor */ + if (para->pFmt->wBorders & 64) /* autocolor */ pencr = GetSysColor(COLOR_WINDOWTEXT); - else + else pencr = pen_colors[(para->pFmt->wBorders >> 12) & 0xF]; - pen_width = ME_GetBorderPenWidth(c->editor, idx); - pen = CreatePen(border_details[idx].pen_style, pen_width, pencr); - oldpen = SelectObject(c->hDC, pen); - MoveToEx(c->hDC, 0, 0, &pt); - if (para->pFmt->wBorders & 1) - { - MoveToEx(c->hDC, c->rcView.left, y, NULL); - LineTo(c->hDC, c->rcView.left, y + para->nHeight); - if (border_details[idx].dble) { - MoveToEx(c->hDC, c->rcView.left + pen_width + 1, y + pen_width + 1, NULL); - LineTo(c->hDC, c->rcView.left + pen_width + 1, y + para->nHeight - pen_width - 1); + pen_width = ME_GetBorderPenWidth(c->editor, idx); + pen = CreatePen(border_details[idx].pen_style, pen_width, pencr); + oldpen = SelectObject(c->hDC, pen); + MoveToEx(c->hDC, 0, 0, &pt); + + /* before & after spaces are not included in border */ + if (para->pFmt->wBorders & 1) + { + MoveToEx(c->hDC, c->rcView.left, y + ybefore, NULL); + LineTo(c->hDC, c->rcView.left, y + para->nHeight - yafter); + if (border_details[idx].dble) { + MoveToEx(c->hDC, c->rcView.left + pen_width + 1, y + ybefore + pen_width + 1, NULL); + LineTo(c->hDC, c->rcView.left + pen_width + 1, y + para->nHeight - yafter - pen_width - 1); + } } - } - if (para->pFmt->wBorders & 2) - { - MoveToEx(c->hDC, c->rcView.right, y, NULL); - LineTo(c->hDC, c->rcView.right, y + para->nHeight); - if (border_details[idx].dble) { - MoveToEx(c->hDC, c->rcView.right - pen_width - 1, y + pen_width + 1, NULL); - LineTo(c->hDC, c->rcView.right - pen_width - 1, y + para->nHeight - pen_width - 1); + if (para->pFmt->wBorders & 2) + { + MoveToEx(c->hDC, c->rcView.right, y + ybefore, NULL); + LineTo(c->hDC, c->rcView.right, y + para->nHeight - yafter); + if (border_details[idx].dble) { + MoveToEx(c->hDC, c->rcView.right - pen_width - 1, y + ybefore + pen_width + 1, NULL); + LineTo(c->hDC, c->rcView.right - pen_width - 1, y + para->nHeight - yafter - pen_width - 1); + } } - } - if (para->pFmt->wBorders & 4) - { - MoveToEx(c->hDC, c->rcView.left, y, NULL); - LineTo(c->hDC, c->rcView.right, y); - if (border_details[idx].dble) { - MoveToEx(c->hDC, c->rcView.left + pen_width + 1, y + pen_width + 1, NULL); - LineTo(c->hDC, c->rcView.right - pen_width - 1, y + pen_width + 1); + if (para->pFmt->wBorders & 4) + { + MoveToEx(c->hDC, c->rcView.left, y + ybefore, NULL); + LineTo(c->hDC, c->rcView.right, y + ybefore); + if (border_details[idx].dble) { + MoveToEx(c->hDC, c->rcView.left + pen_width + 1, y + ybefore + pen_width + 1, NULL); + LineTo(c->hDC, c->rcView.right - pen_width - 1, y + ybefore + pen_width + 1); + } } - } - if (para->pFmt->wBorders & 8) - { - MoveToEx(c->hDC, c->rcView.left, y + para->nHeight - 1, NULL); - LineTo(c->hDC, c->rcView.right, y + para->nHeight - 1); - if (border_details[idx].dble) { - MoveToEx(c->hDC, c->rcView.left + pen_width + 1, y + para->nHeight - 1 - pen_width - 1, NULL); - LineTo(c->hDC, c->rcView.right - pen_width - 1, y + para->nHeight - 1 - pen_width - 1); + if (para->pFmt->wBorders & 8) + { + MoveToEx(c->hDC, c->rcView.left, y + para->nHeight - yafter - 1, NULL); + LineTo(c->hDC, c->rcView.right, y + para->nHeight - yafter - 1); + if (border_details[idx].dble) { + MoveToEx(c->hDC, c->rcView.left + pen_width + 1, y + para->nHeight - yafter - 1 - pen_width - 1, NULL); + LineTo(c->hDC, c->rcView.right - pen_width - 1, y + para->nHeight - yafter - 1 - pen_width - 1); + } } + + MoveToEx(c->hDC, pt.x, pt.y, NULL); + SelectObject(c->hDC, oldpen); + DeleteObject(pen); } - MoveToEx(c->hDC, pt.x, pt.y, NULL); - SelectObject(c->hDC, oldpen); - DeleteObject(pen); - return (para->pFmt->wBorders & 4) ? border_width : 0; + return ybefore + + ((para->pFmt->dwMask & PFM_BORDER) && (para->pFmt->wBorders & 4) ? + border_width : 0); } void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { @@ -457,7 +489,7 @@ void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { nMargWidth += ME_twips2points(c, para->pFmt->dxOffset, dpi); xs = c->rcView.left+nMargWidth; xe = c->rcView.right - ME_twips2points(c, para->pFmt->dxRightIndent, dpi); - y += ME_DrawParaDecoration(c, para, y); + y += ME_DrawParaDecoration(c, para, y, dpi); break; case diStartRow: y += height; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 2069261..d1f6203 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -359,6 +359,8 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp, DWORD begino wc.nRow = 0; wc.pt.x = 0; wc.pt.y = 0; + if (tp->member.para.pFmt->dwMask & PFM_SPACEBEFORE) + wc.pt.y += ME_twips2points(c, tp->member.para.pFmt->dySpaceBefore, dpi); if (tp->member.para.pFmt->dwMask & PFM_BORDER) { border = ME_GetParaBorderWidth(c->editor, tp->member.para.pFmt->wBorders); @@ -388,6 +390,8 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp, DWORD begino ME_WrapEndParagraph(&wc, p); if ((tp->member.para.pFmt->dwMask & PFM_BORDER) && (tp->member.para.pFmt->wBorders & 8)) wc.pt.y += border; + if (tp->member.para.pFmt->dwMask & PFM_SPACEAFTER) + wc.pt.y += ME_twips2points(c, tp->member.para.pFmt->dySpaceAfter, dpi); tp->member.para.nFlags &= ~MEPF_REWRAP; tp->member.para.nHeight = wc.pt.y;

1 0

Eric Pouech : richedit: Added support for intra-paragraph line space.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: d319033a9755e11f6ac9730776f3c1f9b7b3492a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d319033a9755e11f6ac973077… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:04:58 2008 +0100 richedit: Added support for intra-paragraph line space. --- dlls/riched20/editor.h | 1 + dlls/riched20/paint.c | 23 +++++++++++++++++++++++ dlls/riched20/wrap.c | 8 ++++++-- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index f67b9e7..0223b30 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -256,6 +256,7 @@ BOOL ME_GetYScrollVisible(ME_TextEditor *editor); /* other functions in paint.c */ int ME_GetParaBorderWidth(ME_TextEditor *editor, int); +int ME_GetParaLineSpace(ME_TextEditor *editor, ME_Paragraph*, int); /* richole.c */ extern LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *); diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 72c03f1..3d43496 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -365,6 +365,29 @@ int ME_GetParaBorderWidth(ME_TextEditor* editor, int flags) return width; } +int ME_GetParaLineSpace(ME_TextEditor* editor, ME_Paragraph* para, int dpi) +{ + int sp = 0, ls = 0; + if (!(para->pFmt->dwMask & PFM_LINESPACING)) return 0; + + /* FIXME: how to compute simply the line space in ls ??? */ + /* FIXME: does line spacing include the line itself ??? */ + switch (para->pFmt->bLineSpacingRule) + { + case 0: sp = ls; break; + case 1: sp = (3 * ls) / 2; break; + case 2: sp = 2 * ls; break; + case 3: sp = para->pFmt->dyLineSpacing * dpi / 1440; if (sp < ls) sp = ls; break; + case 4: sp = para->pFmt->dyLineSpacing * dpi / 1440; break; + case 5: sp = para->pFmt->dyLineSpacing / 20; break; + default: FIXME("Unsupported spacing rule value %d\n", para->pFmt->bLineSpacingRule); + } + if (editor->nZoomNumerator == 0) + return sp; + else + return sp * editor->nZoomNumerator / editor->nZoomDenominator; +} + static int ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, int dpi) { int idx, border_width; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index d1f6203..f0b2c49 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -343,6 +343,7 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp, DWORD begino ME_WrapContext wc; int dpi = GetDeviceCaps(c->hDC, LOGPIXELSX); int border = 0; + int linespace = 0; assert(tp->type == diParagraph); if (!(tp->member.para.nFlags & MEPF_REWRAP)) { @@ -378,14 +379,17 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp, DWORD begino wc.nAvailWidth = wc.nTotalWidth - wc.nFirstMargin - wc.nRightMargin; wc.pRowStart = NULL; + linespace = ME_GetParaLineSpace(c->editor, &tp->member.para, dpi); + ME_BeginRow(&wc); for (p = tp->next; p!=tp->member.para.next_para; ) { assert(p->type != diStartRow); if (p->type == diRun) { p = ME_WrapHandleRun(&wc, p); - continue; } - p = p->next; + else p = p->next; + if (wc.nRow && p == wc.pRowStart) + wc.pt.y += linespace; } ME_WrapEndParagraph(&wc, p); if ((tp->member.para.pFmt->dwMask & PFM_BORDER) && (tp->member.para.pFmt->wBorders & 8))

1 0

Eric Pouech : richedit: Rewrote FindPixelPos so that it always return something.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: e9be142d783e3644da69ffc831189069d8d581f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9be142d783e3644da69ffc83… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:05:05 2008 +0100 richedit: Rewrote FindPixelPos so that it always return something. Made the function static as well. --- dlls/riched20/caret.c | 131 ++++++++++++++++++++--------------------------- dlls/riched20/editor.h | 1 - dlls/riched20/wrap.c | 4 +- 3 files changed, 58 insertions(+), 78 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 46ab7c9..2ca076d 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -704,102 +704,83 @@ int ME_GetCursorOfs(ME_TextEditor *editor, int nCursor) + pCursor->pRun->member.run.nCharOfs + pCursor->nOffset; } -int ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL *is_eol) +static void ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL *is_eol) { ME_DisplayItem *p = editor->pBuffer->pFirst->member.para.next_para; + ME_DisplayItem *last = NULL; int rx = 0; - + if (is_eol) *is_eol = 0; - while(p != editor->pBuffer->pLast) + /* find paragraph */ + for (; p != editor->pBuffer->pLast; p = p->member.para.next_para) { - if (p->type == diParagraph) + assert(p->type == diParagraph); + if (y < p->member.para.nYPos + p->member.para.nHeight) { - int ry = y - p->member.para.nYPos; - if (ry < 0) - { - result->pRun = ME_FindItemFwd(p, diRun); - result->nOffset = 0; - return 0; - } - if (ry >= p->member.para.nHeight) - { - p = p->member.para.next_para; - continue; - } + y -= p->member.para.nYPos; p = ME_FindItemFwd(p, diStartRow); - y = ry; - continue; + break; } - if (p->type == diStartRow) + } + /* find row */ + for (; p != editor->pBuffer->pLast; ) + { + ME_DisplayItem *pp; + assert(p->type == diStartRow); + if (y < p->member.row.nYPos + p->member.row.nHeight) { - int ry = y - p->member.row.nYPos; - if (ry < 0) - return 0; - if (ry >= p->member.row.nHeight) - { - p = ME_FindItemFwd(p, diStartRowOrParagraphOrEnd); - if (p->type != diStartRow) - return 0; - continue; - } - p = ME_FindItemFwd(p, diRun); - continue; + p = ME_FindItemFwd(p, diRun); + break; + } + pp = ME_FindItemFwd(p, diStartRowOrParagraphOrEnd); + if (pp->type != diStartRow) + { + p = ME_FindItemFwd(p, diRun); + break; } - if (p->type == diRun) + p = pp; + } + for (; p != editor->pBuffer->pLast; p = p->next) + { + switch (p->type) { - ME_DisplayItem *pp; + case diRun: rx = x - p->member.run.pt.x; - if (rx < 0) - rx = 0; - if (rx >= p->member.run.nWidth) /* not this run yet... find next item */ - { - pp = p; - do { - p = p->next; - if (p->type == diRun) - { - rx = x - p->member.run.pt.x; - goto continue_search; - } - if (p->type == diStartRow) - { - p = ME_FindItemFwd(p, diRun); - if (is_eol) - *is_eol = 1; - rx = 0; /* FIXME not sure */ - goto found_here; - } - if (p->type == diParagraph || p->type == diTextEnd) - { - rx = 0; /* FIXME not sure */ - p = pp; - goto found_here; - } - } while(1); - continue; - } - found_here: - if (p->member.run.nFlags & MERF_ENDPARA) - rx = 0; - result->pRun = p; - result->nOffset = ME_CharFromPointCursor(editor, rx, &p->member.run); - if (editor->pCursors[0].nOffset == p->member.run.strText->nLen && rx) + if (rx < p->member.run.nWidth) { - result->pRun = ME_FindItemFwd(editor->pCursors[0].pRun, diRun); - result->nOffset = 0; + found_here: + assert(p->type == diRun); + if ((p->member.run.nFlags & MERF_ENDPARA) || rx < 0) + rx = 0; + result->pRun = p; + result->nOffset = ME_CharFromPointCursor(editor, rx, &p->member.run); + if (editor->pCursors[0].nOffset == p->member.run.strText->nLen && rx) + { + result->pRun = ME_FindItemFwd(editor->pCursors[0].pRun, diRun); + result->nOffset = 0; + } + return; } - return 1; + break; + case diStartRow: + p = ME_FindItemFwd(p, diRun); + if (is_eol) *is_eol = 1; + rx = 0; /* FIXME not sure */ + goto found_here; + case diParagraph: + case diTextEnd: + rx = 0; /* FIXME not sure */ + p = last; + goto found_here; + default: assert(0); } - assert(0); - continue_search: - ; + last = p; } result->pRun = ME_FindItemBack(p, diRun); result->nOffset = 0; assert(result->pRun->member.run.nFlags & MERF_ENDPARA); - return 0; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 0223b30..c9baf98 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -181,7 +181,6 @@ void ME_SelectWord(ME_TextEditor *editor); void ME_HideCaret(ME_TextEditor *ed); void ME_ShowCaret(ME_TextEditor *ed); void ME_MoveCaret(ME_TextEditor *ed); -int ME_FindPixelPos(ME_TextEditor *editor, int x, int y, ME_Cursor *result, BOOL *is_eol); int ME_CharFromPos(ME_TextEditor *editor, int x, int y); void ME_LButtonDown(ME_TextEditor *editor, int x, int y); void ME_MouseMove(ME_TextEditor *editor, int x, int y); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index f0b2c49..e72983e 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -354,8 +354,8 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp, DWORD begino wc.context = c; /* wc.para_style = tp->member.para.style; */ wc.style = NULL; - wc.nFirstMargin = ME_twips2points(c, tp->member.para.pFmt->dxStartIndent, dpi) + beginofs - wc.nLeftMargin = wc.nFirstMargin + ME_twips2points(c, tp->member.para.pFmt->dxOffset, dpi) + beginofs + wc.nFirstMargin = ME_twips2points(c, tp->member.para.pFmt->dxStartIndent, dpi) + beginofs; + wc.nLeftMargin = wc.nFirstMargin + ME_twips2points(c, tp->member.para.pFmt->dxOffset, dpi) + beginofs; wc.nRightMargin = ME_twips2points(c, tp->member.para.pFmt->dxRightIndent, dpi); wc.nRow = 0; wc.pt.x = 0;

1 0

Eric Pouech : richedit: Properly copying the paraformat2 structure for paragraphs.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 0e8c08756151a3c38abaf6cc856813b0b56cf300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8c08756151a3c38abaf6cc8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:04:28 2008 +0100 richedit: Properly copying the paraformat2 structure for paragraphs. --- dlls/riched20/para.c | 100 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 73 insertions(+), 27 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 9bac824..1c8b21c 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -351,22 +351,51 @@ void ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const PARAFOR CopyMemory(&copy, para->member.para.pFmt, sizeof(PARAFORMAT2)); - if (pFmt->dwMask & PFM_ALIGNMENT) - para->member.para.pFmt->wAlignment = pFmt->wAlignment; - if (pFmt->dwMask & PFM_STARTINDENT) - para->member.para.pFmt->dxStartIndent = pFmt->dxStartIndent; - if (pFmt->dwMask & PFM_OFFSET) - para->member.para.pFmt->dxOffset = pFmt->dxOffset; +#define COPY_FIELD(m, f) \ + if (pFmt->dwMask & (m)) { \ + para->member.para.pFmt->dwMask |= m; \ + para->member.para.pFmt->f = pFmt->f; \ + } + + COPY_FIELD(PFM_NUMBERING, wNumbering); +#define EFFECTS_MASK (PFM_RTLPARA|PFM_KEEP|PFM_KEEPNEXT|PFM_PAGEBREAKBEFORE| \ + PFM_NOLINENUMBER|PFM_NOWIDOWCONTROL|PFM_DONOTHYPHEN|PFM_SIDEBYSIDE| \ + PFM_TABLE) + /* we take for granted that PFE_xxx is the hiword of the corresponding PFM_xxx */ + if (pFmt->dwMask & EFFECTS_MASK) { + para->member.para.pFmt->dwMask &= ~(pFmt->dwMask & EFFECTS_MASK); + para->member.para.pFmt->wEffects |= pFmt->wEffects & HIWORD(pFmt->dwMask); + } +#undef EFFECTS_MASK + + COPY_FIELD(PFM_STARTINDENT, dxStartIndent); if (pFmt->dwMask & PFM_OFFSETINDENT) para->member.para.pFmt->dxStartIndent += pFmt->dxStartIndent; - + COPY_FIELD(PFM_RIGHTINDENT, dxRightIndent); + COPY_FIELD(PFM_OFFSET, dxOffset); + COPY_FIELD(PFM_ALIGNMENT, wAlignment); + if (pFmt->dwMask & PFM_TABSTOPS) { para->member.para.pFmt->cTabCount = pFmt->cTabCount; - memcpy(para->member.para.pFmt->rgxTabs, pFmt->rgxTabs, pFmt->cTabCount*sizeof(int)); + memcpy(para->member.para.pFmt->rgxTabs, pFmt->rgxTabs, pFmt->cTabCount*sizeof(LONG)); } - - /* FIXME to be continued (indents, bulleting and such) */ + COPY_FIELD(PFM_SPACEBEFORE, dySpaceBefore); + COPY_FIELD(PFM_SPACEAFTER, dySpaceAfter); + COPY_FIELD(PFM_LINESPACING, dyLineSpacing); + COPY_FIELD(PFM_STYLE, sStyle); + COPY_FIELD(PFM_LINESPACING, bLineSpacingRule); + COPY_FIELD(PFM_SHADING, wShadingWeight); + COPY_FIELD(PFM_SHADING, wShadingStyle); + COPY_FIELD(PFM_NUMBERINGSTART, wNumberingStart); + COPY_FIELD(PFM_NUMBERINGSTYLE, wNumberingStyle); + COPY_FIELD(PFM_NUMBERINGTAB, wNumberingTab); + COPY_FIELD(PFM_BORDER, wBorderSpace); + COPY_FIELD(PFM_BORDER, wBorderWidth); + COPY_FIELD(PFM_BORDER, wBorders); + + para->member.para.pFmt->dwMask |= pFmt->dwMask; +#undef COPY_FIELD if (memcmp(&copy, para->member.para.pFmt, sizeof(PARAFORMAT2))) para->member.para.nFlags |= MEPF_REWRAP; @@ -435,28 +464,45 @@ void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) ZeroMemory(&tmp, sizeof(tmp)); tmp.cbSize = sizeof(tmp); ME_GetParaFormat(editor, para, &tmp); - - assert(tmp.dwMask & PFM_ALIGNMENT); - if (pFmt->wAlignment != tmp.wAlignment) - pFmt->dwMask &= ~PFM_ALIGNMENT; - + +#define CHECK_FIELD(m, f) \ + if (pFmt->f != tmp.f) pFmt->dwMask &= ~(m); + + CHECK_FIELD(PFM_NUMBERING, wNumbering); + /* para->member.para.pFmt->wEffects = pFmt->wEffects; */ + assert(tmp.dwMask & PFM_ALIGNMENT); + CHECK_FIELD(PFM_NUMBERING, wNumbering); assert(tmp.dwMask & PFM_STARTINDENT); - if (pFmt->dxStartIndent != tmp.dxStartIndent) - pFmt->dwMask &= ~PFM_STARTINDENT; - + CHECK_FIELD(PFM_STARTINDENT, dxStartIndent); + assert(tmp.dwMask & PFM_RIGHTINDENT); + CHECK_FIELD(PFM_RIGHTINDENT, dxRightIndent); assert(tmp.dwMask & PFM_OFFSET); - if (pFmt->dxOffset != tmp.dxOffset) - pFmt->dwMask &= ~PFM_OFFSET; - - assert(tmp.dwMask & PFM_TABSTOPS); + CHECK_FIELD(PFM_OFFSET, dxOffset); + CHECK_FIELD(PFM_ALIGNMENT, wAlignment); + + assert(tmp.dwMask & PFM_TABSTOPS); if (pFmt->dwMask & PFM_TABSTOPS) { - if (pFmt->cTabCount != tmp.cTabCount) - pFmt->dwMask &= ~PFM_TABSTOPS; - else - if (memcmp(pFmt->rgxTabs, tmp.rgxTabs, tmp.cTabCount*sizeof(int))) + if (pFmt->cTabCount != tmp.cTabCount || + memcmp(pFmt->rgxTabs, tmp.rgxTabs, tmp.cTabCount*sizeof(int))) pFmt->dwMask &= ~PFM_TABSTOPS; } - + + CHECK_FIELD(PFM_SPACEBEFORE, dySpaceBefore); + CHECK_FIELD(PFM_SPACEAFTER, dySpaceAfter); + CHECK_FIELD(PFM_LINESPACING, dyLineSpacing); + CHECK_FIELD(PFM_STYLE, sStyle); + CHECK_FIELD(PFM_SPACEAFTER, bLineSpacingRule); + CHECK_FIELD(PFM_SHADING, wShadingWeight); + CHECK_FIELD(PFM_SHADING, wShadingStyle); + CHECK_FIELD(PFM_NUMBERINGSTART, wNumberingStart); + CHECK_FIELD(PFM_NUMBERINGSTYLE, wNumberingStyle); + CHECK_FIELD(PFM_NUMBERINGTAB, wNumberingTab); + CHECK_FIELD(PFM_BORDER, wBorderSpace); + CHECK_FIELD(PFM_BORDER, wBorderWidth); + CHECK_FIELD(PFM_BORDER, wBorders); + +#undef CHECK_FIELD + if (para == para_end) return; para = para->member.para.next_para;

1 0

Eric Pouech : richedit: Enforce usage of paraformat2 fields instead of homegrown ones for paragraphs .
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: f4fd063101ef10c1a88527369a9b339705367bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4fd063101ef10c1a88527369… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:04:34 2008 +0100 richedit: Enforce usage of paraformat2 fields instead of homegrown ones for paragraphs. --- dlls/riched20/editstr.h | 1 - dlls/riched20/paint.c | 15 +++++++++------ dlls/riched20/para.c | 5 ----- dlls/riched20/wrap.c | 9 +++------ 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index cc70af2..2f383c7 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -167,7 +167,6 @@ typedef struct tagME_Paragraph struct tagME_TableCell *pCells; /* list of cells and their properties */ struct tagME_TableCell *pLastCell; /* points to the last cell in the list */ - int nLeftMargin, nRightMargin, nFirstMargin; int nCharOfs; int nFlags; int nYPos, nHeight; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index b21e5bc..1107105 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -310,14 +310,15 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { int align = SetTextAlign(c->hDC, TA_BASELINE); + int dpi = GetDeviceCaps(c->hDC, LOGPIXELSX); ME_DisplayItem *p; ME_Run *run; ME_Paragraph *para = NULL; RECT rc, rcPara; int y = c->pt.y; int height = 0, baseline = 0, no=0, pno = 0; - int xs, xe; - int visible = 0; + int xs = 0, xe = 0; + BOOL visible = FALSE; int nMargWidth = 0; c->pt.x = c->rcView.left; @@ -327,12 +328,14 @@ void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { switch(p->type) { case diParagraph: para = &p->member.para; - break; - case diStartRow: assert(para); - nMargWidth = (pno==0?para->nFirstMargin:para->nLeftMargin); + nMargWidth = para->pFmt->dxStartIndent*dpi/1440; + if (pno != 0) + nMargWidth += para->pFmt->dxOffset*dpi/1440; xs = c->rcView.left+nMargWidth; - xe = c->rcView.right-para->nRightMargin; + xe = c->rcView.right-(para->pFmt->dxRightIndent*dpi/1440); + break; + case diStartRow: y += height; rcPara.top = y; rcPara.bottom = y+p->member.row.nHeight; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 1c8b21c..3b2750b 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -141,11 +141,6 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, ME new_para->member.para.nFlags = MEPF_REWRAP; /* FIXME copy flags (if applicable) */ /* FIXME initialize format style and call ME_SetParaFormat blah blah */ CopyMemory(new_para->member.para.pFmt, run_para->member.para.pFmt, sizeof(PARAFORMAT2)); - - /* FIXME remove this as soon as nLeftMargin etc are replaced with proper fields of PARAFORMAT2 */ - new_para->member.para.nLeftMargin = run_para->member.para.nLeftMargin; - new_para->member.para.nRightMargin = run_para->member.para.nRightMargin; - new_para->member.para.nFirstMargin = run_para->member.para.nFirstMargin; new_para->member.para.bTable = run_para->member.para.bTable; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index df1606e..ae399fb 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -352,12 +352,9 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp, DWORD begino wc.context = c; /* wc.para_style = tp->member.para.style; */ wc.style = NULL; - tp->member.para.nRightMargin = tp->member.para.pFmt->dxRightIndent*dpi/1440; - tp->member.para.nFirstMargin = tp->member.para.pFmt->dxStartIndent*dpi/1440 + beginofs; - tp->member.para.nLeftMargin = (tp->member.para.pFmt->dxStartIndent+tp->member.para.pFmt->dxOffset)*dpi/1440 + beginofs; - wc.nFirstMargin = tp->member.para.nFirstMargin; - wc.nLeftMargin = tp->member.para.nLeftMargin; - wc.nRightMargin = tp->member.para.nRightMargin; + wc.nFirstMargin = tp->member.para.pFmt->dxStartIndent*dpi/1440 + beginofs; + wc.nLeftMargin = wc.nFirstMargin + tp->member.para.pFmt->dxOffset*dpi/1440 + beginofs; + wc.nRightMargin = tp->member.para.pFmt->dxRightIndent*dpi/1440; wc.nRow = 0; wc.pt.x = 0; wc.pt.y = 0;

1 0