October 2020 - Wine-Commits

Alexandre Julliard : gdi32: Move the font substitution list out of freetype.c.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 7e51cc8308bd828d8d8a90aea35170c68d4b1bb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e51cc8308bd828d8d8a90ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 14:15:34 2020 +0100 gdi32: Move the font substitution list out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 105 +++++++++++++++++++ dlls/gdi32/freetype.c | 265 +++++++++-------------------------------------- dlls/gdi32/gdi_private.h | 4 + 3 files changed, 156 insertions(+), 218 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e51cc8308bd828d8d8a…

1 0

Daniel Lehman : tzres: Add Magallanes Standard Time Zone.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: af5c7c33567812c1f0037ff011ec9c63efdb9d90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af5c7c33567812c1f0037ff0… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Oct 29 22:40:24 2020 -0700 tzres: Add Magallanes Standard Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 21 ++++++ po/ar.po | 210 +++++++++++++++++++++++++++------------------------ po/ast.po | 210 +++++++++++++++++++++++++++------------------------ po/bg.po | 206 ++++++++++++++++++++++++++------------------------ po/ca.po | 210 +++++++++++++++++++++++++++------------------------ po/cs.po | 210 +++++++++++++++++++++++++++------------------------ po/da.po | 210 +++++++++++++++++++++++++++------------------------ po/de.po | 210 +++++++++++++++++++++++++++------------------------ po/el.po | 206 ++++++++++++++++++++++++++------------------------ po/en.po | 206 ++++++++++++++++++++++++++------------------------ po/en_US.po | 206 ++++++++++++++++++++++++++------------------------ po/eo.po | 210 +++++++++++++++++++++++++++------------------------ po/es.po | 210 +++++++++++++++++++++++++++------------------------ po/fa.po | 208 ++++++++++++++++++++++++++------------------------ po/fi.po | 210 +++++++++++++++++++++++++++------------------------ po/fr.po | 210 +++++++++++++++++++++++++++------------------------ po/he.po | 210 +++++++++++++++++++++++++++------------------------ po/hi.po | 206 ++++++++++++++++++++++++++------------------------ po/hr.po | 210 +++++++++++++++++++++++++++------------------------ po/hu.po | 210 +++++++++++++++++++++++++++------------------------ po/it.po | 210 +++++++++++++++++++++++++++------------------------ po/ja.po | 210 +++++++++++++++++++++++++++------------------------ po/ko.po | 210 +++++++++++++++++++++++++++------------------------ po/lt.po | 210 +++++++++++++++++++++++++++------------------------ po/ml.po | 206 ++++++++++++++++++++++++++------------------------ po/nb_NO.po | 210 +++++++++++++++++++++++++++------------------------ po/nl.po | 210 +++++++++++++++++++++++++++------------------------ po/or.po | 206 ++++++++++++++++++++++++++------------------------ po/pa.po | 206 ++++++++++++++++++++++++++------------------------ po/pl.po | 210 +++++++++++++++++++++++++++------------------------ po/pt_BR.po | 210 +++++++++++++++++++++++++++------------------------ po/pt_PT.po | 210 +++++++++++++++++++++++++++------------------------ po/rm.po | 206 ++++++++++++++++++++++++++------------------------ po/ro.po | 210 +++++++++++++++++++++++++++------------------------ po/ru.po | 206 ++++++++++++++++++++++++++------------------------ po/si.po | 210 +++++++++++++++++++++++++++------------------------ po/sk.po | 210 +++++++++++++++++++++++++++------------------------ po/sl.po | 210 +++++++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 208 ++++++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 208 ++++++++++++++++++++++++++------------------------ po/sv.po | 210 +++++++++++++++++++++++++++------------------------ po/ta.po | 206 ++++++++++++++++++++++++++------------------------ po/te.po | 206 ++++++++++++++++++++++++++------------------------ po/th.po | 208 ++++++++++++++++++++++++++------------------------ po/tr.po | 210 +++++++++++++++++++++++++++------------------------ po/uk.po | 206 ++++++++++++++++++++++++++------------------------ po/wa.po | 208 ++++++++++++++++++++++++++------------------------ po/wine.pot | 206 ++++++++++++++++++++++++++------------------------ po/zh_CN.po | 210 +++++++++++++++++++++++++++------------------------ po/zh_TW.po | 210 +++++++++++++++++++++++++++------------------------ 51 files changed, 5396 insertions(+), 4851 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af5c7c33567812c1f003…

1 0

Alexandre Julliard : gdi32: Move the loading of font replacements out of freetype.c.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: d27a9d77ee2e21dc071b9cb09af6df78ca5c0c84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d27a9d77ee2e21dc071b9cb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 14:38:02 2020 +0100 gdi32: Move the loading of font replacements out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 79 ++++++++++++++++++++++++++++++++ dlls/gdi32/freetype.c | 116 +---------------------------------------------- dlls/gdi32/gdi_private.h | 3 ++ 3 files changed, 83 insertions(+), 115 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 62f9f927ccd..806ff0d1d91 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -551,6 +551,85 @@ struct gdi_font_family *find_family_from_any_name( const WCHAR *name ) return NULL; } +static BOOL add_family_replacement( const WCHAR *new_name, const WCHAR *replace ) +{ + struct gdi_font_family *new_family, *family; + struct gdi_font_face *face; + WCHAR new_name_vert[LF_FACESIZE], replace_vert[LF_FACESIZE]; + + if (!(family = find_family_from_any_name( replace ))) + { + TRACE( "%s is not available. Skip this replacement.\n", debugstr_w(replace) ); + return FALSE; + } + + if (!(new_family = create_family( new_name, NULL ))) return FALSE; + new_family->replacement = &family->faces; + TRACE( "mapping %s to %s\n", debugstr_w(replace), debugstr_w(new_name) ); + + /* also add replacement for vertical font if necessary */ + if (replace[0] == '@') return TRUE; + if (list_empty( &family->faces )) return TRUE; + face = LIST_ENTRY( list_head(&family->faces), struct gdi_font_face, entry ); + if (!(face->fs.fsCsb[0] & FS_DBCS_MASK)) return TRUE; + + new_name_vert[0] = '@'; + lstrcpynW( new_name_vert + 1, new_name, LF_FACESIZE - 1 ); + if (find_family_from_any_name( new_name_vert )) return TRUE; /* already exists */ + + replace_vert[0] = '@'; + lstrcpynW( replace_vert + 1, replace, LF_FACESIZE - 1 ); + add_family_replacement( new_name_vert, replace_vert ); + return TRUE; +} + +/* + * The replacement list is a way to map an entire font + * family onto another family. For example adding + * + * [HKCU\Software\Wine\Fonts\Replacements] + * "Wingdings"="Winedings" + * + * would enumerate the Winedings font both as Winedings and + * Wingdings. However if a real Wingdings font is present the + * replacement does not take place. + */ +void load_gdi_font_replacements(void) +{ + HKEY hkey; + DWORD i = 0, type, dlen, vlen; + WCHAR value[LF_FACESIZE], data[1024]; + + /* @@ Wine registry key: HKCU\Software\Wine\Fonts\Replacements */ + if (RegOpenKeyA( wine_fonts_key, "Replacements", &hkey )) return; + + dlen = sizeof(data); + vlen = ARRAY_SIZE(value); + while (!RegEnumValueW( hkey, i++, value, &vlen, NULL, &type, (BYTE *)data, &dlen )) + { + /* "NewName"="Oldname" */ + if (!find_family_from_any_name( value )) + { + if (type == REG_MULTI_SZ) + { + WCHAR *replace = data; + while (*replace) + { + if (add_family_replacement( value, replace )) break; + replace += strlenW(replace) + 1; + } + } + else if (type == REG_SZ) add_family_replacement( value, data ); + } + else TRACE("%s is available. Skip this replacement.\n", debugstr_w(value)); + + /* reset dlen and vlen */ + dlen = sizeof(data); + vlen = ARRAY_SIZE(value); + } + RegCloseKey( hkey ); +} + struct gdi_font_face *create_face( const WCHAR *style, const WCHAR *fullname, const WCHAR *file, UINT index, FONTSIGNATURE fs, DWORD ntmflags, DWORD version, DWORD flags, const struct bitmap_font_size *size ) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 147d65d130d..afc9add629c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -235,8 +235,6 @@ typedef struct { typedef struct gdi_font_face Face; -#define FS_DBCS_MASK (FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB) - typedef struct gdi_font_family Family; typedef struct { @@ -365,7 +363,6 @@ static const WCHAR font_mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N' static const WCHAR szDefaultFallbackLink[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}; -static BOOL map_font_family(const WCHAR *orig, const WCHAR *repl); static BOOL CDECL freetype_set_outline_text_metrics( struct gdi_font *font ); static BOOL CDECL freetype_set_bitmap_text_metrics( struct gdi_font *font ); static void remove_face_from_cache( Face *face ); @@ -1735,117 +1732,6 @@ static void DumpFontList(void) } } -static BOOL map_vertical_font_family(const WCHAR *orig, const WCHAR *repl, const Family *family) -{ - Face *face; - BOOL ret = FALSE; - WCHAR *at_orig, *at_repl = NULL; - - face = LIST_ENTRY(list_head(&family->faces), Face, entry); - if (!face || !(face->fs.fsCsb[0] & FS_DBCS_MASK)) - return FALSE; - - at_orig = get_vertical_name( strdupW( orig ) ); - if (at_orig && !find_family_from_any_name(at_orig)) - { - at_repl = get_vertical_name( strdupW( repl ) ); - if (at_repl) - ret = map_font_family(at_orig, at_repl); - } - - HeapFree(GetProcessHeap(), 0, at_orig); - HeapFree(GetProcessHeap(), 0, at_repl); - - return ret; -} - -static BOOL map_font_family(const WCHAR *orig, const WCHAR *repl) -{ - Family *family = find_family_from_any_name(repl); - if (family != NULL) - { - Family *new_family = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_family)); - if (new_family != NULL) - { - TRACE("mapping %s to %s\n", debugstr_w(repl), debugstr_w(orig)); - lstrcpynW( new_family->family_name, orig, LF_FACESIZE ); - new_family->second_name[0] = 0; - list_init(&new_family->faces); - new_family->replacement = &family->faces; - list_add_tail(&font_list, &new_family->entry); - - if (repl[0] != '@') - map_vertical_font_family(orig, repl, family); - - return TRUE; - } - } - TRACE("%s is not available. Skip this replacement.\n", debugstr_w(repl)); - return FALSE; -} - -/*********************************************************** - * The replacement list is a way to map an entire font - * family onto another family. For example adding - * - * [HKCU\Software\Wine\Fonts\Replacements] - * "Wingdings"="Winedings" - * - * would enumerate the Winedings font both as Winedings and - * Wingdings. However if a real Wingdings font is present the - * replacement does not take place. - * - */ -static void LoadReplaceList(void) -{ - HKEY hkey; - DWORD valuelen, datalen, i = 0, type, dlen, vlen; - LPWSTR value; - LPVOID data; - - /* @@ Wine registry key: HKCU\Software\Wine\Fonts\Replacements */ - if(RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts\\Replacements", &hkey) == ERROR_SUCCESS) - { - RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - &valuelen, &datalen, NULL, NULL); - - valuelen++; /* returned value doesn't include room for '\0' */ - value = HeapAlloc(GetProcessHeap(), 0, valuelen * sizeof(WCHAR)); - data = HeapAlloc(GetProcessHeap(), 0, datalen); - - dlen = datalen; - vlen = valuelen; - while(RegEnumValueW(hkey, i++, value, &vlen, NULL, &type, data, &dlen) == ERROR_SUCCESS) - { - /* "NewName"="Oldname" */ - if(!find_family_from_any_name(value)) - { - if (type == REG_MULTI_SZ) - { - WCHAR *replace = data; - while(*replace) - { - if (map_font_family(value, replace)) - break; - replace += strlenW(replace) + 1; - } - } - else if (type == REG_SZ) - map_font_family(value, data); - } - else - TRACE("%s is available. Skip this replacement.\n", debugstr_w(value)); - - /* reset dlen and vlen */ - dlen = datalen; - vlen = valuelen; - } - HeapFree(GetProcessHeap(), 0, data); - HeapFree(GetProcessHeap(), 0, value); - RegCloseKey(hkey); - } -} - static const WCHAR *font_links_list[] = { Lucida_Sans_Unicode, @@ -2780,7 +2666,7 @@ BOOL WineEngInit( const struct font_backend_funcs **funcs ) DumpFontList(); load_gdi_font_subst(); - LoadReplaceList(); + load_gdi_font_replacements(); if(disposition == REG_CREATED_NEW_KEY) update_reg_entries(); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 812b3f33abf..63e76e4df69 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -405,6 +405,8 @@ struct gdi_font #define MS_TTCF_TAG MS_MAKE_TAG('t', 't', 'c', 'f') #define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') +#define FS_DBCS_MASK (FS_JISJAPAN | FS_CHINESESIMP | FS_WANSUNG | FS_CHINESETRAD | FS_JOHAB) + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_ALLOW_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -449,6 +451,7 @@ extern struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *se extern void release_family( struct gdi_font_family *family ) DECLSPEC_HIDDEN; extern struct gdi_font_family *find_family_from_name( const WCHAR *name ) DECLSPEC_HIDDEN; extern struct gdi_font_family *find_family_from_any_name( const WCHAR *name ) DECLSPEC_HIDDEN; +extern void load_gdi_font_replacements(void) DECLSPEC_HIDDEN; extern struct gdi_font_face *create_face( const WCHAR *style, const WCHAR *fullname, const WCHAR *file, UINT index, FONTSIGNATURE fs, DWORD ntmflags, DWORD version, DWORD flags, const struct bitmap_font_size *size ) DECLSPEC_HIDDEN;

1 0

Huw Davies : riched20: Use a run ptr in the rtf row handler.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 0c9d5ebf5c74d8215cbf676af3dd7e7f431afc90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c9d5ebf5c74d8215cbf676a… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 30 09:00:28 2020 +0000 riched20: Use a run ptr in the rtf row handler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 40282027dba..1f37258f345 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -987,7 +987,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) /* else fall through since v4.1 treats rtfNestRow and rtfRow the same */ case rtfRow: { - ME_DisplayItem *run; + ME_Run *run; ME_Paragraph *para; ME_Cell *cell; int i; @@ -1042,14 +1042,14 @@ void ME_RTFSpecialCharHook(RTF_Info *info) cell->nRightBoundary = tableDef->cells[i - 1].rightBoundary; } - run = ME_FindItemFwd( cell_get_di( cell) , diRun ); - if (info->editor->pCursors[0].pRun != run || + run = para_first_run( cell_first_para( cell ) ); + if (&info->editor->pCursors[0].pRun->member.run != run || info->editor->pCursors[0].nOffset) { int nOfs, nChars; /* Delete inserted cells that aren't defined. */ - info->editor->pCursors[1].pRun = run; - info->editor->pCursors[1].pPara = ME_GetParagraph(run); + info->editor->pCursors[1].pRun = run_get_di( run ); + info->editor->pCursors[1].pPara = para_get_di( run->para ); info->editor->pCursors[1].nOffset = 0; nOfs = ME_GetCursorOfs(&info->editor->pCursors[1]); nChars = ME_GetCursorOfs(&info->editor->pCursors[0]) - nOfs;

1 0

Huw Davies : riched20: Use paragraph ptrs in the enter handler.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: a0f0dc1c5b9d66a4ba6b6099c2d0a74d72208203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0f0dc1c5b9d66a4ba6b6099… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 30 09:00:27 2020 +0000 riched20: Use paragraph ptrs in the enter handler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 70 +++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2a3858ba038..40282027dba 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2484,7 +2484,7 @@ static BOOL handle_enter(ME_TextEditor *editor) static const WCHAR endl = '\r'; static const WCHAR endlv10[] = {'\r','\n'}; ME_Cursor cursor = editor->pCursors[0]; - ME_DisplayItem *para = cursor.pPara; + ME_Paragraph *para = &cursor.pPara->member.para; int from, to; ME_Style *style, *eop_style; @@ -2499,40 +2499,40 @@ static BOOL handle_enter(ME_TextEditor *editor) { if (!editor->bEmulateVersion10) /* v4.1 */ { - if (para->member.para.nFlags & MEPF_ROWEND) + if (para->nFlags & MEPF_ROWEND) { /* Add a new table row after this row. */ - para = para_get_di( table_append_row( editor, &para->member.para ) ); - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = table_append_row( editor, para ); + para = para_next( para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; ME_CommitUndo(editor); ME_UpdateRepaint(editor, FALSE); return TRUE; } - else if (para == editor->pCursors[1].pPara && - cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && - para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && - !para->member.para.prev_para->member.para.nCharOfs) + else if (para == &editor->pCursors[1].pPara->member.para && + cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && + para_prev( para ) && para_prev( para )->nFlags & MEPF_ROWSTART && + !para_prev( para )->nCharOfs) { /* Insert a newline before the table. */ - para = para->member.para.prev_para; - para->member.para.nFlags &= ~MEPF_ROWSTART; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = para_prev( para ); + para->nFlags &= ~MEPF_ROWSTART; + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[1] = editor->pCursors[0]; ME_InsertTextFromCursor(editor, 0, &endl, 1, - editor->pCursors[0].pRun->member.run.style); - para = editor->pBuffer->pFirst->member.para.next_para; - editor_set_default_para_fmt( editor, &para->member.para.fmt ); - para->member.para.nFlags = 0; - para_mark_rewrap( editor, &para->member.para ); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].pRun->member.run.style); + para = editor_first_para( editor ); + editor_set_default_para_fmt( editor, &para->fmt ); + para->nFlags = 0; + para_mark_rewrap( editor, para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[1] = editor->pCursors[0]; - para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; + para_next( para )->nFlags |= MEPF_ROWSTART; ME_CommitCoalescingUndo(editor); ME_UpdateRepaint(editor, FALSE); return TRUE; @@ -2540,17 +2540,17 @@ static BOOL handle_enter(ME_TextEditor *editor) } else /* v1.0 - 3.0 */ { - ME_DisplayItem *para = cursor.pPara; - if (ME_IsInTable(para)) + ME_Paragraph *para = &cursor.pPara->member.para; + if (para_in_table( para )) { if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) { if (from == to) { ME_ContinueCoalescingTransaction(editor); - para = para_get_di( table_append_row( editor, &para->member.para ) ); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = table_append_row( editor, para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; ME_CommitCoalescingUndo(editor); @@ -2562,14 +2562,14 @@ static BOOL handle_enter(ME_TextEditor *editor) { ME_ContinueCoalescingTransaction(editor); if (cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && - !ME_IsInTable(para->member.para.prev_para)) + para_prev( para ) && !para_in_table( para_prev( para ) )) { /* Insert newline before table */ - cursor.pRun = ME_FindItemBack(para, diRun); + cursor.pRun = run_get_di( para_end_run( para_prev( para ) ) ); if (cursor.pRun) { editor->pCursors[0].pRun = cursor.pRun; - editor->pCursors[0].pPara = para->member.para.prev_para; + editor->pCursors[0].pPara = para_get_di( para_prev( para ) ); } editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; @@ -2579,9 +2579,9 @@ static BOOL handle_enter(ME_TextEditor *editor) else { editor->pCursors[1] = editor->pCursors[0]; - para = para_get_di( table_append_row( editor, &para->member.para ) ); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = table_append_row( editor, para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; } @@ -2597,8 +2597,8 @@ static BOOL handle_enter(ME_TextEditor *editor) /* 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; + if (para->fmt.wNumbering) + eop_style = para->eop_run->style; else eop_style = style; ME_ContinueCoalescingTransaction(editor);

1 0

Huw Davies : riched20: Use paragraph ptrs in the selection link check function.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 352e7664d8d1a74600ebd9dc3d3a2dcbe337d7af URL: https://source.winehq.org/git/wine.git/?a=commit;h=352e7664d8d1a74600ebd9dc… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 30 09:00:26 2020 +0000 riched20: Use paragraph ptrs in the selection link check function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 057d5a31ce6..2a3858ba038 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2426,30 +2426,27 @@ ME_FilterEvent(ME_TextEditor *editor, UINT msg, WPARAM* wParam, LPARAM* lParam) static void ME_UpdateSelectionLinkAttribute(ME_TextEditor *editor) { - ME_DisplayItem *startPara, *endPara; - ME_DisplayItem *prev_para; - ME_Cursor *from, *to; - ME_Cursor start; - int nChars; + ME_Paragraph *start_para, *end_para; + ME_Cursor *from, *to, start; + int num_chars; if (!editor->AutoURLDetect_bEnable) return; ME_GetSelection(editor, &from, &to); /* Find paragraph previous to the one that contains start cursor */ - startPara = from->pPara; - prev_para = startPara->member.para.prev_para; - if (prev_para->type == diParagraph) startPara = prev_para; + start_para = &from->pPara->member.para; + if (para_prev( start_para )) start_para = para_prev( start_para ); /* Find paragraph that contains end cursor */ - endPara = to->pPara->member.para.next_para; + end_para = para_next( &to->pPara->member.para ); - start.pPara = startPara; - start.pRun = ME_FindItemFwd(startPara, diRun); + start.pPara = para_get_di( start_para ); + start.pRun = run_get_di( para_first_run( start_para ) ); start.nOffset = 0; - nChars = endPara->member.para.nCharOfs - startPara->member.para.nCharOfs; + num_chars = end_para->nCharOfs - start_para->nCharOfs; - ME_UpdateLinkAttribute(editor, &start, nChars); + ME_UpdateLinkAttribute( editor, &start, num_chars ); } static BOOL handle_enter(ME_TextEditor *editor)

1 0

Huw Davies : riched20: Use paragraph and run ptrs in the find text function.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: cdd507eb2bdcc5f1cdcecc256f2199ce57531703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdd507eb2bdcc5f1cdcecc25… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 30 09:00:29 2020 +0000 riched20: Use paragraph and run ptrs in the find text function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 85 +++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 36 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1f37258f345..c1138bd1dab 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1928,11 +1928,11 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH while (cursor.pRun && ME_GetCursorOfs(&cursor) + nLen <= nMax) { - ME_DisplayItem *pCurItem = cursor.pRun; + ME_Run *run = &cursor.pRun->member.run; int nCurStart = cursor.nOffset; int nMatched = 0; - while (pCurItem && ME_CharCompare( *get_text( &pCurItem->member.run, nCurStart + nMatched ), text[nMatched], (flags & FR_MATCHCASE))) + while (run && ME_CharCompare( *get_text( run, nCurStart + nMatched ), text[nMatched], (flags & FR_MATCHCASE))) { if ((flags & FR_WHOLEWORD) && iswalnum(wLastChar)) break; @@ -1940,21 +1940,21 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH nMatched++; if (nMatched == nLen) { - ME_DisplayItem *pNextItem = pCurItem; + ME_Run *next_run = run; int nNextStart = nCurStart; WCHAR wNextChar; /* Check to see if next character is a whitespace */ if (flags & FR_WHOLEWORD) { - if (nCurStart + nMatched == pCurItem->member.run.len) + if (nCurStart + nMatched == run->len) { - pNextItem = ME_FindItemFwd(pCurItem, diRun); + next_run = run_next_all_paras( run ); nNextStart = -nMatched; } - if (pNextItem) - wNextChar = *get_text( &pNextItem->member.run, nNextStart + nMatched ); + if (next_run) + wNextChar = *get_text( next_run, nNextStart + nMatched ); else wNextChar = ' '; @@ -1971,22 +1971,28 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH TRACE("found at %d-%d\n", cursor.nOffset, cursor.nOffset + nLen); return cursor.nOffset; } - if (nCurStart + nMatched == pCurItem->member.run.len) + if (nCurStart + nMatched == run->len) { - pCurItem = ME_FindItemFwd(pCurItem, diRun); + run = run_next_all_paras( run ); nCurStart = -nMatched; } } - if (pCurItem) - wLastChar = *get_text( &pCurItem->member.run, nCurStart + nMatched ); + if (run) + wLastChar = *get_text( run, nCurStart + nMatched ); else wLastChar = ' '; cursor.nOffset++; if (cursor.nOffset == cursor.pRun->member.run.len) { - ME_NextRun(&cursor.pPara, &cursor.pRun, TRUE); - cursor.nOffset = 0; + if (run_next_all_paras( &cursor.pRun->member.run )) + { + cursor.pRun = run_get_di( run_next_all_paras( &cursor.pRun->member.run ) ); + cursor.pPara = para_get_di( cursor.pRun->member.run.para ); + cursor.nOffset = 0; + } + else + cursor.pRun = NULL; } } } @@ -2003,19 +2009,20 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH while (cursor.pRun && ME_GetCursorOfs(&cursor) - nLen >= nMin) { - ME_DisplayItem *pCurItem = cursor.pRun; - ME_DisplayItem *pCurPara = cursor.pPara; + ME_Run *run = &cursor.pRun->member.run; + ME_Paragraph *para = &cursor.pPara->member.para; int nCurEnd = cursor.nOffset; int nMatched = 0; - if (nCurEnd == 0) + if (nCurEnd == 0 && run_prev_all_paras( run )) { - ME_PrevRun(&pCurPara, &pCurItem, TRUE); - nCurEnd = pCurItem->member.run.len; + run = run_prev_all_paras( run ); + para = run->para; + nCurEnd = run->len; } - while (pCurItem && ME_CharCompare( *get_text( &pCurItem->member.run, nCurEnd - nMatched - 1 ), - text[nLen - nMatched - 1], (flags & FR_MATCHCASE) )) + while (run && ME_CharCompare( *get_text( run, nCurEnd - nMatched - 1 ), + text[nLen - nMatched - 1], (flags & FR_MATCHCASE) )) { if ((flags & FR_WHOLEWORD) && iswalnum(wLastChar)) break; @@ -2023,7 +2030,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH nMatched++; if (nMatched == nLen) { - ME_DisplayItem *pPrevItem = pCurItem; + ME_Run *prev_run = run; int nPrevEnd = nCurEnd; WCHAR wPrevChar; int nStart; @@ -2033,22 +2040,18 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH { if (nPrevEnd - nMatched == 0) { - pPrevItem = ME_FindItemBack(pCurItem, diRun); - if (pPrevItem) - nPrevEnd = pPrevItem->member.run.len + nMatched; + prev_run = run_prev_all_paras( run ); + if (prev_run) nPrevEnd = prev_run->len + nMatched; } - if (pPrevItem) - wPrevChar = *get_text( &pPrevItem->member.run, nPrevEnd - nMatched - 1 ); - else - wPrevChar = ' '; + if (prev_run) wPrevChar = *get_text( prev_run, nPrevEnd - nMatched - 1 ); + else wPrevChar = ' '; if (iswalnum(wPrevChar)) break; } - nStart = pCurPara->member.para.nCharOfs - + pCurItem->member.run.nCharOfs + nCurEnd - nMatched; + nStart = para->nCharOfs + run->nCharOfs + nCurEnd - nMatched; if (chrgText) { chrgText->cpMin = nStart; @@ -2059,22 +2062,32 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH } if (nCurEnd - nMatched == 0) { - ME_PrevRun(&pCurPara, &pCurItem, TRUE); + if (run_prev_all_paras( run )) + { + run = run_prev_all_paras( run ); + para = run->para; + } /* Don't care about pCurItem becoming NULL here; it's already taken * care of in the exterior loop condition */ - nCurEnd = pCurItem->member.run.len + nMatched; + nCurEnd = run->len + nMatched; } } - if (pCurItem) - wLastChar = *get_text( &pCurItem->member.run, nCurEnd - nMatched - 1 ); + if (run) + wLastChar = *get_text( run, nCurEnd - nMatched - 1 ); else wLastChar = ' '; cursor.nOffset--; if (cursor.nOffset < 0) { - ME_PrevRun(&cursor.pPara, &cursor.pRun, TRUE); - cursor.nOffset = cursor.pRun->member.run.len; + if (run_prev_all_paras( &cursor.pRun->member.run ) ) + { + cursor.pRun = run_get_di( run_prev_all_paras( &cursor.pRun->member.run ) ); + cursor.pPara = para_get_di( cursor.pRun->member.run.para ); + cursor.nOffset = cursor.pRun->member.run.len; + } + else + cursor.pRun = NULL; } } }

1 0

Huw Davies : riched20: Use a paragraph ptr in the stream in function.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 2bc67cfcf9293a4bf58a7bd0de5203c1a9ffbfdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bc67cfcf9293a4bf58a7bd0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 30 09:00:25 2020 +0000 riched20: Use a paragraph ptr in the stream in function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d1667dc9176..057d5a31ce6 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1607,29 +1607,27 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ME_InternalDeleteText(editor, selStart, to - from, FALSE); /* Don't insert text at the end of the table row */ - if (!editor->bEmulateVersion10) { /* v4.1 */ - ME_DisplayItem *para = editor->pCursors->pPara; - if (para->member.para.nFlags & MEPF_ROWEND) - { - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - } - if (para->member.para.nFlags & MEPF_ROWSTART) + if (!editor->bEmulateVersion10) /* v4.1 */ + { + ME_Paragraph *para = &editor->pCursors->pPara->member.para; + if (para->nFlags & (MEPF_ROWSTART | MEPF_ROWEND)) { - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = para_next( para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[0].nOffset = 0; } editor->pCursors[1] = editor->pCursors[0]; - } else { /* v1.0 - 3.0 */ + } + else /* v1.0 - 3.0 */ + { if (editor->pCursors[0].pRun->member.run.nFlags & MERF_ENDPARA && - ME_IsInTable(editor->pCursors[0].pRun)) + para_in_table( &editor->pCursors[0].pPara->member.para )) return 0; } - } else { + } + else + { style = editor->pBuffer->pDefaultStyle; ME_AddRefStyle(style); set_selection_cursors(editor, 0, 0);

1 0

Zhiyi Zhang : winex11.drv: Update a comment.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: 28735278198e7ef8a4d0b73e9859748eab9d6570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28735278198e7ef8a4d0b73e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 16:20:10 2020 +0800 winex11.drv: Update a comment. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 07f7a1ad502..d21d2a7fb1b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -702,7 +702,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (can_activate_window(hwnd)) { - /* simulate a mouse click on the caption to find out + /* simulate a mouse click on the menu to find out * whether the window wants to be activated */ LRESULT ma = SendMessageW( hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor( hwnd, GA_ROOT ),

1 0

Zhiyi Zhang : winemac.drv: Send HTMENU instead of HTCAPTION to query window activation.
by Alexandre Julliard Oct. 30, 2020

Oct. 30, 2020

Module: wine Branch: master Commit: ce9aaf3f4250536aadf04ad77fcaa1836242b696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9aaf3f4250536aadf04ad7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 30 16:19:50 2020 +0800 winemac.drv: Send HTMENU instead of HTCAPTION to query window activation. Equivalent of cfcc280905b7804efde8f42bcd6bddbe5ebd8cad for winex11.drv. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 066eb553f76..e7f5327fcdc 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2348,11 +2348,11 @@ void macdrv_window_got_focus(HWND hwnd, const macdrv_event *event) if (can_activate_window(hwnd) && !(style & WS_MINIMIZE)) { - /* simulate a mouse click on the caption to find out + /* simulate a mouse click on the menu to find out * whether the window wants to be activated */ LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor(hwnd, GA_ROOT), - MAKELONG(HTCAPTION,WM_LBUTTONDOWN)); + MAKELONG(HTMENU, WM_LBUTTONDOWN)); if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { TRACE("setting foreground window to %p\n", hwnd);

1 0