reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-11 07:05:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

richedit: Remove checks for converting internal CHARFORMAT structs.

Browse Source 
Prevents extra copying from having to be done for converting between
unicode/ascii or between the normal or extended version of the structure.
This commit is contained in:
Dylan Smith 2010-07-29 14:06:08 -04:00 committed by Alexandre Julliard
parent ad056fe7d7
commit 68b44f740c
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/riched20/style.c
View File

@ -139,21 +139,16 @@ void ME_CopyToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from)
CopyMemory(to, from, to->cbSize); CopyMemory(to, from, to->cbSize);
} }
ME_Style *ME_MakeStyle(CHARFORMAT2W *style) { ME_Style *ME_MakeStyle(CHARFORMAT2W *style)
CHARFORMAT2W styledata; {
ME_Style *s = ALLOC_OBJ(ME_Style); ME_Style *s = ALLOC_OBJ(ME_Style);
style = ME_ToCF2W(&styledata, style);
memset(s, 0, sizeof(ME_Style));
if (style->cbSize <= sizeof(CHARFORMAT2W))
CopyMemory(&s->fmt, style, style->cbSize);
else
s->fmt = *style;
s->fmt.cbSize = sizeof(CHARFORMAT2W);
assert(style->cbSize == sizeof(CHARFORMAT2W));
s->fmt = *style;
s->nSequence = -2; s->nSequence = -2;
s->nRefs = 1; s->nRefs = 1;
s->hFont = NULL; s->hFont = NULL;
memset(&s->tm, 0, sizeof(s->tm));
s->tm.tmAscent = -1; s->tm.tmAscent = -1;
all_refs++; all_refs++;
TRACE_(richedit_style)("ME_MakeStyle %p, total refs=%d\n", s, all_refs); TRACE_(richedit_style)("ME_MakeStyle %p, total refs=%d\n", s, all_refs);
@ -171,7 +166,7 @@ ME_Style *ME_MakeStyle(CHARFORMAT2W *style) {
s->fmt.dwMask |= mask;\ s->fmt.dwMask |= mask;\
CopyMemory(s->fmt.member, style->member, sizeof(style->member));\ CopyMemory(s->fmt.member, style->member, sizeof(style->member));\
} }
void ME_InitCharFormat2W(CHARFORMAT2W *pFmt) void ME_InitCharFormat2W(CHARFORMAT2W *pFmt)
{ {
ZeroMemory(pFmt, sizeof(CHARFORMAT2W)); ZeroMemory(pFmt, sizeof(CHARFORMAT2W));
@ -180,9 +175,8 @@ void ME_InitCharFormat2W(CHARFORMAT2W *pFmt)
ME_Style *ME_ApplyStyle(ME_Style *sSrc, CHARFORMAT2W *style) ME_Style *ME_ApplyStyle(ME_Style *sSrc, CHARFORMAT2W *style)
{ {
CHARFORMAT2W styledata;
ME_Style *s = ME_MakeStyle(&sSrc->fmt); ME_Style *s = ME_MakeStyle(&sSrc->fmt);
style = ME_ToCF2W(&styledata, style); assert(style->cbSize == sizeof(CHARFORMAT2W));
COPY_STYLE_ITEM(CFM_ANIMATION, bAnimation); COPY_STYLE_ITEM(CFM_ANIMATION, bAnimation);
COPY_STYLE_ITEM(CFM_BACKCOLOR, crBackColor); COPY_STYLE_ITEM(CFM_BACKCOLOR, crBackColor);
COPY_STYLE_ITEM(CFM_CHARSET, bCharSet); COPY_STYLE_ITEM(CFM_CHARSET, bCharSet);