October 2016 - Wine-commits

Vincent Povirk : gdiplus: Implement EMR_EXTSELECTCLIPRGN playback.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 069f20d1b30f745f284d3776d63974577422b8d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=069f20d1b30f745f284d3776d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 11 11:06:56 2016 -0500 gdiplus: Implement EMR_EXTSELECTCLIPRGN playback. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 45 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 32cd04e..69d8a16 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1040,21 +1040,27 @@ GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile *metafile, HENHMETAFILE * return Ok; } -static GpStatus METAFILE_PlaybackUpdateGdiTransform(GpMetafile *metafile) +static void METAFILE_GetFinalGdiTransform(const GpMetafile *metafile, XFORM *result) { - XFORM combined, final; const GpRectF *rect; const GpPointF *pt; /* This transforms metafile device space to output points. */ rect = &metafile->src_rect; pt = metafile->playback_points; - final.eM11 = (pt[1].X - pt[0].X) / rect->Width; - final.eM21 = (pt[2].X - pt[0].X) / rect->Height; - final.eDx = pt[0].X - final.eM11 * rect->X - final.eM21 * rect->Y; - final.eM12 = (pt[1].Y - pt[0].Y) / rect->Width; - final.eM22 = (pt[2].Y - pt[0].Y) / rect->Height; - final.eDy = pt[0].Y - final.eM12 * rect->X - final.eM22 * rect->Y; + result->eM11 = (pt[1].X - pt[0].X) / rect->Width; + result->eM21 = (pt[2].X - pt[0].X) / rect->Height; + result->eDx = pt[0].X - result->eM11 * rect->X - result->eM21 * rect->Y; + result->eM12 = (pt[1].Y - pt[0].Y) / rect->Width; + result->eM22 = (pt[2].Y - pt[0].Y) / rect->Height; + result->eDy = pt[0].Y - result->eM12 * rect->X - result->eM22 * rect->Y; +} + +static GpStatus METAFILE_PlaybackUpdateGdiTransform(GpMetafile *metafile) +{ + XFORM combined, final; + + METAFILE_GetFinalGdiTransform(metafile, &final); CombineTransform(&combined, &metafile->gdiworldtransform, &final); @@ -1154,7 +1160,6 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, case EMR_SETWINDOWEXTEX: case EMR_SETVIEWPORTORGEX: case EMR_SETVIEWPORTEXTEX: - case EMR_EXTSELECTCLIPRGN: case EMR_SCALEVIEWPORTEXTEX: case EMR_SCALEWINDOWEXTEX: case EMR_MODIFYWORLDTRANSFORM: @@ -1167,6 +1172,28 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, METAFILE_PlaybackUpdateGdiTransform(real_metafile); break; } + case EMR_EXTSELECTCLIPRGN: + { + DWORD rgndatasize = *(DWORD*)data; + DWORD mode = *(DWORD*)(data + 4); + const RGNDATA *rgndata = (const RGNDATA*)(data + 8); + HRGN hrgn = NULL; + + if (dataSize > 8) + { + XFORM final; + + METAFILE_GetFinalGdiTransform(metafile, &final); + + hrgn = ExtCreateRegion(&final, rgndatasize, rgndata); + } + + ExtSelectClipRgn(metafile->playback_dc, hrgn, mode); + + DeleteObject(hrgn); + + return Ok; + } default: break; }

1 0

Sebastian Lackner : user32/tests: Fix test failures on 64-bit testbot VMs.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: cf0f7fcfd53d57cd5aa5fed09dd14890144a034c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf0f7fcfd53d57cd5aa5fed09… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 11 18:11:19 2016 +0200 user32/tests: Fix test failures on 64-bit testbot VMs. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 69bdba8..17fc028 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1737,7 +1737,10 @@ static void test_handles( HWND hwnd ) h = SetClipboardData( 0xdeadbeef, hfixed ); ok( h == hfixed, "got %p\n", h ); ok( is_fixed( h ), "expected fixed mem %p\n", h ); +#ifndef _WIN64 + /* testing if hfixed2 is freed triggers an exception on Win64 */ ok( is_freed( hfixed2 ) || broken( !is_freed( hfixed2 )) /* < Vista */, "expected freed mem %p\n", hfixed2 ); +#endif r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() );

1 0

Huw Davies : wordpad: Switch the main menu to MENUEX so that the list menu can be given an id.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 2878d1e34107795f736a82a4a53d2b5bb1ede658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2878d1e34107795f736a82a4a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:01:09 2016 +0100 wordpad: Switch the main menu to MENUEX so that the list menu can be given an id. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 250 ++++++++++++++++++++++++-------------------- po/bg.po | 248 +++++++++++++++++++++++-------------------- po/ca.po | 250 ++++++++++++++++++++++++-------------------- po/cs.po | 250 ++++++++++++++++++++++++-------------------- po/da.po | 250 ++++++++++++++++++++++++-------------------- po/de.po | 250 ++++++++++++++++++++++++-------------------- po/el.po | 248 +++++++++++++++++++++++-------------------- po/en.po | 246 +++++++++++++++++++++++-------------------- po/en_US.po | 246 +++++++++++++++++++++++-------------------- po/eo.po | 248 +++++++++++++++++++++++-------------------- po/es.po | 250 ++++++++++++++++++++++++-------------------- po/fa.po | 246 +++++++++++++++++++++++-------------------- po/fi.po | 250 ++++++++++++++++++++++++-------------------- po/fr.po | 250 ++++++++++++++++++++++++-------------------- po/he.po | 248 +++++++++++++++++++++++-------------------- po/hi.po | 246 +++++++++++++++++++++++-------------------- po/hr.po | 250 ++++++++++++++++++++++++-------------------- po/hu.po | 250 ++++++++++++++++++++++++-------------------- po/it.po | 250 ++++++++++++++++++++++++-------------------- po/ja.po | 250 ++++++++++++++++++++++++-------------------- po/ko.po | 250 ++++++++++++++++++++++++-------------------- po/lt.po | 250 ++++++++++++++++++++++++-------------------- po/ml.po | 246 +++++++++++++++++++++++-------------------- po/nb_NO.po | 250 ++++++++++++++++++++++++-------------------- po/nl.po | 250 ++++++++++++++++++++++++-------------------- po/or.po | 246 +++++++++++++++++++++++-------------------- po/pa.po | 246 +++++++++++++++++++++++-------------------- po/pl.po | 250 ++++++++++++++++++++++++-------------------- po/pt_BR.po | 250 ++++++++++++++++++++++++-------------------- po/pt_PT.po | 250 ++++++++++++++++++++++++-------------------- po/rm.po | 246 +++++++++++++++++++++++-------------------- po/ro.po | 250 ++++++++++++++++++++++++-------------------- po/ru.po | 250 ++++++++++++++++++++++++-------------------- po/sk.po | 248 +++++++++++++++++++++++-------------------- po/sl.po | 250 ++++++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 248 +++++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 248 +++++++++++++++++++++++-------------------- po/sv.po | 250 ++++++++++++++++++++++++-------------------- po/te.po | 246 +++++++++++++++++++++++-------------------- po/th.po | 248 +++++++++++++++++++++++-------------------- po/tr.po | 250 ++++++++++++++++++++++++-------------------- po/uk.po | 250 ++++++++++++++++++++++++-------------------- po/wa.po | 246 +++++++++++++++++++++++-------------------- po/wine.pot | 246 +++++++++++++++++++++++-------------------- po/zh_CN.po | 250 ++++++++++++++++++++++++-------------------- po/zh_TW.po | 250 ++++++++++++++++++++++++-------------------- programs/wordpad/wordpad.h | 1 + programs/wordpad/wordpad.rc | 22 ++-- 48 files changed, 6346 insertions(+), 5117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2878d1e34107795f736a8…

1 0

Huw Davies : wordpad: Remove BTNS_BUTTON from the toolbar style - it' s a button style.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 6ac0dd03522b644b1dead23379f9b67c920ddd6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac0dd03522b644b1dead2337… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:01:10 2016 +0100 wordpad: Remove BTNS_BUTTON from the toolbar style - it's a button style. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index dc3918e..a26faab 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1814,7 +1814,7 @@ static LRESULT OnCreate( HWND hWnd ) if(!SendMessageW(hReBarWnd, RB_SETBARINFO, 0, (LPARAM)&rbi)) return -1; - hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS|BTNS_BUTTON, + hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS, IDC_TOOLBAR, 1, hInstance, IDB_TOOLBAR, NULL, 0, @@ -1876,7 +1876,7 @@ static LRESULT OnCreate( HWND hWnd ) SendMessageW(hReBarWnd, RB_INSERTBANDW, -1, (LPARAM)&rbb); hFormatBarWnd = CreateToolbarEx(hReBarWnd, - CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS | BTNS_BUTTON, + CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS, IDC_FORMATBAR, 8, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON)); AddButton(hFormatBarWnd, 0, ID_FORMAT_BOLD);

1 0

Huw Davies : wordpad: Add a dropdown menu to the bullet button.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 6d263cd490bbab08480d4187b92243d6998ffebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d263cd490bbab08480d4187b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:01:11 2016 +0100 wordpad: Add a dropdown menu to the bullet button. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 65 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 14 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index a26faab..8d07d7b 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -156,7 +156,7 @@ static int MessageBoxWithResStringW(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption } -static void AddButton(HWND hwndToolBar, int nImage, int nCommand) +static void AddButtonStyle(HWND hwndToolBar, int nImage, int nCommand, BYTE style) { TBBUTTON button; @@ -164,12 +164,17 @@ static void AddButton(HWND hwndToolBar, int nImage, int nCommand) button.iBitmap = nImage; button.idCommand = nCommand; button.fsState = TBSTATE_ENABLED; - button.fsStyle = BTNS_BUTTON; + button.fsStyle = style; button.dwData = 0; button.iString = -1; SendMessageW(hwndToolBar, TB_ADDBUTTONSW, 1, (LPARAM)&button); } +static void AddButton(HWND hwndToolBar, int nImage, int nCommand) +{ + AddButtonStyle(hwndToolBar, nImage, nCommand, BTNS_BUTTON); +} + static void AddSeparator(HWND hwndToolBar) { TBBUTTON button; @@ -1879,6 +1884,8 @@ static LRESULT OnCreate( HWND hWnd ) CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS, IDC_FORMATBAR, 8, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON)); + SendMessageW(hFormatBarWnd, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_DRAWDDARROWS); + AddButton(hFormatBarWnd, 0, ID_FORMAT_BOLD); AddButton(hFormatBarWnd, 1, ID_FORMAT_ITALIC); AddButton(hFormatBarWnd, 2, ID_FORMAT_UNDERLINE); @@ -1888,7 +1895,7 @@ static LRESULT OnCreate( HWND hWnd ) AddButton(hFormatBarWnd, 5, ID_ALIGN_CENTER); AddButton(hFormatBarWnd, 6, ID_ALIGN_RIGHT); AddSeparator(hFormatBarWnd); - AddButton(hFormatBarWnd, 7, ID_BULLETONOFF); + AddButtonStyle(hFormatBarWnd, 7, ID_BULLETONOFF, BTNS_DROPDOWN); SendMessageW(hFormatBarWnd, TB_AUTOSIZE, 0, 0); @@ -2007,6 +2014,7 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam) NMHDR *pHdr = (NMHDR *)lParam; HWND hwndFontList = GetDlgItem(hwndReBar, IDC_FONTLIST); HWND hwndSizeList = GetDlgItem(hwndReBar, IDC_SIZELIST); + HWND hwndFormatBar = GetDlgItem(hwndReBar, IDC_FORMATBAR); if (pHdr->hwndFrom == hwndFontList || pHdr->hwndFrom == hwndSizeList) { @@ -2024,22 +2032,51 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam) return 0; } - if (pHdr->hwndFrom != hwndEditor) + if (pHdr->hwndFrom == hwndFormatBar) + { + if (pHdr->code == TBN_DROPDOWN) + { + NMTOOLBARW *tb_notify = (NMTOOLBARW *)lParam; + HMENU menu = GetMenu( hWnd ); + MENUITEMINFOW info; + TPMPARAMS params; + RECT rc; + + if (!menu) return 0; + info.cbSize = sizeof(info); + info.fMask = MIIM_SUBMENU; + GetMenuItemInfoW( menu, ID_LISTMENU, FALSE, &info ); + if (!info.hSubMenu) return 0; + + SendMessageW( tb_notify->hdr.hwndFrom, TB_GETRECT, (WPARAM)tb_notify->iItem, (LPARAM)&rc ); + MapWindowPoints( tb_notify->hdr.hwndFrom, HWND_DESKTOP, (LPPOINT)&rc, 2 ); + + params.cbSize = sizeof(params); + params.rcExclude = rc; + TrackPopupMenuEx( info.hSubMenu, + TPM_LEFTALIGN | TPM_LEFTBUTTON | TPM_VERTICAL, + rc.left, rc.bottom, hWnd, &params ); + } + return 0; + } - if (pHdr->code == EN_SELCHANGE) + if (pHdr->hwndFrom == hwndEditor) { - SELCHANGE *pSC = (SELCHANGE *)lParam; - char buf[128]; + if (pHdr->code == EN_SELCHANGE) + { + SELCHANGE *pSC = (SELCHANGE *)lParam; + char buf[128]; - update_font_list(); + update_font_list(); - sprintf( buf,"selection = %d..%d, line count=%ld", - pSC->chrg.cpMin, pSC->chrg.cpMax, - SendMessageW(hwndEditor, EM_GETLINECOUNT, 0, 0)); - SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf); - SendMessageW(hWnd, WM_USER, 0, 0); - return 1; + sprintf( buf,"selection = %d..%d, line count=%ld", + pSC->chrg.cpMin, pSC->chrg.cpMax, + SendMessageW(hwndEditor, EM_GETLINECOUNT, 0, 0)); + SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf); + SendMessageW(hWnd, WM_USER, 0, 0); + return 1; + } } return 0; }

1 0

Huw Davies : wordpad: Keep the list indentation aligned when the margins are changed.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 9a1cc45edd8d1db98fbcf78697f4100ddb329b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a1cc45edd8d1db98fbcf7869… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:01:12 2016 +0100 wordpad: Keep the list indentation aligned when the margins are changed. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 8d07d7b..f0a7d14 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1579,8 +1579,15 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, int index; float num; int ret = 0; - PARAFORMAT pf; + PARAFORMAT2 pf; UNIT unit; + BOOL in_list = FALSE; + + pf.cbSize = sizeof(pf); + pf.dwMask = PFM_NUMBERING; + SendMessageW(hEditorWnd, EM_GETPARAFORMAT, 0, (LPARAM)&pf); + if ((pf.dwMask & PFM_NUMBERING) && pf.wNumbering) + in_list = TRUE; index = SendMessageW(hListWnd, CB_GETCURSEL, 0, 0); pf.wAlignment = ALIGNMENT_VALUES[index]; @@ -1630,6 +1637,12 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, pf.cbSize = sizeof(pf); pf.dwMask = PFM_ALIGNMENT | PFM_OFFSET | PFM_RIGHTINDENT | PFM_STARTINDENT; + if (in_list) + { + pf.wNumberingTab = max(pf.dxOffset, 0); + pf.dwMask |= PFM_NUMBERINGTAB; + } + SendMessageW(hEditorWnd, EM_SETPARAFORMAT, 0, (LPARAM)&pf); } }

1 0

Huw Davies : riched20: The new eop style when typing a list is a copy of the existing eop style.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 2019ec38dbee432d56a7648545992d3a34741cbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2019ec38dbee432d56a764854… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:03:59 2016 +0100 riched20: The new eop style when typing a list is a copy of the existing eop style. Normally the new eop style is the insert style, however in a list the existing eop style is used. This prevents the list label style from changing when the new eop is inserted. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 162daa8..8b94ccf 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2404,7 +2404,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) int from, to; const WCHAR endl = '\r'; const WCHAR endlv10[] = {'\r','\n'}; - ME_Style *style; + ME_Style *style, *eop_style; if (editor->styleFlags & ES_READONLY) { MessageBeep(MB_ICONERROR); @@ -2501,14 +2501,22 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) } style = ME_GetInsertStyle(editor, 0); + + /* Normally the new eop style is the insert style, however in a list it is copied from the existing + eop style (this prevents the list label style changing when the new eop is inserted). + No extra ref is taken here on eop_style. */ + if (para->member.para.fmt.wNumbering) + eop_style = para->member.para.eop_run->style; + else + eop_style = style; ME_ContinueCoalescingTransaction(editor); if (shift_is_down) ME_InsertEndRowFromCursor(editor, 0); else if (!editor->bEmulateVersion10) - ME_InsertTextFromCursor(editor, 0, &endl, 1, style); + ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); else - ME_InsertTextFromCursor(editor, 0, endlv10, 2, style); + ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); ME_CommitCoalescingUndo(editor); SetCursor(NULL);

1 0

Huw Davies : riched20: Don't emit paragraph props if they' re the same as the previous paragraph's.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 8739f450cea348b4d68f44477c24609e81c34d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8739f450cea348b4d68f44477… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:04:00 2016 +0100 riched20: Don't emit paragraph props if they're the same as the previous paragraph's. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 0204215..27e07b1 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -429,6 +429,10 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, PARAFORMAT2 *fmt = &para->member.para.fmt; char props[STREAMOUT_BUFFER_SIZE] = ""; int i; + ME_Paragraph *prev_para = NULL; + + if (para->member.para.prev_para->type == diParagraph) + prev_para = &para->member.para.prev_para->member.para; if (!editor->bEmulateVersion10) { /* v4.1 */ if (para->member.para.nFlags & MEPF_ROWSTART) { @@ -462,7 +466,9 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, } } - /* TODO: Don't emit anything if the last PARAFORMAT2 is inherited */ + if (prev_para && !memcmp( fmt, &prev_para->fmt, sizeof(*fmt) )) + return TRUE; + if (!ME_StreamOutPrint(pStream, "\\pard")) return FALSE;

1 0

Huw Davies : riched20: Don't emit default values.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 1e1ee175f08b8ae88a5098c206bc69e2710d4e68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e1ee175f08b8ae88a5098c20… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:04:01 2016 +0100 riched20: Don't emit default values. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 27e07b1..a2ec8f8 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -549,11 +549,11 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, if (!(editor->bEmulateVersion10 && /* v1.0 - 3.0 */ fmt->dwMask & PFM_TABLE && fmt->wEffects & PFE_TABLE)) { - if (fmt->dwMask & PFM_OFFSET) + if (fmt->dxOffset) sprintf(props + strlen(props), "\\li%d", fmt->dxOffset); - if (fmt->dwMask & PFM_OFFSETINDENT || fmt->dwMask & PFM_STARTINDENT) + if (fmt->dxStartIndent) sprintf(props + strlen(props), "\\fi%d", fmt->dxStartIndent); - if (fmt->dwMask & PFM_RIGHTINDENT) + if (fmt->dxRightIndent) sprintf(props + strlen(props), "\\ri%d", fmt->dxRightIndent); if (fmt->dwMask & PFM_TABSTOPS) { static const char * const leader[6] = { "", "\\tldot", "\\tlhyph", "\\tlul", "\\tlth", "\\tleq" }; @@ -579,11 +579,11 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, } } } - if (fmt->dwMask & PFM_SPACEAFTER) + if (fmt->dySpaceAfter) sprintf(props + strlen(props), "\\sa%d", fmt->dySpaceAfter); - if (fmt->dwMask & PFM_SPACEBEFORE) + if (fmt->dySpaceBefore) sprintf(props + strlen(props), "\\sb%d", fmt->dySpaceBefore); - if (fmt->dwMask & PFM_STYLE) + if (fmt->sStyle != -1) sprintf(props + strlen(props), "\\s%d", fmt->sStyle); if (fmt->dwMask & PFM_SHADING) {

1 0

Huw Davies : riched20: Add a helper to add a font to the font table.
by Alexandre Julliard 11 Oct '16

11 Oct '16

Module: wine Branch: master Commit: 6ee979c7e6c0d32aedae638f432f51ee97077d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee979c7e6c0d32aedae638f4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 13:04:02 2016 +0100 riched20: Add a helper to add a font to the font table. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index a2ec8f8..b448f43 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -213,6 +213,29 @@ ME_StreamOutRTFHeader(ME_OutStream *pStream, int dwFormat) return TRUE; } +static void add_font_to_fonttbl( ME_OutStream *stream, ME_Style *style ) +{ + ME_FontTableItem *table = stream->fonttbl; + CHARFORMAT2W *fmt = &style->fmt; + WCHAR *face = fmt->szFaceName; + BYTE charset = (fmt->dwMask & CFM_CHARSET) ? fmt->bCharSet : DEFAULT_CHARSET; + int i; + + if (fmt->dwMask & CFM_FACE) + { + for (i = 0; i < stream->nFontTblLen; i++) + if (table[i].bCharSet == charset + && (table[i].szFaceName == face || !lstrcmpW(table[i].szFaceName, face))) + break; + + if (i == stream->nFontTblLen && i < STREAMOUT_FONTTBL_SIZE) + { + table[i].bCharSet = charset; + table[i].szFaceName = face; + stream->nFontTblLen++; + } + } +} static BOOL ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, @@ -223,26 +246,13 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, unsigned int i; ME_DisplayItem *pLastPara = ME_GetParagraph(pLastRun); ME_DisplayItem *pCell = NULL; - + do { CHARFORMAT2W *fmt = &item->member.run.style->fmt; COLORREF crColor; - if (fmt->dwMask & CFM_FACE) { - WCHAR *face = fmt->szFaceName; - BYTE bCharSet = (fmt->dwMask & CFM_CHARSET) ? fmt->bCharSet : DEFAULT_CHARSET; - - for (i = 0; i < pStream->nFontTblLen; i++) - if (table[i].bCharSet == bCharSet - && (table[i].szFaceName == face || !lstrcmpW(table[i].szFaceName, face))) - break; - if (i == pStream->nFontTblLen && i < STREAMOUT_FONTTBL_SIZE) { - table[i].bCharSet = bCharSet; - table[i].szFaceName = face; - pStream->nFontTblLen++; - } - } - + add_font_to_fonttbl( pStream, item->member.run.style ); + if (fmt->dwMask & CFM_COLOR && !(fmt->dwEffects & CFE_AUTOCOLOR)) { crColor = fmt->crTextColor; for (i = 1; i < pStream->nColorTblLen; i++)

1 0