January 2008 - Wine-commits

Eric Pouech : richedit: Fix the para computation when zoom is used.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 28cc0f9e690a675aa00b0ccc02b442fcf8a819ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=28cc0f9e690a675aa00b0ccc0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:04:40 2008 +0100 richedit: Fix the para computation when zoom is used. --- dlls/riched20/editor.h | 1 + dlls/riched20/paint.c | 26 ++++++++++++-------------- dlls/riched20/wrap.c | 6 +++--- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 5cb9b7e..93789d6 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -214,6 +214,7 @@ BOOL ME_UpdateSelection(ME_TextEditor *editor, const ME_Cursor *pTempCursor); BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor); void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor); void ME_SendRequestResize(ME_TextEditor *editor, BOOL force); +int ME_twips2points(ME_Context *c, int x, int dpi); /* para.c */ ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *run); diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 1107105..8f71fa5 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -141,6 +141,13 @@ ME_RewrapRepaint(ME_TextEditor *editor) ME_Repaint(editor); } +int ME_twips2points(ME_Context *c, int x, int dpi) +{ + if (c->editor->nZoomNumerator == 0) + return x * dpi / 1440; + else + return x * dpi * c->editor->nZoomNumerator / 1440 / c->editor->nZoomDenominator; +} static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, int nChars, ME_Style *s, int *width, int nSelFrom, int nSelTo, int ymin, int cy) { @@ -167,17 +174,8 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, in if (s->fmt.dwEffects & CFE_SUBSCRIPT) yTwipsOffset = -s->fmt.yHeight/12; } if (yTwipsOffset) - { - int numerator = 1; - int denominator = 1; - - if (c->editor->nZoomNumerator) - { - numerator = c->editor->nZoomNumerator; - denominator = c->editor->nZoomDenominator; - } - yOffset = yTwipsOffset * GetDeviceCaps(hDC, LOGPIXELSY) * numerator / denominator / 1440; - } + yOffset = ME_twips2points(c, yTwipsOffset, GetDeviceCaps(hDC, LOGPIXELSY)); + ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nChars, NULL); GetTextExtentPoint32W(hDC, szText, nChars, &sz); if (width) *width = sz.cx; @@ -329,11 +327,11 @@ void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { case diParagraph: para = &p->member.para; assert(para); - nMargWidth = para->pFmt->dxStartIndent*dpi/1440; + nMargWidth = ME_twips2points(c, para->pFmt->dxStartIndent, dpi); if (pno != 0) - nMargWidth += para->pFmt->dxOffset*dpi/1440; + nMargWidth += ME_twips2points(c, para->pFmt->dxOffset, dpi); xs = c->rcView.left+nMargWidth; - xe = c->rcView.right-(para->pFmt->dxRightIndent*dpi/1440); + xe = c->rcView.right - ME_twips2points(c, para->pFmt->dxRightIndent, dpi); break; case diStartRow: y += height; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index ae399fb..310aad7 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -352,9 +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; - 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.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; wc.pt.y = 0;

1 0

Eric Pouech : richedit: Now drawing the paragraph borders (if any) from paraformat2.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: caa37c749a87ab5d0604a574bc65e616baa839ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa37c749a87ab5d0604a574b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:04:46 2008 +0100 richedit: Now drawing the paragraph borders (if any) from paraformat2. --- dlls/riched20/editor.h | 3 + dlls/riched20/paint.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/riched20/wrap.c | 17 ++++++ 3 files changed, 147 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 93789d6..f67b9e7 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -254,6 +254,9 @@ void ME_UpdateScrollBar(ME_TextEditor *editor); int ME_GetYScrollPos(ME_TextEditor *editor); BOOL ME_GetYScrollVisible(ME_TextEditor *editor); +/* other functions in paint.c */ +int ME_GetParaBorderWidth(ME_TextEditor *editor, int); + /* richole.c */ extern LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *); diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 8f71fa5..b5211e2 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -306,6 +306,131 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa } } +static struct {unsigned width_num : 4, width_den : 4, pen_style : 4, dble : 1;} border_details[] = { + /* none */ {0, 0, PS_SOLID, FALSE}, + /* 3/4 */ {3, 4, PS_SOLID, FALSE}, + /* 1 1/2 */ {3, 2, PS_SOLID, FALSE}, + /* 2 1/4 */ {9, 4, PS_SOLID, FALSE}, + /* 3 */ {3, 1, PS_SOLID, FALSE}, + /* 4 1/2 */ {9, 2, PS_SOLID, FALSE}, + /* 6 */ {6, 1, PS_SOLID, FALSE}, + /* 3/4 double */ {3, 4, PS_SOLID, TRUE}, + /* 1 1/2 double */ {3, 2, PS_SOLID, TRUE}, + /* 2 1/4 double */ {9, 4, PS_SOLID, TRUE}, + /* 3/4 gray */ {3, 4, PS_DOT /* FIXME */, FALSE}, + /* 1 1/2 dashed */ {3, 2, PS_DASH, FALSE}, +}; + +static COLORREF pen_colors[16] = { + /* Black */ RGB(0x00, 0x00, 0x00), /* Blue */ RGB(0x00, 0x00, 0xFF), + /* Cyan */ RGB(0x00, 0xFF, 0xFF), /* Green */ RGB(0x00, 0xFF, 0x00), + /* Magenta */ RGB(0xFF, 0x00, 0xFF), /* Red */ RGB(0xFF, 0x00, 0x00), + /* Yellow */ RGB(0xFF, 0xFF, 0x00), /* White */ RGB(0xFF, 0xFF, 0xFF), + /* Dark blue */ RGB(0x00, 0x00, 0x80), /* Dark cyan */ RGB(0x00, 0x80, 0x80), + /* Dark green */ RGB(0x00, 0x80, 0x80), /* Dark magenta */ RGB(0x80, 0x00, 0x80), + /* Dark red */ RGB(0x80, 0x00, 0x00), /* Dark yellow */ RGB(0x80, 0x80, 0x00), + /* Dark gray */ RGB(0x80, 0x80, 0x80), /* Light gray */ RGB(0xc0, 0xc0, 0xc0), +}; + +static int ME_GetBorderPenWidth(ME_TextEditor* editor, int idx) +{ + int width; + + if (editor->nZoomNumerator == 0) + { + width = border_details[idx].width_num + border_details[idx].width_den / 2; + width /= border_details[idx].width_den; + } + else + { + width = border_details[idx].width_num * editor->nZoomNumerator; + width += border_details[idx].width_den * editor->nZoomNumerator / 2; + width /= border_details[idx].width_den * editor->nZoomDenominator; + } + return width; +} + +int ME_GetParaBorderWidth(ME_TextEditor* editor, int flags) +{ + int idx = (flags >> 8) & 0xF; + int width; + + if (idx >= sizeof(border_details) / sizeof(border_details[0])) + { + FIXME("Unsupported border value %d\n", idx); + return 0; + } + width = ME_GetBorderPenWidth(editor, idx); + if (border_details[idx].dble) width = width * 2 + 1; + return width; +} + +static int ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y) +{ + HPEN pen, oldpen; + POINT pt; + int idx, pen_width, border_width; + COLORREF pencr; + + if (!(para->pFmt->dwMask & PFM_BORDER)) 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; + idx = (para->pFmt->wBorders >> 8) & 0xF; + + if (para->pFmt->wBorders & 64) /* autocolor */ + pencr = GetSysColor(COLOR_WINDOWTEXT); + 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); + } + } + 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 & 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 & 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); + } + } + MoveToEx(c->hDC, pt.x, pt.y, NULL); + SelectObject(c->hDC, oldpen); + DeleteObject(pen); + return (para->pFmt->wBorders & 4) ? border_width : 0; +} + void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { int align = SetTextAlign(c->hDC, TA_BASELINE); int dpi = GetDeviceCaps(c->hDC, LOGPIXELSX); @@ -318,7 +443,7 @@ void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { int xs = 0, xe = 0; BOOL visible = FALSE; int nMargWidth = 0; - + c->pt.x = c->rcView.left; rcPara.left = c->rcView.left; rcPara.right = c->rcView.right; @@ -332,6 +457,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); break; case diStartRow: y += height; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 310aad7..2069261 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -342,6 +342,7 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp, DWORD begino ME_DisplayItem *p; ME_WrapContext wc; int dpi = GetDeviceCaps(c->hDC, LOGPIXELSX); + int border = 0; assert(tp->type == diParagraph); if (!(tp->member.para.nFlags & MEPF_REWRAP)) { @@ -358,6 +359,19 @@ 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_BORDER) + { + border = ME_GetParaBorderWidth(c->editor, tp->member.para.pFmt->wBorders); + if (tp->member.para.pFmt->wBorders & 1) { + wc.nFirstMargin += border; + wc.nLeftMargin += border; + } + if (tp->member.para.pFmt->wBorders & 2) + wc.nRightMargin -= border; + if (tp->member.para.pFmt->wBorders & 4) + wc.pt.y += border; + } + wc.nTotalWidth = c->rcView.right - c->rcView.left; wc.nAvailWidth = wc.nTotalWidth - wc.nFirstMargin - wc.nRightMargin; wc.pRowStart = NULL; @@ -372,6 +386,9 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp, DWORD begino p = p->next; } ME_WrapEndParagraph(&wc, p); + if ((tp->member.para.pFmt->dwMask & PFM_BORDER) && (tp->member.para.pFmt->wBorders & 8)) + wc.pt.y += border; + tp->member.para.nFlags &= ~MEPF_REWRAP; tp->member.para.nHeight = wc.pt.y; tp->member.para.nRows = wc.nRow;

1 0

Eric Pouech : richedit: Correctly initialize the paraformat structure.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 566912dc3b7b20640b850ac8c0b0cfab877063b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=566912dc3b7b20640b850ac8c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:04:16 2008 +0100 richedit: Correctly initialize the paraformat structure. --- dlls/riched20/para.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 5f93653..6ff8e73 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -61,6 +61,7 @@ void ME_MakeFirstParagraph(HDC hDC, ME_TextBuffer *text) ZeroMemory(&fmt, sizeof(fmt)); fmt.cbSize = sizeof(fmt); fmt.dwMask = PFM_ALIGNMENT | PFM_OFFSET | PFM_STARTINDENT | PFM_RIGHTINDENT | PFM_TABSTOPS; + fmt.wAlignment = PFA_LEFT; CopyMemory(para->member.para.pFmt, &fmt, sizeof(PARAFORMAT2));

1 0

Eric Pouech : richedit: Now dumping all fields from the paraformat2 structure.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 8f60c8c46e80e2bca1d189e4d10a33e590e7fd72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f60c8c46e80e2bca1d189e4d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:04:22 2008 +0100 richedit: Now dumping all fields from the paraformat2 structure. --- dlls/riched20/para.c | 90 +++++++++++++++++++++++++++++++------------------- 1 files changed, 56 insertions(+), 34 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 6ff8e73..9bac824 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -280,45 +280,67 @@ ME_DisplayItem *ME_GetParagraph(ME_DisplayItem *item) { return ME_FindItemBackOrHere(item, diParagraph); } -static void ME_DumpStyleEffect(char **p, const char *name, const PARAFORMAT2 *fmt, int mask) -{ - *p += sprintf(*p, "%-22s%s\n", name, (fmt->dwMask & mask) ? ((fmt->wEffects & mask) ? "yes" : "no") : "N/A"); -} - void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) { - /* FIXME only PARAFORMAT styles implemented */ char *p; p = buf; - p += sprintf(p, "Alignment: %s\n", - !(pFmt->dwMask & PFM_ALIGNMENT) ? "N/A" : - ((pFmt->wAlignment == PFA_LEFT) ? "left" : - ((pFmt->wAlignment == PFA_RIGHT) ? "right" : - ((pFmt->wAlignment == PFA_CENTER) ? "center" : - /*((pFmt->wAlignment == PFA_JUSTIFY) ? "justify" : "incorrect")*/ - "incorrect")))); - if (pFmt->dwMask & PFM_OFFSET) - p += sprintf(p, "Offset: %d\n", (int)pFmt->dxOffset); - else - p += sprintf(p, "Offset: N/A\n"); - - if (pFmt->dwMask & PFM_OFFSETINDENT) - p += sprintf(p, "Offset indent: %d\n", (int)pFmt->dxStartIndent); - else - p += sprintf(p, "Offset indent: N/A\n"); - - if (pFmt->dwMask & PFM_STARTINDENT) - p += sprintf(p, "Start indent: %d\n", (int)pFmt->dxStartIndent); - else - p += sprintf(p, "Start indent: N/A\n"); - - if (pFmt->dwMask & PFM_RIGHTINDENT) - p += sprintf(p, "Right indent: %d\n", (int)pFmt->dxRightIndent); - else - p += sprintf(p, "Right indent: N/A\n"); - - ME_DumpStyleEffect(&p, "Page break before:", pFmt, PFM_PAGEBREAKBEFORE); +#define DUMP(mask, name, fmt, field) \ + if (pFmt->dwMask & (mask)) p += sprintf(p, "%-22s" fmt "\n", name, pFmt->field); \ + else p += sprintf(p, "%-22sN/A\n", name); + +/* we take for granted that PFE_xxx is the hiword of the corresponding PFM_xxx */ +#define DUMP_EFFECT(mask, name) \ + p += sprintf(p, "%-22s%s\n", name, (pFmt->dwMask & (mask)) ? ((pFmt->wEffects & ((mask) >> 8)) ? "yes" : "no") : "N/A"); + + DUMP(PFM_NUMBERING, "Numbering:", "%u", wNumbering); + DUMP_EFFECT(PFM_DONOTHYPHEN, "Disable auto-hyphen:"); + DUMP_EFFECT(PFM_KEEP, "No page break in para:"); + DUMP_EFFECT(PFM_KEEPNEXT, "No page break in para & next:"); + DUMP_EFFECT(PFM_NOLINENUMBER, "No line number:"); + DUMP_EFFECT(PFM_NOWIDOWCONTROL, "No widow & orphan:"); + DUMP_EFFECT(PFM_PAGEBREAKBEFORE, "Page break before:"); + DUMP_EFFECT(PFM_RTLPARA, "RTL para:"); + DUMP_EFFECT(PFM_SIDEBYSIDE, "Side by side:"); + DUMP_EFFECT(PFM_TABLE, "Table:"); + DUMP(PFM_OFFSETINDENT, "Offset indent:", "%d", dxStartIndent); + DUMP(PFM_STARTINDENT, "Start indent:", "%d", dxStartIndent); + DUMP(PFM_RIGHTINDENT, "Right indent:", "%d", dxRightIndent); + DUMP(PFM_OFFSET, "Offset:", "%d", dxOffset); + if (pFmt->dwMask & PFM_ALIGNMENT) { + switch (pFmt->wAlignment) { + case PFA_LEFT : p += sprintf(p, "Alignment: left\n"); break; + case PFA_RIGHT : p += sprintf(p, "Alignment: right\n"); break; + case PFA_CENTER : p += sprintf(p, "Alignment: center\n"); break; + case PFA_JUSTIFY: p += sprintf(p, "Alignment: justify\n"); break; + default : p += sprintf(p, "Alignment: incorrect %d\n", pFmt->wAlignment); break; + } + } + else p += sprintf(p, "Alignment: N/A\n"); + DUMP(PFM_TABSTOPS, "Tab Stops:", "%d", cTabCount); + if (pFmt->dwMask & PFM_TABSTOPS) { + int i; + p += sprintf(p, "\t"); + for (i = 0; i < pFmt->cTabCount; i++) p += sprintf(p, "%x ", pFmt->rgxTabs[i]); + p += sprintf(p, "\n"); + } + DUMP(PFM_SPACEBEFORE, "Space Before:", "%d", dySpaceBefore); + DUMP(PFM_SPACEAFTER, "Space After:", "%d", dySpaceAfter); + DUMP(PFM_LINESPACING, "Line spacing:", "%d", dyLineSpacing); + DUMP(PFM_STYLE, "Text style:", "%d", sStyle); + DUMP(PFM_LINESPACING, "Line spacing rule:", "%u", bLineSpacingRule); + /* bOutlineLevel should be 0 */ + DUMP(PFM_SHADING, "Shading Weigth:", "%u", wShadingWeight); + DUMP(PFM_SHADING, "Shading Style:", "%u", wShadingStyle); + DUMP(PFM_NUMBERINGSTART, "Numbering Start:", "%u", wNumberingStart); + DUMP(PFM_NUMBERINGSTYLE, "Numbering Style:", "0x%x", wNumberingStyle); + DUMP(PFM_NUMBERINGTAB, "Numbering Tab:", "%u", wNumberingStyle); + DUMP(PFM_BORDER, "Border Space:", "%u", wBorderSpace); + DUMP(PFM_BORDER, "Border Width:", "%u", wBorderWidth); + DUMP(PFM_BORDER, "Borders:", "%u", wBorders); + +#undef DUMP +#undef DUMP_EFFECT } void ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const PARAFORMAT2 *pFmt)

1 0

Eric Pouech : richedit: Simplified handling of background brush while painting.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 0549b9009a5d307835af1ea15ed833fc440064f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0549b9009a5d307835af1ea15… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:04:10 2008 +0100 richedit: Simplified handling of background brush while painting. --- dlls/riched20/editor.c | 11 ++++++++--- dlls/riched20/editor.h | 1 - dlls/riched20/paint.c | 23 ++++------------------- 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1589173..518f86b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1284,7 +1284,8 @@ void ME_DestroyEditor(ME_TextEditor *editor) if (editor->pFontCache[i].hFont) DeleteObject(editor->pFontCache[i].hFont); } - DeleteObject(editor->hbrBackground); + if (editor->rgbBackColor != -1) + DeleteObject(editor->hbrBackground); if(editor->lpOleCallback) IUnknown_Release(editor->lpOleCallback); @@ -1732,9 +1733,13 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, } case EM_SETBKGNDCOLOR: { - LRESULT lColor = ME_GetBackColor(editor); - if (editor->rgbBackColor != -1) + LRESULT lColor; + if (editor->rgbBackColor != -1) { DeleteObject(editor->hbrBackground); + lColor = editor->rgbBackColor; + } + else lColor = GetSysColor(COLOR_WINDOW); + if (wParam) { editor->rgbBackColor = -1; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 8757e45..5cb9b7e 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -239,7 +239,6 @@ void ME_RewrapRepaint(ME_TextEditor *editor); void ME_UpdateRepaint(ME_TextEditor *editor); void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph); void ME_EnsureVisible(ME_TextEditor *editor, ME_DisplayItem *pRun); -COLORREF ME_GetBackColor(const ME_TextEditor *editor); void ME_InvalidateSelection(ME_TextEditor *editor); void ME_QueueInvalidateFromCursor(ME_TextEditor *editor, int nCursor); BOOL ME_SetZoom(ME_TextEditor *editor, int numerator, int denominator); diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 84ab695..b21e5bc 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -146,13 +146,12 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, in ME_Style *s, int *width, int nSelFrom, int nSelTo, int ymin, int cy) { HDC hDC = c->hDC; HGDIOBJ hOldFont; - COLORREF rgbOld, rgbBack; + COLORREF rgbOld; int yOffset = 0, yTwipsOffset = 0; SIZE sz; COLORREF rgb; hOldFont = ME_SelectStyleFont(c->editor, hDC, s); - rgbBack = ME_GetBackColor(c->editor); if ((s->fmt.dwMask & CFM_LINK) && (s->fmt.dwEffects & CFE_LINK)) rgb = RGB(0,0,255); else if ((s->fmt.dwMask & CFM_COLOR) && (s->fmt.dwEffects & CFE_AUTOCOLOR)) @@ -309,17 +308,6 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa } } -COLORREF ME_GetBackColor(const ME_TextEditor *editor) -{ -/* Looks like I was seriously confused - return GetSysColor((GetWindowLong(editor->hWnd, GWL_STYLE) & ES_READONLY) ? COLOR_3DFACE: COLOR_WINDOW); -*/ - if (editor->rgbBackColor == -1) - return GetSysColor(COLOR_WINDOW); - else - return editor->rgbBackColor; -} - void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { int align = SetTextAlign(c->hDC, TA_BASELINE); ME_DisplayItem *p; @@ -350,22 +338,19 @@ void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { rcPara.bottom = y+p->member.row.nHeight; visible = RectVisible(c->hDC, &rcPara); if (visible) { - HBRUSH hbr; - hbr = CreateSolidBrush(ME_GetBackColor(c->editor)); /* left margin */ rc.left = c->rcView.left; rc.right = c->rcView.left+nMargWidth; rc.top = y; rc.bottom = y+p->member.row.nHeight; - FillRect(c->hDC, &rc, hbr/* c->hbrMargin */); + FillRect(c->hDC, &rc, c->editor->hbrBackground); /* right margin */ rc.left = xe; rc.right = c->rcView.right; - FillRect(c->hDC, &rc, hbr/* c->hbrMargin */); + FillRect(c->hDC, &rc, c->editor->hbrBackground); rc.left = c->rcView.left+nMargWidth; rc.right = xe; - FillRect(c->hDC, &rc, hbr); - DeleteObject(hbr); + FillRect(c->hDC, &rc, c->editor->hbrBackground); } if (me_debug) {

1 0

Eric Pouech : richedit: Extend the usage of underlinetype from charformat2 in richedit.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 6b591ef23aadaf8981eb1a782b9f1e37024b5a66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b591ef23aadaf8981eb1a782… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:03:58 2008 +0100 richedit: Extend the usage of underlinetype from charformat2 in richedit. --- dlls/riched20/editor.c | 24 ++++++++++++++++++------ dlls/riched20/para.c | 4 ++-- dlls/riched20/run.c | 6 ++++-- dlls/riched20/style.c | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 12fa18c..1589173 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -332,10 +332,11 @@ static void ME_RTFCharAttrHook(RTF_Info *info) { case rtfPlain: /* FIXME add more flags once they're implemented */ - fmt.dwMask = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_STRIKEOUT | CFM_COLOR | CFM_BACKCOLOR | CFM_SIZE | CFM_WEIGHT; + 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.bUnderlineType = CFU_UNDERLINENONE; break; case rtfBold: fmt.dwMask = CFM_BOLD; @@ -346,13 +347,24 @@ static void ME_RTFCharAttrHook(RTF_Info *info) fmt.dwEffects = info->rtfParam ? fmt.dwMask : 0; break; case rtfUnderline: - fmt.dwMask = CFM_UNDERLINE; - fmt.dwEffects = info->rtfParam ? fmt.dwMask : 0; - fmt.bUnderlineType = CFU_CF1UNDERLINE; + fmt.dwMask = CFM_UNDERLINETYPE; + fmt.bUnderlineType = info->rtfParam ? CFU_CF1UNDERLINE : CFU_UNDERLINENONE; + break; + case rtfDotUnderline: + fmt.dwMask = CFM_UNDERLINETYPE; + fmt.bUnderlineType = info->rtfParam ? CFU_UNDERLINEDOTTED : CFU_UNDERLINENONE; + break; + case rtfDbUnderline: + fmt.dwMask = CFM_UNDERLINETYPE; + fmt.bUnderlineType = info->rtfParam ? CFU_UNDERLINEDOUBLE : CFU_UNDERLINENONE; + break; + case rtfWordUnderline: + fmt.dwMask = CFM_UNDERLINETYPE; + fmt.bUnderlineType = info->rtfParam ? CFU_UNDERLINEWORD : CFU_UNDERLINENONE; break; case rtfNoUnderline: - fmt.dwMask = CFM_UNDERLINE; - fmt.dwEffects = 0; + fmt.dwMask = CFM_UNDERLINETYPE; + fmt.bUnderlineType = CFU_UNDERLINENONE; break; case rtfStrikeThru: fmt.dwMask = CFM_STRIKEOUT; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 8a373ec..5f93653 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -44,7 +44,7 @@ void ME_MakeFirstParagraph(HDC hDC, ME_TextBuffer *text) cf.dwMask |= CFM_ALLCAPS|CFM_BOLD|CFM_DISABLED|CFM_EMBOSS|CFM_HIDDEN; cf.dwMask |= CFM_IMPRINT|CFM_ITALIC|CFM_LINK|CFM_OUTLINE|CFM_PROTECTED; cf.dwMask |= CFM_REVISED|CFM_SHADOW|CFM_SMALLCAPS|CFM_STRIKEOUT; - cf.dwMask |= CFM_SUBSCRIPT|CFM_UNDERLINE|CFM_WEIGHT; + cf.dwMask |= CFM_SUBSCRIPT|CFM_UNDERLINETYPE|CFM_WEIGHT; cf.dwEffects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; lstrcpyW(cf.szFaceName, lf.lfFaceName); @@ -53,7 +53,7 @@ void ME_MakeFirstParagraph(HDC hDC, ME_TextBuffer *text) cf.dwEffects |= CFE_BOLD; cf.wWeight = lf.lfWeight; if (lf.lfItalic) cf.dwEffects |= CFE_ITALIC; - if (lf.lfUnderline) cf.dwEffects |= CFE_UNDERLINE; + cf.bUnderlineType = (lf.lfUnderline) ? CFU_CF1UNDERLINE : CFU_UNDERLINENONE; if (lf.lfStrikeOut) cf.dwEffects |= CFE_STRIKEOUT; cf.bPitchAndFamily = lf.lfPitchAndFamily; cf.bCharSet = lf.lfCharSet; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 1630653..71354fe 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -938,8 +938,8 @@ void ME_GetCharFormat(ME_TextEditor *editor, int nFrom, int nTo, CHARFORMAT2W *p do { /* FIXME add more style feature comparisons */ - int nAttribs = CFM_SIZE | CFM_FACE | CFM_COLOR; - int nEffects = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE; + int nAttribs = CFM_SIZE | CFM_FACE | CFM_COLOR | CFM_UNDERLINETYPE; + int nEffects = CFM_BOLD | CFM_ITALIC; run = ME_FindItemFwd(run, diRun); @@ -962,6 +962,8 @@ void ME_GetCharFormat(ME_TextEditor *editor, int nFrom, int nTo, CHARFORMAT2W *p } if (pFmt->yHeight != tmp.yHeight) pFmt->dwMask &= ~CFM_SIZE; + if (pFmt->bUnderlineType != tmp.bUnderlineType) + pFmt->dwMask &= ~CFM_UNDERLINETYPE; if (pFmt->dwMask & CFM_COLOR) { if (!((pFmt->dwEffects&CFE_AUTOCOLOR) & (tmp.dwEffects&CFE_AUTOCOLOR))) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 1113f73..fbf8a30 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -85,6 +85,20 @@ CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) CHARFORMATA *t = (CHARFORMATA *)to; CopyMemory(t, from, FIELD_OFFSET(CHARFORMATA, szFaceName)); WideCharToMultiByte(0, 0, from->szFaceName, -1, t->szFaceName, sizeof(t->szFaceName), 0, 0); + if (from->dwMask & CFM_UNDERLINETYPE) + { + switch (from->bUnderlineType) + { + case CFU_CF1UNDERLINE: + to->dwMask |= CFM_UNDERLINE; + to->dwEffects |= CFE_UNDERLINE; + break; + case CFU_UNDERLINENONE: + to->dwMask |= CFM_UNDERLINE; + to->dwEffects &= ~CFE_UNDERLINE; + break; + } + } t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ return to; } @@ -92,6 +106,20 @@ CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) { CHARFORMATW *t = (CHARFORMATW *)to; CopyMemory(t, from, sizeof(*t)); + if (from->dwMask & CFM_UNDERLINETYPE) + { + switch (from->bUnderlineType) + { + case CFU_CF1UNDERLINE: + to->dwMask |= CFM_UNDERLINE; + to->dwEffects |= CFE_UNDERLINE; + break; + case CFU_UNDERLINENONE: + to->dwMask |= CFM_UNDERLINE; + to->dwEffects &= ~CFE_UNDERLINE; + break; + } + } t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ return to; } @@ -187,6 +215,13 @@ ME_Style *ME_ApplyStyle(ME_Style *sSrc, CHARFORMAT2W *style) else s->fmt.dwEffects &= ~CFE_AUTOCOLOR; } + if (style->dwMask & CFM_UNDERLINE) + { + s->fmt.dwMask |= CFM_UNDERLINETYPE; + s->fmt.dwMask &= ~CFM_UNDERLINE; + s->fmt.bUnderlineType = (style->dwEffects & CFM_UNDERLINE) ? + CFU_CF1UNDERLINE : CFU_UNDERLINENONE; + } return s; } @@ -286,6 +321,8 @@ ME_LogFontFromStyle(HDC hDC, LOGFONTW *lf, const ME_Style *s, int nZoomNumerator lf->lfItalic = 1; if (s->fmt.dwEffects & s->fmt.dwMask & (CFM_UNDERLINE | CFE_LINK)) lf->lfUnderline = 1; + if (s->fmt.dwMask & CFM_UNDERLINETYPE && s->fmt.bUnderlineType == CFU_CF1UNDERLINE) + lf->lfUnderline = 1; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_STRIKEOUT) lf->lfStrikeOut = 1; if (s->fmt.dwEffects & s->fmt.dwMask & (CFM_SUBSCRIPT|CFM_SUPERSCRIPT))

1 0

Eric Pouech : richedit: Now painting the newly supported underline types.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 2602a39bd9bf6446c552fad1979828d1702f4c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2602a39bd9bf6446c552fad19… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:04:04 2008 +0100 richedit: Now painting the newly supported underline types. --- dlls/riched20/paint.c | 47 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 5f1d5b6..84ab695 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -148,14 +148,18 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, in HGDIOBJ hOldFont; COLORREF rgbOld, rgbBack; int yOffset = 0, yTwipsOffset = 0; + SIZE sz; + COLORREF rgb; + hOldFont = ME_SelectStyleFont(c->editor, hDC, s); rgbBack = ME_GetBackColor(c->editor); if ((s->fmt.dwMask & CFM_LINK) && (s->fmt.dwEffects & CFE_LINK)) - rgbOld = SetTextColor(hDC, RGB(0,0,255)); + rgb = RGB(0,0,255); else if ((s->fmt.dwMask & CFM_COLOR) && (s->fmt.dwEffects & CFE_AUTOCOLOR)) - rgbOld = SetTextColor(hDC, GetSysColor(COLOR_WINDOWTEXT)); + rgb = GetSysColor(COLOR_WINDOWTEXT); else - rgbOld = SetTextColor(hDC, s->fmt.crTextColor); + rgb = s->fmt.crTextColor; + rgbOld = SetTextColor(hDC, rgb); if ((s->fmt.dwMask & s->fmt.dwEffects) & CFM_OFFSET) { yTwipsOffset = s->fmt.yOffset; } @@ -176,14 +180,41 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, in yOffset = yTwipsOffset * GetDeviceCaps(hDC, LOGPIXELSY) * numerator / denominator / 1440; } ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nChars, NULL); - if (width) { - SIZE sz; - GetTextExtentPoint32W(hDC, szText, nChars, &sz); - *width = sz.cx; + GetTextExtentPoint32W(hDC, szText, nChars, &sz); + if (width) *width = sz.cx; + if (s->fmt.dwMask & CFM_UNDERLINETYPE) + { + HPEN hPen; + switch (s->fmt.bUnderlineType) + { + case CFU_UNDERLINE: + case CFU_UNDERLINEWORD: /* native seems to map it to simple underline (MSDN) */ + case CFU_UNDERLINEDOUBLE: /* native seems to map it to simple underline (MSDN) */ + hPen = CreatePen(PS_SOLID, 1, rgb); + break; + case CFU_UNDERLINEDOTTED: + hPen = CreatePen(PS_DOT, 1, rgb); + break; + default: + WINE_FIXME("Unknown underline type (%u)\n", s->fmt.bUnderlineType); + /* fall through */ + case CFU_CF1UNDERLINE: /* this type is supported in the font, do nothing */ + case CFU_UNDERLINENONE: + hPen = NULL; + break; + } + if (hPen != NULL) + { + HPEN hOldPen = SelectObject(hDC, hPen); + /* FIXME: should use textmetrics info for Descent info */ + MoveToEx(hDC, x, y - yOffset + 1, NULL); + LineTo(hDC, x + sz.cx, y - yOffset + 1); + SelectObject(hDC, hOldPen); + DeleteObject(hPen); + } } if (nSelFrom < nChars && nSelTo >= 0 && nSelFrom<nSelTo) { - SIZE sz; if (nSelFrom < 0) nSelFrom = 0; if (nSelTo > nChars) nSelTo = nChars; GetTextExtentPoint32W(hDC, szText, nSelFrom, &sz);

1 0

Eric Pouech : richedit: Correctly copy the pitch and family field.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: c2631d853710378c4362db2258364f7c763d4578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2631d853710378c4362db225… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:03:46 2008 +0100 richedit: Correctly copy the pitch and family field. --- dlls/riched20/style.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 01715ac..1113f73 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -174,7 +174,9 @@ ME_Style *ME_ApplyStyle(ME_Style *sSrc, CHARFORMAT2W *style) COPY_STYLE_ITEM(CFM_STYLE, sStyle); COPY_STYLE_ITEM(CFM_UNDERLINETYPE, bUnderlineType); COPY_STYLE_ITEM(CFM_WEIGHT, wWeight); - + /* FIXME: this is not documented this way, but that's the more logical */ + COPY_STYLE_ITEM(CFM_FACE, bPitchAndFamily); + s->fmt.dwEffects &= ~(style->dwMask); s->fmt.dwEffects |= style->dwEffects & style->dwMask; s->fmt.dwMask |= style->dwMask;

1 0

Eric Pouech : richedit: Don' t allow recursive EN_REQUESTRESIZE notifications.
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: 13f86afe1fe5d51da5e32c17e23f89e4a4898ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f86afe1fe5d51da5e32c17e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:03:52 2008 +0100 richedit: Don't allow recursive EN_REQUESTRESIZE notifications. --- dlls/riched20/wrap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index e38e50c..df1606e 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -521,9 +521,11 @@ ME_SendRequestResize(ME_TextEditor *editor, BOOL force) info.nmhdr.code = EN_REQUESTRESIZE; info.rc = rc; info.rc.bottom = editor->nTotalLength; - + + editor->nEventMask &= ~ENM_REQUESTRESIZE; SendMessageW(GetParent(editor->hWnd), WM_NOTIFY, info.nmhdr.idFrom, (LPARAM)&info); + editor->nEventMask |= ENM_REQUESTRESIZE; } } }

1 0

Eric Pouech : richedit: Fixed a couple of charformatXXm structure conversions because of alignment issues .
by Alexandre Julliard 02 Jan '08

02 Jan '08

Module: wine Branch: master Commit: a607ad316e88e6c5f952a6c542a9214d3c9fa144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a607ad316e88e6c5f952a6c54… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 1 22:03:28 2008 +0100 richedit: Fixed a couple of charformatXXm structure conversions because of alignment issues. --- dlls/riched20/style.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 0530c42..ad508fa 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -25,12 +25,20 @@ WINE_DECLARE_DEBUG_CHANNEL(richedit_style); static int all_refs = 0; +/* the following routines assume that: + * - char2[AW] extends char[AW] by adding fields at the end of the charA form) + * - szFaceName is the last field of char[AW] form, and wWeight the first of 2[AW] + * - the difference between A and W form is the szFaceName as Ansi vs Unicode string + * - because of alignment, offset of wWeight field in 2[AW] structure *IS NOT* + * sizeof(char[AW]) + */ + CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) { if (from->cbSize == sizeof(CHARFORMATA)) { CHARFORMATA *f = (CHARFORMATA *)from; - CopyMemory(to, f, sizeof(*f)-sizeof(f->szFaceName)); + CopyMemory(to, f, FIELD_OFFSET(CHARFORMATA, szFaceName)); to->cbSize = sizeof(CHARFORMAT2W); if (f->dwMask & CFM_FACE) { MultiByteToWideChar(0, 0, f->szFaceName, -1, to->szFaceName, sizeof(to->szFaceName)/sizeof(WCHAR)); @@ -42,20 +50,20 @@ CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) CHARFORMATW *f = (CHARFORMATW *)from; CopyMemory(to, f, sizeof(*f)); /* theoretically, we don't need to zero the remaining memory */ - ZeroMemory(((CHARFORMATW *)to)+1, sizeof(CHARFORMAT2W)-sizeof(CHARFORMATW)); + ZeroMemory(&to->wWeight, sizeof(CHARFORMAT2W)-FIELD_OFFSET(CHARFORMAT2W, wWeight)); to->cbSize = sizeof(CHARFORMAT2W); return to; } if (from->cbSize == sizeof(CHARFORMAT2A)) { - CHARFORMATA *f = (CHARFORMATA *)from; + CHARFORMAT2A *f = (CHARFORMAT2A *)from; /* copy the A structure without face name */ - CopyMemory(to, f, sizeof(CHARFORMATA)-sizeof(f->szFaceName)); + CopyMemory(to, f, FIELD_OFFSET(CHARFORMATA, szFaceName)); /* convert face name */ if (f->dwMask & CFM_FACE) MultiByteToWideChar(0, 0, f->szFaceName, -1, to->szFaceName, sizeof(to->szFaceName)/sizeof(WCHAR)); /* copy the rest of the 2A structure to 2W */ - CopyMemory(1+((CHARFORMATW *)to), f+1, sizeof(CHARFORMAT2A)-sizeof(CHARFORMATA)); + CopyMemory(&to->wWeight, &f->wWeight, sizeof(CHARFORMAT2A)-FIELD_OFFSET(CHARFORMAT2A, wWeight)); to->cbSize = sizeof(CHARFORMAT2W); return to; } @@ -75,7 +83,7 @@ CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) if (to->cbSize == sizeof(CHARFORMATA)) { CHARFORMATA *t = (CHARFORMATA *)to; - CopyMemory(t, from, sizeof(*t)-sizeof(t->szFaceName)); + CopyMemory(t, from, FIELD_OFFSET(CHARFORMATA, szFaceName)); WideCharToMultiByte(0, 0, from->szFaceName, -1, t->szFaceName, sizeof(t->szFaceName), 0, 0); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ return to; @@ -91,15 +99,15 @@ CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) { CHARFORMAT2A *t = (CHARFORMAT2A *)to; /* copy the A structure without face name */ - CopyMemory(t, from, sizeof(CHARFORMATA)-sizeof(t->szFaceName)); + CopyMemory(t, from, FIELD_OFFSET(CHARFORMATA, szFaceName)); /* convert face name */ WideCharToMultiByte(0, 0, from->szFaceName, -1, t->szFaceName, sizeof(t->szFaceName), 0, 0); /* copy the rest of the 2A structure to 2W */ - CopyMemory(&t->wWeight, &from->wWeight, sizeof(CHARFORMAT2A)-sizeof(CHARFORMATA)); + CopyMemory(&t->wWeight, &from->wWeight, sizeof(CHARFORMAT2W)-FIELD_OFFSET(CHARFORMAT2W,wWeight)); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ return to; } - assert(to->cbSize >= sizeof(CHARFORMAT2W)); + assert(to->cbSize >= sizeof(CHARFORMAT2W)); return from; }

1 0