October 2016 - Wine-commits

Huw Davies : riched20: Implement parsing of the paragraph numbering destination.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: master Commit: 880b45ffb011a191c8b535cb346f88c220d74db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=880b45ffb011a191c8b535cb3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 7 10:49:32 2016 +0100 riched20: Implement parsing of the paragraph numbering destination. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 117 ++++++++++++++++++++++++++++++++++++++----- dlls/riched20/reader.c | 4 +- dlls/riched20/tests/editor.c | 69 +++++++++++++++++++++++++ 3 files changed, 176 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index da9425e..162daa8 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -763,18 +763,6 @@ void ME_RTFParAttrHook(RTF_Info *info) info->fmt.dwMask |= PFM_NUMBERING; info->fmt.wNumbering = 2; /* FIXME: MSDN says it's not used ?? */ break; - case rtfParNumDecimal: - info->fmt.dwMask |= PFM_NUMBERING; - info->fmt.wNumbering = 2; /* FIXME: MSDN says it's not used ?? */ - break; - case rtfParNumIndent: - info->fmt.dwMask |= PFM_NUMBERINGTAB; - info->fmt.wNumberingTab = info->rtfParam; - break; - case rtfParNumStartAt: - info->fmt.dwMask |= PFM_NUMBERINGSTART; - info->fmt.wNumberingStart = info->rtfParam; - break; case rtfBorderLeft: info->borderType = RTFBorderParaLeft; info->fmt.wBorders |= 1; @@ -1432,6 +1420,110 @@ static void ME_RTFReadObjectGroup(RTF_Info *info) RTFRouteToken(info); /* feed "}" back to router */ } +static void ME_RTFReadParnumGroup( RTF_Info *info ) +{ + int level = 1, type = -1; + WORD indent = 0, start = 1; + WCHAR txt_before = 0, txt_after = 0; + + for (;;) + { + RTFGetToken( info ); + + if (RTFCheckCMM( info, rtfControl, rtfDestination, rtfParNumTextBefore ) || + RTFCheckCMM( info, rtfControl, rtfDestination, rtfParNumTextAfter )) + { + int loc = info->rtfMinor; + + RTFGetToken( info ); + if (info->rtfClass == rtfText) + { + if (loc == rtfParNumTextBefore) + txt_before = info->rtfMajor; + else + txt_after = info->rtfMajor; + continue; + } + /* falling through to catch EOFs and group level changes */ + } + + if (info->rtfClass == rtfEOF) + return; + + if (RTFCheckCM( info, rtfGroup, rtfEndGroup )) + { + if (--level == 0) break; + continue; + } + + if (RTFCheckCM( info, rtfGroup, rtfBeginGroup )) + { + level++; + continue; + } + + /* Ignore non para-attr */ + if (!RTFCheckCM( info, rtfControl, rtfParAttr )) + continue; + + switch (info->rtfMinor) + { + case rtfParLevel: /* Para level is ignored */ + case rtfParSimple: + break; + case rtfParBullet: + type = PFN_BULLET; + break; + + case rtfParNumDecimal: + type = PFN_ARABIC; + break; + case rtfParNumULetter: + type = PFN_UCLETTER; + break; + case rtfParNumURoman: + type = PFN_UCROMAN; + break; + case rtfParNumLLetter: + type = PFN_LCLETTER; + break; + case rtfParNumLRoman: + type = PFN_LCROMAN; + break; + + case rtfParNumIndent: + indent = info->rtfParam; + break; + case rtfParNumStartAt: + start = info->rtfParam; + break; + } + } + + if (type != -1) + { + info->fmt.dwMask |= (PFM_NUMBERING | PFM_NUMBERINGSTART | PFM_NUMBERINGSTYLE | PFM_NUMBERINGTAB); + info->fmt.wNumbering = type; + info->fmt.wNumberingStart = start; + info->fmt.wNumberingStyle = PFNS_PAREN; + if (type != PFN_BULLET) + { + if (txt_before == 0 && txt_after == 0) + info->fmt.wNumberingStyle = PFNS_PLAIN; + else if (txt_after == '.') + info->fmt.wNumberingStyle = PFNS_PERIOD; + else if (txt_before == '(' && txt_after == ')') + info->fmt.wNumberingStyle = PFNS_PARENS; + } + info->fmt.wNumberingTab = indent; + } + + TRACE("type %d indent %d start %d txt before %04x txt after %04x\n", + type, indent, start, txt_before, txt_after); + + RTFRouteToken( info ); /* feed "}" back to router */ +} + static void ME_RTFReadHook(RTF_Info *info) { switch(info->rtfClass) @@ -1581,6 +1673,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre RTFSetDestinationCallback(&parser, rtfShpPict, ME_RTFReadShpPictGroup); RTFSetDestinationCallback(&parser, rtfPict, ME_RTFReadPictGroup); RTFSetDestinationCallback(&parser, rtfObject, ME_RTFReadObjectGroup); + RTFSetDestinationCallback(&parser, rtfParNumbering, ME_RTFReadParnumGroup); if (!parser.editor->bEmulateVersion10) /* v4.1 */ { RTFSetDestinationCallback(&parser, rtfNoNestTables, RTFSkipGroup); diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 2e5dafd..a05b7fc 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -1774,8 +1774,8 @@ static RTFKey rtfKey[] = { rtfDestination, rtfFooterFirst, "footerf", 0 }, { rtfDestination, rtfParNumText, "pntext", 0 }, { rtfDestination, rtfParNumbering, "pn", 0 }, - { rtfDestination, rtfParNumTextAfter, "pntexta", 0 }, - { rtfDestination, rtfParNumTextBefore, "pntextb", 0 }, + { rtfDestination, rtfParNumTextAfter, "pntxta", 0 }, + { rtfDestination, rtfParNumTextBefore, "pntxtb", 0 }, { rtfDestination, rtfBookmarkStart, "bkmkstart", 0 }, { rtfDestination, rtfBookmarkEnd, "bkmkend", 0 }, { rtfDestination, rtfPict, "pict", 0 }, diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ad51e64..d694d28 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8414,6 +8414,74 @@ static void test_eop_char_fmt(void) DestroyWindow( edit ); } +static void test_para_numbering(void) +{ + HWND edit = new_richeditW( NULL ); + const char *numbers = "{\\rtf1{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset0 Arial;}{\\f1\\fnil\\fcharset2 Symbol;}}" + "\\pard{\\pntext\\f0 3.\\tab}{\\*\\pn\\pnlvlbody\\pnfs32\\pnf0\\pnindent1000\\pnstart2\\pndec{\\pntxta.}}" + "\\fs20\\fi200\\li360\\f0 First\\par" + "{\\pntext\\f0 4.\\tab}\\f0 Second\\par" + "{\\pntext\\f0 6.\\tab}\\f0 Third\\par}"; + const WCHAR expect_numbers_txt[] = {'F','i','r','s','t','\r','S','e','c','o','n','d','\r','T','h','i','r','d',0}; + EDITSTREAM es; + WCHAR buf[80]; + LRESULT result; + PARAFORMAT2 fmt, fmt2; + GETTEXTEX get_text; + CHARFORMAT2W cf; + + get_text.cb = sizeof(buf); + get_text.flags = GT_RAWTEXT; + get_text.codepage = 1200; + get_text.lpDefaultChar = NULL; + get_text.lpUsedDefChar = NULL; + + es.dwCookie = (DWORD_PTR)&numbers; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + result = SendMessageA( edit, EM_STREAMIN, SF_RTF, (LPARAM)&es ); + ok( result == lstrlenW( expect_numbers_txt ), "got %ld\n", result ); + + result = SendMessageW( edit, EM_GETTEXTEX, (WPARAM)&get_text, (LPARAM)buf ); + ok( result == lstrlenW( expect_numbers_txt ), "got %ld\n", result ); + ok( !lstrcmpW( buf, expect_numbers_txt ), "got %s\n", wine_dbgstr_w(buf) ); + + SendMessageW( edit, EM_SETSEL, 1, 1 ); + memset( &fmt, 0, sizeof(fmt) ); + fmt.cbSize = sizeof(fmt); + fmt.dwMask = PFM_ALL2; + SendMessageW( edit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); + ok( fmt.wNumbering == PFN_ARABIC, "got %d\n", fmt.wNumbering ); + ok( fmt.wNumberingStart == 2, "got %d\n", fmt.wNumberingStart ); + ok( fmt.wNumberingStyle == PFNS_PERIOD, "got %04x\n", fmt.wNumberingStyle ); + ok( fmt.wNumberingTab == 1000, "got %d\n", fmt.wNumberingTab ); + ok( fmt.dxStartIndent == 560, "got %d\n", fmt.dxStartIndent ); + ok( fmt.dxOffset == -200, "got %d\n", fmt.dxOffset ); + + /* Second para should have identical fmt */ + SendMessageW( edit, EM_SETSEL, 10, 10 ); + memset( &fmt2, 0, sizeof(fmt2) ); + fmt2.cbSize = sizeof(fmt2); + fmt2.dwMask = PFM_ALL2; + SendMessageW( edit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt2 ); + ok( !memcmp( &fmt, &fmt2, sizeof(fmt) ), "format mismatch\n" ); + + /* Check the eop heights - this determines the label height */ + SendMessageW( edit, EM_SETSEL, 12, 13 ); + cf.cbSize = sizeof(cf); + cf.dwMask = CFM_SIZE; + SendMessageW( edit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf ); + ok( cf.yHeight == 200, "got %d\n", cf.yHeight ); + + SendMessageW( edit, EM_SETSEL, 18, 19 ); + cf.cbSize = sizeof(cf); + cf.dwMask = CFM_SIZE; + SendMessageW( edit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf ); + ok( cf.yHeight == 200, "got %d\n", cf.yHeight ); + + DestroyWindow( edit ); +} + START_TEST( editor ) { BOOL ret; @@ -8486,6 +8554,7 @@ START_TEST( editor ) test_rtf_specials(); test_background(); test_eop_char_fmt(); + test_para_numbering(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Huw Davies : riched20: Add the ability to create ME_Strings from constants.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: master Commit: 1abe4cc738699f72479e72712b8fdb36e3a91431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1abe4cc738699f72479e72712… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 7 10:49:33 2016 +0100 riched20: Add the ability to create ME_Strings from constants. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 1 + dlls/riched20/editstr.h | 1 + dlls/riched20/string.c | 37 ++++++++++++++++++++++++++++++++----- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index b0a8a1a..24c856b 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -100,6 +100,7 @@ void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN; /* string.c */ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars) DECLSPEC_HIDDEN; +ME_String *ME_MakeStringConst(const WCHAR *str, int len) DECLSPEC_HIDDEN; void ME_DestroyString(ME_String *s) DECLSPEC_HIDDEN; BOOL ME_AppendString(ME_String *s, const WCHAR *append, int len) DECLSPEC_HIDDEN; ME_String *ME_VSplitString(ME_String *orig, int nVPos) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 35555a9..0e60a3d 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -58,6 +58,7 @@ typedef struct tagME_String { WCHAR *szData; int nLen, nBuffer; + void (*free)(struct tagME_String *); } ME_String; typedef struct tagME_FontCacheItem diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index ef06bac..47aceca 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -27,10 +27,37 @@ static int ME_GetOptimalBuffer(int nLen) return ((sizeof(WCHAR) * nLen) + 128) & ~63; } +static ME_String *make_string( void (*free)(ME_String *) ) +{ + ME_String *s = heap_alloc( sizeof(*s) ); + + if (s) s->free = free; + return s; +} + +/* Create a ME_String using the const string provided. + * str must exist for the lifetime of the returned ME_String. + */ +ME_String *ME_MakeStringConst(const WCHAR *str, int len) +{ + ME_String *s = make_string( NULL ); + if (!s) return NULL; + + s->szData = (WCHAR *)str; + s->nLen = len; + s->nBuffer = 0; + return s; +} + +static void heap_string_free(ME_String *s) +{ + heap_free( s->szData ); +} + /* Create a buffer (uninitialized string) of size nMaxChars */ static ME_String *ME_MakeStringB(int nMaxChars) { - ME_String *s = heap_alloc( sizeof(*s) ); + ME_String *s = make_string( heap_string_free ); if (!s) return NULL; s->nLen = nMaxChars; @@ -69,7 +96,7 @@ ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars) void ME_DestroyString(ME_String *s) { if (!s) return; - heap_free( s->szData ); + if (s->free) s->free( s ); heap_free( s ); } @@ -78,6 +105,7 @@ BOOL ME_InsertString(ME_String *s, int ofs, const WCHAR *insert, int len) DWORD new_len = s->nLen + len + 1; WCHAR *new; + assert( s->nBuffer ); /* Not a const string */ assert( ofs <= s->nLen ); if( new_len > s->nBuffer ) @@ -104,9 +132,7 @@ ME_String *ME_VSplitString(ME_String *orig, int charidx) { ME_String *s; - /*if (charidx<0) charidx = 0; - if (charidx>orig->nLen) charidx = orig->nLen; - */ + assert(orig->nBuffer); /* Not a const string */ assert(charidx>=0); assert(charidx<=orig->nLen); @@ -122,6 +148,7 @@ void ME_StrDeleteV(ME_String *s, int nVChar, int nChars) { int end_ofs = nVChar + nChars; + assert(s->nBuffer); /* Not a const string */ assert(nChars >= 0); assert(nVChar >= 0); assert(end_ofs <= s->nLen);

1 0

Huw Davies : riched20: Maintain a ptr to the end-of-paragraph run.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: master Commit: d132009ae99426bcab8adea89d17ff46e60f9401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d132009ae99426bcab8adea89… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 7 10:49:34 2016 +0100 riched20: Maintain a ptr to the end-of-paragraph run. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editstr.h | 1 + dlls/riched20/para.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 0e60a3d..fb88f71 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -201,6 +201,7 @@ typedef struct tagME_Paragraph POINT pt; int nHeight, nWidth; int nRows; + ME_Run *eop_run; /* ptr to the end-of-para run */ struct tagME_DisplayItem *prev_para, *next_para; } ME_Paragraph; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index e246e37..0174252 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -81,6 +81,8 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) run->member.run.len = eol_len; run->member.run.para = &para->member.para; + para->member.para.eop_run = &run->member.run; + ME_InsertBefore(text->pLast, para); ME_InsertBefore(text->pLast, run); para->member.para.prev_para = text->pFirst; @@ -272,6 +274,10 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, ME_InsertBefore(run, new_para); ME_InsertBefore(new_para, end_run); + /* Fix up the paras' eop_run ptrs */ + new_para->member.para.eop_run = run_para->member.para.eop_run; + run_para->member.para.eop_run = &end_run->member.run; + if (!editor->bEmulateVersion10) { /* v4.1 */ if (paraFlags & (MEPF_ROWSTART|MEPF_CELL)) { @@ -429,6 +435,9 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, pTmp->member.run.para = &tp->member.para; } while(1); + /* Fix up the para's eop_run ptr */ + tp->member.para.eop_run = pNext->member.para.eop_run; + ME_Remove(pRun); ME_DestroyDisplayItem(pRun);

1 0

Huw Davies : riched20: Add support for displaying bulleted lists.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: master Commit: 8a428d52a7e1d2b3851cfe782169c5ed1d55545a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a428d52a7e1d2b3851cfe782… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 7 10:49:35 2016 +0100 riched20: Add support for displaying bulleted lists. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 ++ dlls/riched20/editstr.h | 9 +++++++++ dlls/riched20/list.c | 1 + dlls/riched20/paint.c | 20 ++++++++++++++++++++ dlls/riched20/para.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/wrap.c | 33 +++++++++++++++++++++++++++++---- 6 files changed, 110 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 24c856b..7d46692 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -217,6 +217,8 @@ BOOL ME_SetSelectionParaFormat(ME_TextEditor *editor, const PARAFORMAT2 *pFmt) D void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; void ME_MarkAllForWrapping(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; +void para_num_init( ME_Context *c, ME_Paragraph *para ) DECLSPEC_HIDDEN; +void para_num_clear( struct para_num *pn ) DECLSPEC_HIDDEN; /* paint.c */ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index fb88f71..eb4d9f5 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -188,6 +188,14 @@ typedef struct tagME_BorderRect ME_Border right; } ME_BorderRect; +struct para_num +{ + ME_Style *style; + ME_String *text; + INT width; + POINT pt; +}; + typedef struct tagME_Paragraph { PARAFORMAT2 fmt; @@ -201,6 +209,7 @@ typedef struct tagME_Paragraph POINT pt; int nHeight, nWidth; int nRows; + struct para_num para_num; ME_Run *eop_run; /* ptr to the end-of-para run */ struct tagME_DisplayItem *prev_para, *next_para; } ME_Paragraph; diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index 15b944c..d321446 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -164,6 +164,7 @@ void ME_DestroyDisplayItem(ME_DisplayItem *item) if (item->type==diParagraph) { ME_DestroyString(item->member.para.text); + para_num_clear( &item->member.para.para_num ); } if (item->type==diRun) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 8e51772..7c17513 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -898,6 +898,25 @@ static void ME_DrawTableBorders(ME_Context *c, ME_DisplayItem *paragraph) } } +static void draw_para_number( ME_Context *c, ME_DisplayItem *p ) +{ + ME_Paragraph *para = &p->member.para; + HFONT old_font; + int x, y; + + if (para->fmt.wNumbering) + { + old_font = ME_SelectStyleFont( c, para->para_num.style ); + + x = c->pt.x + para->para_num.pt.x; + y = c->pt.y + para->pt.y + para->para_num.pt.y; + + ExtTextOutW( c->hDC, x, y, 0, NULL, para->para_num.text->szData, para->para_num.text->nLen, NULL ); + + ME_UnselectStyleFont( c, para->para_num.style, old_font ); + } +} + static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { int align = SetTextAlign(c->hDC, TA_BASELINE); @@ -1023,6 +1042,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) } ME_DrawTableBorders(c, paragraph); + draw_para_number(c, paragraph); SetTextAlign(c->hDC, align); } diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 0174252..3c62da2 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -128,6 +128,55 @@ static void ME_UpdateTableFlags(ME_DisplayItem *para) para->member.para.fmt.wEffects &= ~PFE_TABLE; } +void para_num_init( ME_Context *c, ME_Paragraph *para ) +{ + ME_Style *style; + CHARFORMAT2W cf; + static const WCHAR bullet_font[] = {'S','y','m','b','o','l',0}; + static const WCHAR bullet_str[] = {0xb7, 0}; + static const WCHAR spaceW[] = {' ', 0}; + HFONT old_font; + SIZE sz; + + if (para->para_num.style && para->para_num.text) return; + + if (!para->para_num.style) + { + style = para->eop_run->style; + + cf.cbSize = sizeof(cf); + cf.dwMask = CFM_FACE | CFM_CHARSET; + memcpy( cf.szFaceName, bullet_font, sizeof(bullet_font) ); + cf.bCharSet = SYMBOL_CHARSET; + style = ME_ApplyStyle( c->editor, style, &cf ); + + para->para_num.style = style; + } + + if (!para->para_num.text) + { + para->para_num.text = ME_MakeStringConst( bullet_str, 1 ); + } + + old_font = ME_SelectStyleFont( c, para->para_num.style ); + GetTextExtentPointW( c->hDC, para->para_num.text->szData, para->para_num.text->nLen, &sz ); + para->para_num.width = sz.cx; + GetTextExtentPointW( c->hDC, spaceW, 1, &sz ); + para->para_num.width += sz.cx; + ME_UnselectStyleFont( c, para->para_num.style, old_font ); +} + +void para_num_clear( struct para_num *pn ) +{ + if (pn->style) + { + ME_ReleaseStyle( pn->style ); + pn->style = NULL; + } + ME_DestroyString( pn->text ); + pn->text = NULL; +} + static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_Paragraph *para, const PARAFORMAT2 *pFmt) { PARAFORMAT2 copy; diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 4c73c5d..e3a70f0 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -37,8 +37,10 @@ typedef struct tagME_WrapContext { ME_Style *style; ME_Context *context; - int nLeftMargin, nRightMargin, nFirstMargin; - int nAvailWidth; + int nLeftMargin, nRightMargin; + int nFirstMargin; /* Offset to first line's text, always to the text itself even if a para number is present */ + int nParaNumOffset; /* Offset to the para number */ + int nAvailWidth; /* Width avail for text to wrap into. Does not include any para number text */ int nRow; POINT pt; BOOL bOverflown, bWordWrap; @@ -303,7 +305,12 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) BOOL bSkippingSpaces = TRUE; int ascent = 0, descent = 0, width=0, shift = 0, align = 0; - /* wrap text */ + /* Include height of para numbering label */ + if (wc->nRow == 0 && para->fmt.wNumbering) + { + ascent = para->para_num.style->tm.tmAscent; + descent = para->para_num.style->tm.tmDescent; + } for (p = pEnd->prev; p!=wc->pRowStart->prev; p = p->prev) { @@ -367,6 +374,13 @@ static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) p->member.run.pt.x += row->member.row.nLMargin+shift; } } + + if (wc->nRow == 0 && para->fmt.wNumbering) + { + para->para_num.pt.x = wc->nParaNumOffset + shift; + para->para_num.pt.y = wc->pt.y + row->member.row.nBaseline; + } + ME_InsertBefore(wc->pRowStart, row); wc->nRow++; wc->pt.y += row->member.row.nHeight; @@ -869,6 +883,9 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { } ME_PrepareParagraphForWrapping(c, tp); + /* Calculate paragraph numbering label */ + para_num_init( c, &tp->member.para ); + /* For now treating all non-password text as complex for better testing */ if (!c->editor->cPasswordMask /* && ScriptIsComplex( tp->member.para.text->szData, tp->member.para.text->nLen, SIC_COMPLEX ) == S_OK */) @@ -883,6 +900,7 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { wc.pPara = tp; /* wc.para_style = tp->member.para.style; */ wc.style = NULL; + wc.nParaNumOffset = 0; if (tp->member.para.nFlags & MEPF_ROWEND) { wc.nFirstMargin = wc.nLeftMargin = wc.nRightMargin = 0; } else { @@ -890,8 +908,15 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { if (tp->member.para.pCell) { dxStartIndent += ME_GetTableRowEnd(tp)->member.para.fmt.dxOffset; } + wc.nLeftMargin = ME_twips2pointsX(c, dxStartIndent + pFmt->dxOffset); wc.nFirstMargin = ME_twips2pointsX(c, dxStartIndent); - wc.nLeftMargin = wc.nFirstMargin + ME_twips2pointsX(c, pFmt->dxOffset); + if (pFmt->wNumbering) + { + wc.nParaNumOffset = wc.nFirstMargin; + dxStartIndent = max( ME_twips2pointsX(c, pFmt->wNumberingTab), + tp->member.para.para_num.width ); + wc.nFirstMargin += dxStartIndent; + } wc.nRightMargin = ME_twips2pointsX(c, pFmt->dxRightIndent); if (wc.nFirstMargin < 0)

1 0

Huw Davies : riched20: Update the paragraph numbering style if the end-of-paragraph style changes.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: master Commit: 123b0c699ac34559cb6b5b3b54e03f9522107986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=123b0c699ac34559cb6b5b3b5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 7 10:49:36 2016 +0100 riched20: Update the paragraph numbering style if the end-of-paragraph style changes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/run.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 984f8f5..496f0f9 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -753,12 +753,20 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C for (run = start_run; run != end_run; run = ME_FindItemFwd( run, diRun )) { ME_Style *new_style = ME_ApplyStyle(editor, run->member.run.style, pFmt); + ME_Paragraph *para = run->member.run.para; add_undo_set_char_fmt( editor, run->member.run.para->nCharOfs + run->member.run.nCharOfs, run->member.run.len, &run->member.run.style->fmt ); ME_ReleaseStyle(run->member.run.style); run->member.run.style = new_style; - run->member.run.para->nFlags |= MEPF_REWRAP; + + /* The para numbering style depends on the eop style */ + if ((run->member.run.nFlags & MERF_ENDPARA) && para->para_num.style) + { + ME_ReleaseStyle(para->para_num.style); + para->para_num.style = NULL; + } + para->nFlags |= MEPF_REWRAP; } }

1 0

Huw Davies : wordpad: Improve the indentation of bulleted lists.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: master Commit: c8d96b96dac53f8e8d04df1e6855750f4a0588fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d96b96dac53f8e8d04df1e6… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 7 10:49:37 2016 +0100 wordpad: Improve the indentation of bulleted lists. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index bb34f2e..ea6e11d 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2353,22 +2353,28 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) case ID_BULLET: { - PARAFORMAT pf; + PARAFORMAT2 pf; pf.cbSize = sizeof(pf); pf.dwMask = PFM_NUMBERING; SendMessageW(hwndEditor, EM_GETPARAFORMAT, 0, (LPARAM)&pf); - pf.dwMask |= PFM_OFFSET; + pf.dwMask = PFM_NUMBERING | PFM_NUMBERINGSTART | PFM_NUMBERINGTAB | PFM_OFFSET | PFM_OFFSETINDENT; if(pf.wNumbering == PFN_BULLET) { pf.wNumbering = 0; + pf.wNumberingStart = 0; + pf.wNumberingTab = 0; pf.dxOffset = 0; + pf.dxStartIndent = -360; } else { pf.wNumbering = PFN_BULLET; - pf.dxOffset = 720; + pf.wNumberingStart = 1; + pf.wNumberingTab = 360; + pf.dxOffset = 360; + pf.dxStartIndent = 360; } SendMessageW(hwndEditor, EM_SETPARAFORMAT, 0, (LPARAM)&pf);

1 0

Sebastian Lackner : ntoskrnl.exe: Fix a copy & paste error in dispatch_close.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: master Commit: d392a01208fe30799759907e579b79c208e4f315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d392a01208fe30799759907e5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 7 05:13:59 2016 +0200 ntoskrnl.exe: Fix a copy & paste error in dispatch_close. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cc6ea0b..258f76d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -259,11 +259,6 @@ static NTSTATUS dispatch_close( const irp_params_t *params, void *in_buff, ULONG irpsp->MajorFunction = IRP_MJ_CLOSE; irpsp->DeviceObject = device; irpsp->CompletionRoutine = NULL; - irpsp->Parameters.Create.SecurityContext = NULL; /* FIXME */ - irpsp->Parameters.Create.Options = params->create.options; - irpsp->Parameters.Create.ShareAccess = params->create.sharing; - irpsp->Parameters.Create.FileAttributes = 0; - irpsp->Parameters.Create.EaLength = 0; irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode;

1 0

Sebastian Lackner : ntoskrnl.exe: Remove checks if MajorFunction is NULL.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: master Commit: 54c68c6533e6e1f3a463c6b76cd756d60983c66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c68c6533e6e1f3a463c6b76… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 7 05:19:46 2016 +0200 ntoskrnl.exe: Remove checks if MajorFunction is NULL. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 258f76d..d107bd9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -172,7 +172,7 @@ static HANDLE get_device_manager(void) return ret; } -static NTSTATUS dispatch_irp( DEVICE_OBJECT *device, IRP *irp ) +static void dispatch_irp( DEVICE_OBJECT *device, IRP *irp ) { LARGE_INTEGER count; @@ -183,8 +183,6 @@ static NTSTATUS dispatch_irp( DEVICE_OBJECT *device, IRP *irp ) IoCallDriver( device, irp ); device->CurrentIrp = NULL; - - return STATUS_SUCCESS; } /* process a create request for a given file */ @@ -227,10 +225,8 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON irp->UserIosb = irp_handle; /* note: we abuse UserIosb to store the server irp handle */ irp->UserEvent = NULL; - if (device->DriverObject->MajorFunction[IRP_MJ_CREATE]) return dispatch_irp( device, irp ); + dispatch_irp( device, irp ); - irp->IoStatus.u.Status = STATUS_SUCCESS; - IoCompleteRequest( irp, IO_NO_INCREMENT ); return STATUS_SUCCESS; } @@ -267,12 +263,7 @@ static NTSTATUS dispatch_close( const irp_params_t *params, void *in_buff, ULONG irp->UserIosb = irp_handle; /* note: we abuse UserIosb to store the server irp handle */ irp->UserEvent = NULL; - if (!device->DriverObject->MajorFunction[IRP_MJ_CLOSE]) - { - irp->IoStatus.u.Status = STATUS_SUCCESS; - IoCompleteRequest( irp, IO_NO_INCREMENT ); - } - else dispatch_irp( device, irp ); + dispatch_irp( device, irp ); HeapFree( GetProcessHeap(), 0, file ); /* FIXME: async close processing not supported */ return STATUS_SUCCESS; @@ -292,7 +283,6 @@ static NTSTATUS dispatch_read( const irp_params_t *params, void *in_buff, ULONG if (!file) return STATUS_INVALID_HANDLE; device = file->DeviceObject; - if (!device->DriverObject->MajorFunction[IRP_MJ_READ]) return STATUS_NOT_SUPPORTED; TRACE( "device %p file %p size %u\n", device, file, out_size ); @@ -314,7 +304,9 @@ static NTSTATUS dispatch_read( const irp_params_t *params, void *in_buff, ULONG irpsp = IoGetNextIrpStackLocation( irp ); irpsp->Parameters.Read.Key = params->read.key; - return dispatch_irp( device, irp ); + dispatch_irp( device, irp ); + + return STATUS_SUCCESS; } /* process a write request for a given device */ @@ -330,7 +322,6 @@ static NTSTATUS dispatch_write( const irp_params_t *params, void *in_buff, ULONG if (!file) return STATUS_INVALID_HANDLE; device = file->DeviceObject; - if (!device->DriverObject->MajorFunction[IRP_MJ_WRITE]) return STATUS_NOT_SUPPORTED; TRACE( "device %p file %p size %u\n", device, file, in_size ); @@ -347,7 +338,9 @@ static NTSTATUS dispatch_write( const irp_params_t *params, void *in_buff, ULONG irpsp = IoGetNextIrpStackLocation( irp ); irpsp->Parameters.Write.Key = params->write.key; - return dispatch_irp( device, irp ); + dispatch_irp( device, irp ); + + return STATUS_SUCCESS; } /* process a flush request for a given device */ @@ -361,7 +354,6 @@ static NTSTATUS dispatch_flush( const irp_params_t *params, void *in_buff, ULONG if (!file) return STATUS_INVALID_HANDLE; device = file->DeviceObject; - if (!device->DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS]) return STATUS_NOT_SUPPORTED; TRACE( "device %p file %p\n", device, file ); @@ -373,7 +365,9 @@ static NTSTATUS dispatch_flush( const irp_params_t *params, void *in_buff, ULONG irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; - return dispatch_irp( device, irp ); + dispatch_irp( device, irp ); + + return STATUS_SUCCESS; } /* process an ioctl request for a given device */ @@ -388,7 +382,6 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG if (!file) return STATUS_INVALID_HANDLE; device = file->DeviceObject; - if (!device->DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL]) return STATUS_NOT_SUPPORTED; TRACE( "ioctl %x device %p file %p in_size %u out_size %u\n", params->ioctl.code, device, file, in_size, out_size ); @@ -417,7 +410,9 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; - return dispatch_irp( device, irp ); + dispatch_irp( device, irp ); + + return STATUS_SUCCESS; } typedef NTSTATUS (*dispatch_func)( const irp_params_t *params, void *in_buff, ULONG in_size,

1 0

Sebastian Lackner : ntoskrnl.exe: Fix parameters of IoBuildSynchronousFsdRequest in dispatch_flush.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: master Commit: 14b2a6a190a84ca3dbb334ad518e137625ab316a URL: http://source.winehq.org/git/wine.git/?a=commit;h=14b2a6a190a84ca3dbb334ad5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 7 05:20:01 2016 +0200 ntoskrnl.exe: Fix parameters of IoBuildSynchronousFsdRequest in dispatch_flush. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d107bd9..cf87f7a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -358,7 +358,7 @@ static NTSTATUS dispatch_flush( const irp_params_t *params, void *in_buff, ULONG TRACE( "device %p file %p\n", device, file ); /* note: we abuse UserIosb to store the server irp handle */ - if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_FLUSH_BUFFERS, device, in_buff, in_size, + if (!(irp = IoBuildSynchronousFsdRequest( IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, NULL, irp_handle ))) return STATUS_NO_MEMORY;

1 0

Jacek Caban : mshtml: Update binding moniker in handle_redirect.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: master Commit: a6ef2386a7220bb17c9408374d5ec24faca52d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6ef2386a7220bb17c9408374… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 7 16:04:49 2016 +0200 mshtml: Update binding moniker in handle_redirect. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index aa652dd..ad949fd 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1423,11 +1423,18 @@ static HRESULT handle_redirect(nsChannelBSC *This, const WCHAR *new_url) nsRedirectCallback *callback; nsIChannelEventSink *sink; nsChannel *new_channel; + IMoniker *mon; nsresult nsres; HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_w(new_url)); + hres = CreateURLMoniker(NULL, new_url, &mon); + if(FAILED(hres)) + return hres; + IMoniker_Release(This->bsc.mon); + This->bsc.mon = mon; + if(!This->nschannel || !This->nschannel->notif_callback) return S_OK;

1 0