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

Eric Pouech : richedit: Fixed object leaks generated by context creation & destruction.
by Alexandre Julliard 17 Mar '08

17 Mar '08

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 : richedit: Don't force cursor change when it's not needed.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: 984e4167af3362efd37cb1e374c161d2225c455e URL: http://source.winehq.org/git/wine.git/?a=commit;h=984e4167af3362efd37cb1e37… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:48:22 2008 +0100 richedit: Don't force cursor change when it's not needed. --- dlls/riched20/editor.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6c493c2..ec3954b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -245,7 +245,6 @@ static const WCHAR RichEdit50W[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '5', static const WCHAR REListBox20W[] = {'R','E','L','i','s','t','B','o','x','2','0','W', 0}; static const WCHAR REComboBox20W[] = {'R','E','C','o','m','b','o','B','o','x','2','0','W', 0}; static HCURSOR hLeft; -static HCURSOR hBeam; int me_debug = 0; HANDLE me_heap = NULL; @@ -1522,12 +1521,15 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) return FALSE; } -static void ME_SetCursor(ME_TextEditor *editor, int x) +static BOOL ME_SetCursor(ME_TextEditor *editor, int x) { - if (x < editor->selofs || editor->linesel) + if ((GetWindowLongW(editor->hWnd, GWL_STYLE) & ES_SELECTIONBAR) && + (x < editor->selofs || editor->linesel)) + { SetCursor(hLeft); - else - SetCursor(hBeam); + return TRUE; + } + return FALSE; } static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) @@ -1703,7 +1705,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) me_heap = HeapCreate (0, 0x10000, 0); if (!ME_RegisterEditorClass(hinstDLL)) return FALSE; hLeft = LoadCursorW(hinstDLL, MAKEINTRESOURCEW(OCR_REVERSE)); - hBeam = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM)); LookupInit(); break; @@ -2819,7 +2820,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); SetCapture(hWnd); ME_LinkNotify(editor,msg,wParam,lParam); - ME_SetCursor(editor, LOWORD(lParam)); + if (!ME_SetCursor(editor, LOWORD(lParam))) goto do_default; break; case WM_MOUSEMOVE: if ((editor->nEventMask & ENM_MOUSEEVENTS) && @@ -2828,7 +2829,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, if (GetCapture() == hWnd) ME_MouseMove(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); ME_LinkNotify(editor,msg,wParam,lParam); - ME_SetCursor(editor, LOWORD(lParam)); + if (!ME_SetCursor(editor, LOWORD(lParam))) goto do_default; break; case WM_LBUTTONUP: if (GetCapture() == hWnd) @@ -2836,9 +2837,14 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, if ((editor->nEventMask & ENM_MOUSEEVENTS) && !ME_FilterEvent(editor, msg, &wParam, &lParam)) return 0; - editor->linesel = 0; - ME_SetCursor(editor, LOWORD(lParam)); - ME_LinkNotify(editor,msg,wParam,lParam); + else + { + BOOL ret; + editor->linesel = 0; + ret = ME_SetCursor(editor, LOWORD(lParam)); + ME_LinkNotify(editor,msg,wParam,lParam); + if (!ret) goto do_default; + } break; case WM_LBUTTONDBLCLK: if ((editor->nEventMask & ENM_MOUSEEVENTS) && @@ -3388,7 +3394,7 @@ static BOOL ME_RegisterEditorClass(HINSTANCE hInstance) wcW.cbWndExtra = sizeof(ME_TextEditor *); wcW.hInstance = NULL; /* hInstance would register DLL-local class */ wcW.hIcon = NULL; - wcW.hCursor = hBeam; + wcW.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM)); wcW.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); wcW.lpszMenuName = NULL;

1 0

Eric Pouech : richedit: Use the FW_ constants instead of the raw values.
by Alexandre Julliard 17 Mar '08

17 Mar '08

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 : include: Added msftedit support in richedit.h.
by Alexandre Julliard 17 Mar '08

17 Mar '08

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: Correctly set the pitch and family for a font when reading an RTF stream.
by Alexandre Julliard 17 Mar '08

17 Mar '08

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: In RTF reader, set both bold and weight attributes, so that we don't care about priority between the two.
by Alexandre Julliard 17 Mar '08

17 Mar '08

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: Assign equivalent structures instead of copying them.
by Alexandre Julliard 17 Mar '08

17 Mar '08

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: Pass left margin around when computing the size of a run, so that a tab will get a correct size.
by Alexandre Julliard 17 Mar '08

17 Mar '08

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: Added support for reading DI bitmaps in RTF streams .
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: f628a1c2454eb558f99f8f5c769058d3938240b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f628a1c2454eb558f99f8f5c7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:45:52 2008 +0100 richedit: Added support for reading DI bitmaps in RTF streams. --- dlls/riched20/editor.c | 61 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a803773..ce8473d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -691,7 +691,8 @@ static void ME_RTFTblAttrHook(RTF_Info *info) } } -static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE h, const SIZEL* sz) +static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbmp, + const SIZEL* sz) { LPOLEOBJECT lpObject = NULL; LPSTORAGE lpStorage = NULL; @@ -704,11 +705,20 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE h, const SIZEL* s BOOL ret = FALSE; DWORD conn; - stgm.tymed = TYMED_ENHMF; - stgm.u.hEnhMetaFile = h; + if (hemf) + { + stgm.tymed = TYMED_ENHMF; + stgm.u.hEnhMetaFile = hemf; + fm.cfFormat = CF_ENHMETAFILE; + } + else if (hbmp) + { + stgm.tymed = TYMED_GDI; + stgm.u.hBitmap = hbmp; + fm.cfFormat = CF_BITMAP; + } stgm.pUnkForRelease = NULL; - fm.cfFormat = CF_ENHMETAFILE; fm.ptd = NULL; fm.dwAspect = DVASPECT_CONTENT; fm.lindex = -1; @@ -768,6 +778,8 @@ static void ME_RTFReadPictGroup(RTF_Info *info) BYTE val; METAFILEPICT mfp; HENHMETAFILE hemf; + HBITMAP hbmp; + enum gfxkind {gfx_unknown = 0, gfx_enhmetafile, gfx_dib} gfx = gfx_unknown; RTFGetToken (info); if (info->rtfClass == rtfEOF) @@ -777,6 +789,12 @@ static void ME_RTFReadPictGroup(RTF_Info *info) if (RTFCheckMM (info, rtfPictAttr, rtfWinMetafile)) { mfp.mm = info->rtfParam; + gfx = gfx_enhmetafile; + } + else if (RTFCheckMM (info, rtfPictAttr, rtfDevIndBitmap)) + { + if (info->rtfParam != 0) FIXME("dibitmap should be 0 (%d)\n", info->rtfParam); + gfx = gfx_dib; } else { @@ -799,9 +817,13 @@ static void ME_RTFReadPictGroup(RTF_Info *info) goto skip_group; } else if (RTFCheckMM (info, rtfPictAttr, rtfPicWid)) - mfp.xExt = info->rtfParam; + { + if (gfx == gfx_enhmetafile) mfp.xExt = info->rtfParam; + } else if (RTFCheckMM (info, rtfPictAttr, rtfPicHt)) - mfp.yExt = info->rtfParam; + { + if (gfx == gfx_enhmetafile) mfp.yExt = info->rtfParam; + } else if (RTFCheckMM (info, rtfPictAttr, rtfPicGoalWid)) sz.cx = info->rtfParam; else if (RTFCheckMM (info, rtfPictAttr, rtfPicGoalHt)) @@ -837,8 +859,31 @@ static void ME_RTFReadPictGroup(RTF_Info *info) } if (flip) FIXME("wrong hex string\n"); - if ((hemf = SetWinMetaFileBits(bufidx, buffer, NULL, &mfp))) - ME_RTFInsertOleObject(info, hemf, &sz); + switch (gfx) + { + case gfx_enhmetafile: + if ((hemf = SetWinMetaFileBits(bufidx, buffer, NULL, &mfp))) + ME_RTFInsertOleObject(info, hemf, NULL, &sz); + break; + case gfx_dib: + { + BITMAPINFO* bi = (BITMAPINFO*)buffer; + HDC hdc = GetDC(0); + unsigned nc = bi->bmiHeader.biClrUsed; + + /* not quite right, especially for bitfields type of compression */ + if (!nc && bi->bmiHeader.biBitCount <= 8) + nc = 1 << bi->bmiHeader.biBitCount; + if ((hbmp = CreateDIBitmap(hdc, &bi->bmiHeader, + CBM_INIT, (char*)(bi + 1) + nc * sizeof(RGBQUAD), + bi, DIB_RGB_COLORS))) + ME_RTFInsertOleObject(info, NULL, hbmp, &sz); + ReleaseDC(0, hdc); + } + break; + default: + break; + } HeapFree(GetProcessHeap(), 0, buffer); RTFRouteToken (info); /* feed "}" back to router */ return;

1 0

Eric Pouech : richedit: Fix reading paragraph left & first indentation attributes.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: cb4a41b8061a5303ea54439217aeeb3ded8bbbab URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb4a41b8061a5303ea5443921… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 16 21:46:03 2008 +0100 richedit: Fix reading paragraph left & first indentation attributes. --- dlls/riched20/editor.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index ce8473d..99e2059 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -471,14 +471,16 @@ static void ME_RTFParAttrHook(RTF_Info *info) } case rtfFirstIndent: ME_GetSelectionParaFormat(info->editor, &fmt); - fmt.dwMask = PFM_STARTINDENT | PFM_OFFSET; - fmt.dxStartIndent += info->rtfParam + fmt.dxOffset; + fmt.dwMask |= PFM_STARTINDENT | PFM_OFFSET; + fmt.dxStartIndent += info->rtfParam; fmt.dxOffset = -info->rtfParam; break; case rtfLeftIndent: + /* we assume rtfLeftIndent is always specified before rtfFirstIndent */ ME_GetSelectionParaFormat(info->editor, &fmt); - fmt.dwMask = PFM_STARTINDENT; - fmt.dxStartIndent = -fmt.dxOffset + info->rtfParam; + fmt.dwMask |= PFM_STARTINDENT; + fmt.dxStartIndent = info->rtfParam; + fmt.dxOffset = 0; break; case rtfRightIndent: fmt.dwMask = PFM_RIGHTINDENT;

1 0