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

Eric Pouech : richedit: Added support for EM_SETTARGETDEVICE with a NULL DC .
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: 33d7cea120bd7d37175cd5c89aa2a66d5c909f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d7cea120bd7d37175cd5c89… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:48:05 2008 +0100 richedit: Added support for EM_SETTARGETDEVICE with a NULL DC. --- dlls/riched20/editor.c | 16 ++++++++++++++-- dlls/riched20/editstr.h | 3 ++- dlls/riched20/wrap.c | 12 +++++++++--- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d472e0f..6c493c2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -114,7 +114,7 @@ + EM_SETSEL + EM_SETSCROLLPOS 3.0 - EM_SETTABSTOPS 3.0 - - EM_SETTARGETDEVICE + - EM_SETTARGETDEVICE (partial) + EM_SETTEXTEX 3.0 (no rich text insertion handling, proper style?) - EM_SETTEXTMODE 2.0 - EM_SETTYPOGRAPHYOPTIONS 3.0 @@ -1590,6 +1590,7 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) { ed->nLastSelStart = ed->nLastSelEnd = 0; ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); ed->bRedraw = TRUE; + ed->bWordWrap = FALSE; ed->bHideSelection = FALSE; ed->nInvalidOfs = -1; ed->pfnWordBreak = NULL; @@ -1901,7 +1902,6 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, UNSUPPORTED_MSG(EM_SETLANGOPTIONS) UNSUPPORTED_MSG(EM_SETPALETTE) UNSUPPORTED_MSG(EM_SETTABSTOPS) - UNSUPPORTED_MSG(EM_SETTARGETDEVICE) UNSUPPORTED_MSG(EM_SETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_SETWORDBREAKPROCEX) UNSUPPORTED_MSG(WM_STYLECHANGING) @@ -3188,6 +3188,18 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ME_RewrapRepaint(editor); return 0; } + case EM_SETTARGETDEVICE: + if (wParam == 0) + { + switch (lParam) + { + case 0: editor->bWordWrap = TRUE; break; + case 1: editor->bWordWrap = FALSE; break; + default: FIXME("Unknown option to EM_SETTARGETDEVICE(NULL,%ld)\n", lParam); + } + } + else FIXME("Unsupported yet non NULL device in EM_SETTARGETDEVICE\n"); + break; default: do_default: return DefWindowProcW(hWnd, msg, wParam, lParam); diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 7c1fe7f..964f356 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -312,6 +312,7 @@ typedef struct tagME_TextEditor int nZoomNumerator, nZoomDenominator; RECT rcFormat; BOOL bRedraw; + BOOL bWordWrap; int nInvalidOfs; int nTextLimit; EDITWORDBREAKPROCW pfnWordBreak; @@ -350,7 +351,7 @@ typedef struct tagME_WrapContext ME_Style *style; ME_Context *context; int nLeftMargin, nRightMargin, nFirstMargin; - int nTotalWidth, nAvailWidth; + int nAvailWidth; int nRow; POINT pt; BOOL bOverflown; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 4c24dec..49c5366 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -47,7 +47,11 @@ static void ME_BeginRow(ME_WrapContext *wc) wc->pRowStart = NULL; wc->bOverflown = FALSE; wc->pLastSplittableRun = NULL; - wc->nAvailWidth = wc->nTotalWidth - (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin; + if (wc->context->editor->bWordWrap) + wc->nAvailWidth = wc->context->rcView.right - wc->context->rcView.left - + (wc->nRow ? wc->nLeftMargin : wc->nFirstMargin) - wc->nRightMargin; + else + wc->nAvailWidth = ~0u >> 1; wc->pt.x = 0; } @@ -393,8 +397,10 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp, DWORD begino wc.pt.y += border; } - wc.nTotalWidth = c->rcView.right - c->rcView.left; - wc.nAvailWidth = wc.nTotalWidth - wc.nFirstMargin - wc.nRightMargin; + if (c->editor->bWordWrap) + wc.nAvailWidth = c->rcView.right - c->rcView.left - wc.nFirstMargin - wc.nRightMargin; + else + wc.nAvailWidth = ~0u >> 1; wc.pRowStart = NULL; linespace = ME_GetParaLineSpace(c, &tp->member.para);

1 0

Eric Pouech : richedit: Fixed object leaks generated by context creation & destruction.
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: 5d36c47e1f8c02964b031f366e4bdce50c98170d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d36c47e1f8c02964b031f366… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:48:13 2008 +0100 richedit: Fixed object leaks generated by context creation & destruction. --- dlls/riched20/caret.c | 5 ++--- dlls/riched20/context.c | 3 ++- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 2 +- dlls/riched20/para.c | 7 ++----- dlls/riched20/run.c | 4 ++-- dlls/riched20/wrap.c | 15 +++++---------- 7 files changed, 15 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 18204e2..a6a6217 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -215,9 +215,8 @@ ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, *height = pSizeRun->member.run.nAscent + pSizeRun->member.run.nDescent; *x = run->member.run.pt.x + sz.cx; *y = para->member.para.nYPos + row->member.row.nBaseline + pSizeRun->member.run.pt.y - pSizeRun->member.run.nAscent - ME_GetYScrollPos(editor); - - ME_DestroyContext(&c); - ReleaseDC(editor->hWnd, hDC); + + ME_DestroyContext(&c, editor->hWnd); return; } } diff --git a/dlls/riched20/context.c b/dlls/riched20/context.c index 56e68f7..161a64a 100644 --- a/dlls/riched20/context.c +++ b/dlls/riched20/context.c @@ -33,7 +33,8 @@ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) c->dpi.cy = GetDeviceCaps(hDC, LOGPIXELSY); } -void ME_DestroyContext(ME_Context *c) +void ME_DestroyContext(ME_Context *c, HWND hWnd) { + if (hWnd) ReleaseDC(hWnd, c->hDC); DeleteObject(c->hbrMargin); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7b9be5e..0c0d324 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -190,7 +190,7 @@ void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor); BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl); void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC); -void ME_DestroyContext(ME_Context *c); +void ME_DestroyContext(ME_Context *c, HWND release); ME_Style *GetInsertStyle(ME_TextEditor *editor, int nCursor); void ME_MustBeWrapped(ME_Context *c, ME_DisplayItem *para); void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 91d5ec0..d5cb3c7 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -91,7 +91,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT * if (editor->nTotalLength != editor->nLastTotalLength) ME_SendRequestResize(editor, FALSE); editor->nLastTotalLength = editor->nTotalLength; - ME_DestroyContext(&c); + ME_DestroyContext(&c, NULL); } void ME_Repaint(ME_TextEditor *editor) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 4fb24e9..b2f8e6c 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -28,7 +28,6 @@ static const WCHAR wszParagraphSign[] = {0xB6, 0}; void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; - HDC hDC; PARAFORMAT2 fmt; CHARFORMAT2W cf; LOGFONTW lf; @@ -38,9 +37,8 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) ME_DisplayItem *run; ME_Style *style; - hDC = GetDC(editor->hWnd); + ME_InitContext(&c, editor, GetDC(editor->hWnd)); - ME_InitContext(&c, editor, hDC); hf = (HFONT)GetStockObject(SYSTEM_FONT); assert(hf); GetObjectW(hf, sizeof(LOGFONTW), &lf); @@ -85,8 +83,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) text->pLast->member.para.nCharOfs = 1; - ME_DestroyContext(&c); - ReleaseDC(editor->hWnd, hDC); + ME_DestroyContext(&c, editor->hWnd); } void ME_MarkAllForWrapping(ME_TextEditor *editor) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index a762695..e193bd2 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -551,7 +551,7 @@ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) { SIZE sz; ME_GetOLEObjectSize(&c, run, &sz); - ReleaseDC(editor->hWnd, c.hDC); + ME_DestroyContext(&c, editor->hWnd); if (cx < sz.cx/2) return 0; return 1; @@ -580,7 +580,7 @@ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) ME_DestroyString(strRunText); ME_UnselectStyleFont(&c, run->style, hOldFont); - ReleaseDC(editor->hWnd, c.hDC); + ME_DestroyContext(&c, editor->hWnd); return fit; } diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 49c5366..cd052a7 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -467,14 +467,12 @@ static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp) { } BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { - HWND hWnd = editor->hWnd; - HDC hDC = GetDC(hWnd); ME_DisplayItem *item; ME_Context c; BOOL bModified = FALSE; int yStart = -1, yEnd = -1; - ME_InitContext(&c, editor, hDC); + ME_InitContext(&c, editor, GetDC(editor->hWnd)); c.pt.x = 0; c.pt.y = 0; editor->nHeight = 0; @@ -510,9 +508,8 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { editor->nTotalLength = c.pt.y; - ME_DestroyContext(&c); - ReleaseDC(hWnd, hDC); - + ME_DestroyContext(&c, editor->hWnd); + if (bModified || editor->nTotalLength < editor->nLastTotalLength) ME_InvalidateMarkedParagraphs(editor); return bModified; @@ -520,9 +517,8 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor) { ME_Context c; - HDC hDC = GetDC(editor->hWnd); - ME_InitContext(&c, editor, hDC); + ME_InitContext(&c, editor, GetDC(editor->hWnd)); if (editor->bRedraw) { RECT rc = c.rcView; @@ -544,8 +540,7 @@ void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor) { InvalidateRect(editor->hWnd, &rc, TRUE); } } - ME_DestroyContext(&c); - ReleaseDC(editor->hWnd, hDC); + ME_DestroyContext(&c, editor->hWnd); }

1 0

Eric Pouech : include: Added msftedit support in richedit.h.
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: 3502e28604aea65af677f910fa71552430106af0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3502e28604aea65af677f910f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:47:49 2008 +0100 include: Added msftedit support in richedit.h. --- include/richedit.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/richedit.h b/include/richedit.h index cb278f6..3213a75 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -32,6 +32,14 @@ extern "C" { #define cchTextLimitDefault 0x7fff +#if defined(__GNUC__) +# define MSFTEDIT_CLASS (const WCHAR []){ 'R','i','c','h','E','d','i','t','5','0','W',0 } +#elif defined(_MSC_VER) +# define MSFTEDIT_CLASS L"RichEdit50W" +#else +static const WCHAR MSFTEDIT_CLASS[] = { 'R','i','c','h','E','d','i','t','5','0','W',0 }; +#endif + #define RICHEDIT_CLASS20A "RichEdit20A" #if defined(__GNUC__) # define RICHEDIT_CLASS20W (const WCHAR []){ 'R','i','c','h','E','d','i','t','2','0','W',0 }

1 0

Eric Pouech : richedit: Use the FW_ constants instead of the raw values.
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: 9c6c9d63a2e3a118b647f116a0bba9f4df85958c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6c9d63a2e3a118b647f116a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:47:39 2008 +0100 richedit: Use the FW_ constants instead of the raw values. --- dlls/riched20/editor.c | 2 +- dlls/riched20/para.c | 2 +- dlls/riched20/style.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 0ad55ea..d472e0f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -336,7 +336,7 @@ static void ME_RTFCharAttrHook(RTF_Info *info) fmt.dwMask = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINETYPE | CFM_STRIKEOUT | CFM_COLOR | CFM_BACKCOLOR | CFM_SIZE | CFM_WEIGHT; fmt.dwEffects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; fmt.yHeight = 12*20; /* 12pt */ - fmt.wWeight = 400; + fmt.wWeight = FW_NORMAL; fmt.bUnderlineType = CFU_UNDERLINENONE; break; case rtfBold: diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index fcf2dca..4fb24e9 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -55,7 +55,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) cf.dwEffects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; lstrcpyW(cf.szFaceName, lf.lfFaceName); cf.yHeight = ME_twips2pointsY(&c, lf.lfHeight); - if (lf.lfWeight >= 700) cf.dwEffects |= CFE_BOLD; + if (lf.lfWeight > FW_NORMAL) cf.dwEffects |= CFE_BOLD; cf.wWeight = lf.lfWeight; if (lf.lfItalic) cf.dwEffects |= CFE_ITALIC; cf.bUnderlineType = (lf.lfUnderline) ? CFU_CF1UNDERLINE : CFU_UNDERLINENONE; diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 149e556..43b2a96 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -303,9 +303,9 @@ ME_LogFontFromStyle(ME_Context* c, LOGFONTW *lf, const ME_Style *s) lf->lfHeight = ME_twips2pointsY(c, -s->fmt.yHeight); - lf->lfWeight = 400; + lf->lfWeight = FW_NORMAL; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_BOLD) - lf->lfWeight = 700; + lf->lfWeight = FW_BOLD; if (s->fmt.dwMask & CFM_WEIGHT) lf->lfWeight = s->fmt.wWeight; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_ITALIC) @@ -337,7 +337,7 @@ void ME_CharFormatFromLogFont(HDC hDC, const LOGFONTW *lf, CHARFORMAT2W *fmt) fmt->dwMask = CFM_WEIGHT|CFM_BOLD|CFM_ITALIC|CFM_UNDERLINE|CFM_STRIKEOUT|CFM_SIZE|CFM_FACE|CFM_CHARSET; fmt->wWeight = lf->lfWeight; fmt->yHeight = -lf->lfHeight*1440/ry; - if (lf->lfWeight>400) fmt->dwEffects |= CFM_BOLD; + if (lf->lfWeight > FW_NORMAL) fmt->dwEffects |= CFM_BOLD; if (lf->lfItalic) fmt->dwEffects |= CFM_ITALIC; if (lf->lfUnderline) fmt->dwEffects |= CFM_UNDERLINE; /* notice that if a logfont was created with underline due to CFM_LINK, this

1 0

Eric Pouech : richedit: In RTF reader, set both bold and weight attributes, so that we don't care about priority between the two.
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: 6e02f5db4bcde283b488dcee86d570e360804596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e02f5db4bcde283b488dcee8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:47:32 2008 +0100 richedit: In RTF reader, set both bold and weight attributes, so that we don't care about priority between the two. --- dlls/riched20/editor.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index dac289a..0ad55ea 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -340,8 +340,9 @@ static void ME_RTFCharAttrHook(RTF_Info *info) fmt.bUnderlineType = CFU_UNDERLINENONE; break; case rtfBold: - fmt.dwMask = CFM_BOLD; - fmt.dwEffects = info->rtfParam ? fmt.dwMask : 0; + fmt.dwMask = CFM_BOLD | CFM_WEIGHT; + fmt.dwEffects = info->rtfParam ? CFE_BOLD : 0; + fmt.wWeight = info->rtfParam ? FW_BOLD : FW_NORMAL; break; case rtfItalic: fmt.dwMask = CFM_ITALIC;

1 0

Eric Pouech : richedit: Correctly set the pitch and family for a font when reading an RTF stream.
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: 0c2c43d39b09680ad090609b212e278e50f804d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c2c43d39b09680ad090609b2… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:47:25 2008 +0100 richedit: Correctly set the pitch and family for a font when reading an RTF stream. --- dlls/riched20/editor.c | 2 +- dlls/riched20/reader.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7ad8980..dac289a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -420,7 +420,7 @@ static void ME_RTFCharAttrHook(RTF_Info *info) fmt.szFaceName[sizeof(fmt.szFaceName)/sizeof(WCHAR)-1] = '\0'; fmt.bCharSet = f->rtfFCharSet; fmt.dwMask = CFM_FACE | CFM_CHARSET; - fmt.bPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; + fmt.bPitchAndFamily = f->rtfFPitch | (f->rtfFFamily << 4); } } break; diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 28930db..4ed7258 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -857,9 +857,9 @@ static void ReadFontTbl(RTF_Info *info) fp->rtfFName = NULL; fp->rtfFAltName = NULL; fp->rtfFNum = -1; - fp->rtfFFamily = 0; + fp->rtfFFamily = FF_DONTCARE; fp->rtfFCharSet = DEFAULT_CHARSET; /* 1 */ - fp->rtfFPitch = 0; + fp->rtfFPitch = DEFAULT_PITCH; fp->rtfFType = 0; fp->rtfFCodePage = CP_ACP;

1 0

Eric Pouech : richedit: Pass left margin around when computing the size of a run, so that a tab will get a correct size.
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: a86d7bdcea5c038d63e9fd8798d79f1412ad0dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a86d7bdcea5c038d63e9fd879… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:47:08 2008 +0100 richedit: Pass left margin around when computing the size of a run, so that a tab will get a correct size. --- dlls/riched20/caret.c | 7 +++++-- dlls/riched20/editor.h | 6 +++--- dlls/riched20/run.c | 26 ++++++++++++++------------ dlls/riched20/wrap.c | 23 +++++++++++++++-------- 4 files changed, 37 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a86d7bdcea5c038d63e9f…

1 0

Eric Pouech : richedit: Assign equivalent structures instead of copying them.
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: 34a4f9227a733a963590ad50a9ab1ae430dc3665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a4f9227a733a963590ad50a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:47:01 2008 +0100 richedit: Assign equivalent structures instead of copying them. --- dlls/riched20/para.c | 12 ++++++------ dlls/riched20/style.c | 6 +++--- dlls/riched20/undo.c | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index af292f1..fcf2dca 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -68,8 +68,8 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) fmt.dwMask = PFM_ALIGNMENT | PFM_OFFSET | PFM_STARTINDENT | PFM_RIGHTINDENT | PFM_TABSTOPS; fmt.wAlignment = PFA_LEFT; - CopyMemory(para->member.para.pFmt, &fmt, sizeof(PARAFORMAT2)); - + *para->member.para.pFmt = fmt; + style = ME_MakeStyle(&cf); text->pDefaultStyle = style; @@ -148,7 +148,7 @@ 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)); + *new_para->member.para.pFmt = *run_para->member.para.pFmt; new_para->member.para.bTable = run_para->member.para.bTable; @@ -226,7 +226,7 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp) { undo->nStart = pNext->member.para.nCharOfs - end_len; assert(pNext->member.para.pFmt->cbSize == sizeof(PARAFORMAT2)); - CopyMemory(undo->di.member.para.pFmt, pNext->member.para.pFmt, sizeof(PARAFORMAT2)); + *undo->di.member.para.pFmt = *pNext->member.para.pFmt; } shift = pNext->member.para.nCharOfs - tp->member.para.nCharOfs - end_len; @@ -352,7 +352,7 @@ void ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const PARAFOR assert(sizeof(*para->member.para.pFmt) == sizeof(PARAFORMAT2)); ME_AddUndoItem(editor, diUndoSetParagraphFormat, para); - CopyMemory(&copy, para->member.para.pFmt, sizeof(PARAFORMAT2)); + copy = *para->member.para.pFmt; #define COPY_FIELD(m, f) \ if (pFmt->dwMask & (m)) { \ @@ -447,7 +447,7 @@ void ME_GetParaFormat(ME_TextEditor *editor, const ME_DisplayItem *para, PARAFOR { if (pFmt->cbSize >= sizeof(PARAFORMAT2)) { - CopyMemory(pFmt, para->member.para.pFmt, sizeof(PARAFORMAT2)); + *pFmt = *para->member.para.pFmt; return; } CopyMemory(pFmt, para->member.para.pFmt, pFmt->cbSize); diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index ffca9d6..149e556 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -74,7 +74,7 @@ CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) void ME_CopyToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) { if (ME_ToCF2W(to, from) == from) - CopyMemory(to, from, sizeof(*from)); + *to = *from; } CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) @@ -154,7 +154,7 @@ ME_Style *ME_MakeStyle(CHARFORMAT2W *style) { if (style->cbSize <= sizeof(CHARFORMAT2W)) CopyMemory(&s->fmt, style, style->cbSize); else - CopyMemory(&s->fmt, style, sizeof(CHARFORMAT2W)); + s->fmt = *style; s->fmt.cbSize = sizeof(CHARFORMAT2W); s->nSequence = -2; @@ -229,7 +229,7 @@ void ME_CopyCharFormat(CHARFORMAT2W *pDest, const CHARFORMAT2W *pSrc) /* using this with non-2W structs is forbidden */ assert(pSrc->cbSize == sizeof(CHARFORMAT2W)); assert(pDest->cbSize == sizeof(CHARFORMAT2W)); - CopyMemory(pDest, pSrc, sizeof(CHARFORMAT2W)); + *pDest = *pSrc; } static void ME_DumpStyleEffect(char **p, const char *name, const CHARFORMAT2W *fmt, int mask) diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 12c8d30..426daf4 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -62,13 +62,13 @@ ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, const ME_Disp break; case diUndoSetParagraphFormat: assert(pdi); - CopyMemory(&pItem->member.para, &pdi->member.para, sizeof(ME_Paragraph)); + pItem->member.para = pdi->member.para; pItem->member.para.pFmt = ALLOC_OBJ(PARAFORMAT2); - CopyMemory(pItem->member.para.pFmt, pdi->member.para.pFmt, sizeof(PARAFORMAT2)); + *pItem->member.para.pFmt = *pdi->member.para.pFmt; break; case diUndoInsertRun: assert(pdi); - CopyMemory(&pItem->member.run, &pdi->member.run, sizeof(ME_Run)); + pItem->member.run = pdi->member.run; pItem->member.run.strText = ME_StrDup(pItem->member.run.strText); ME_AddRefStyle(pItem->member.run.style); if (pdi->member.run.ole_obj) @@ -227,7 +227,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, ME_DisplayItem *pItem) tmp.pRun = ME_SplitRunSimple(editor, tmp.pRun, tmp.nOffset); new_para = ME_SplitParagraph(editor, tmp.pRun, tmp.pRun->member.run.style); assert(pItem->member.para.pFmt->cbSize == sizeof(PARAFORMAT2)); - CopyMemory(new_para->member.para.pFmt, pItem->member.para.pFmt, sizeof(PARAFORMAT2)); + *new_para->member.para.pFmt = *pItem->member.para.pFmt; break; } default:

1 0

Eric Pouech : richedit: Store shift-enter (keyboard) and \line (rtf) as end of row (and emit \line while saving in RTF).
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: a64c22c8b19767b14e2cb57eefc6df2f7d8c9602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64c22c8b19767b14e2cb57ee… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:46:51 2008 +0100 richedit: Store shift-enter (keyboard) and \line (rtf) as end of row (and emit \line while saving in RTF). --- dlls/riched20/caret.c | 15 +++++++++++++++ dlls/riched20/editor.c | 5 ++++- dlls/riched20/editor.h | 1 + dlls/riched20/reader.c | 6 +++++- dlls/riched20/writer.c | 4 ++++ 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 3f0604e..adf90ac 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -411,6 +411,21 @@ void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCur } +void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor) +{ + ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); + ME_DisplayItem *di; + WCHAR space = ' '; + + /* FIXME no no no */ + if (ME_IsSelection(editor)) + ME_DeleteSelection(editor); + + di = ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, + MERF_ENDROW); + ME_SendSelChange(editor); +} + void ME_InsertTableCellFromCursor(ME_TextEditor *editor, int nCursor) { diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9288ea2..7ad8980 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2960,7 +2960,10 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, { ME_Style *style = ME_GetInsertStyle(editor, 0); ME_SaveTempStyle(editor); - ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); + if (wstr == '\r' && (GetKeyState(VK_SHIFT) & 0x8000)) + ME_InsertEndRowFromCursor(editor, 0); + else + ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); ME_ReleaseStyle(style); ME_CommitUndo(editor); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 8b97a55..bfcc794 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -186,6 +186,7 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y); void ME_DeleteTextAtCursor(ME_TextEditor *editor, int nCursor, int nChars); void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, const WCHAR *str, int len, ME_Style *style); +void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor); BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl); void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC); diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index ebc9745..28930db 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -2596,10 +2596,13 @@ static void SpecialChar (RTF_Info *info) } break; } + case rtfLine: + RTFFlushOutputBuffer(info); + ME_InsertEndRowFromCursor(info->editor, 0); + break; case rtfPage: case rtfSect: case rtfRow: - case rtfLine: case rtfPar: RTFPutUnicodeChar (info, '\n'); break; @@ -2648,6 +2651,7 @@ RTFFlushUnicodeOutputBuffer(RTF_Info *info) } } + static void RTFPutUnicodeString(RTF_Info *info, const WCHAR *string, int length) { diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index ff3f5ee..30e9c93 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -714,6 +714,10 @@ ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, int nStart, int nC nChars--; if (editor->bEmulateVersion10 && nChars) nChars--; + } else if (p->member.run.nFlags & MERF_ENDROW) { + if (!ME_StreamOutPrint(pStream, "\\line \r\n")) + return FALSE; + nChars--; } else { int nEnd;

1 0

Eric Pouech : richedit: Added support for end of line inside paragraphs.
by Alexandre Julliard March 17, 2008

March 17, 2008

Module: wine Branch: master Commit: 4fb2dfc9f016d4ad5d1e476925eea12b3aceddfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fb2dfc9f016d4ad5d1e47692… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:46:36 2008 +0100 richedit: Added support for end of line inside paragraphs. --- dlls/riched20/editstr.h | 14 ++++++++------ dlls/riched20/wrap.c | 7 +++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 92dbab4..7c1fe7f 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -92,11 +92,11 @@ typedef enum { /******************************** run flags *************************/ #define MERF_STYLEFLAGS 0x0FFF /* run contains non-text content, which has its own rules for wrapping, sizing etc */ -#define MERF_GRAPHICS 1 +#define MERF_GRAPHICS 0x001 /* run is a tab (or, in future, any kind of content whose size is dependent on run position) */ -#define MERF_TAB 2 +#define MERF_TAB 0x002 /* run is a cell boundary */ -#define MERF_CELL 4 +#define MERF_CELL 0x004 #define MERF_NONTEXT (MERF_GRAPHICS | MERF_TAB | MERF_CELL) @@ -114,13 +114,15 @@ typedef enum { #define MERF_CALCBYWRAP 0x0F0000 /* the "end of paragraph" run, contains 1 character */ #define MERF_ENDPARA 0x100000 +/* forcing the "end of row" run, contains 1 character */ +#define MERF_ENDROW 0x200000 /* run is hidden */ -#define MERF_HIDDEN 0x200000 +#define MERF_HIDDEN 0x400000 /* runs with any of these flags set cannot be joined */ -#define MERF_NOJOIN (MERF_GRAPHICS|MERF_TAB|MERF_ENDPARA) +#define MERF_NOJOIN (MERF_GRAPHICS|MERF_TAB|MERF_ENDPARA|MERF_ENDROW) /* runs that don't contain real text */ -#define MERF_NOTEXT (MERF_GRAPHICS|MERF_TAB|MERF_ENDPARA) +#define MERF_NOTEXT (MERF_GRAPHICS|MERF_TAB|MERF_ENDPARA|MERF_ENDROW) /* those flags are kept when the row is split */ #define MERF_SPLITMASK (~(0)) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 1037cec..cd1f325 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -282,6 +282,13 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) ME_InsertRowStart(wc, p); return p; } + /* simply end the current row and move on to next one */ + if (run->nFlags & MERF_ENDROW) + { + p = p->next; + ME_InsertRowStart(wc, p); + return p; + } /* we're not at the end of the row */ /* will current run fit? */ if (wc->pt.x + run->nWidth > wc->nAvailWidth)

1 0