wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Alexandre Julliard : gdi32: Update the Windows font registry keys only when they have changed.
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: 000e32f18362d2c0cb17c04cf1c79d3789dccf7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=000e32f18362d2c0cb17c04c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 3 11:28:20 2020 +0100 gdi32: Update the Windows font registry keys only when they have changed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 217 ++++++++++++++++++++++++++++++++++++++--------- dlls/gdi32/freetype.c | 191 ----------------------------------------- dlls/gdi32/gdi_private.h | 4 - 3 files changed, 176 insertions(+), 236 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=000e32f18362d2c0cb17…

1 0

Alexandre Julliard : gdi32: Add a helper function to create a face.
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: a6f0349e8483ad388b28f239b3e397842b9bdc8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6f0349e8483ad388b28f239… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 3 11:27:21 2020 +0100 gdi32: Add a helper function to create a face. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 142 ++++++++++++++++++++++++++++++++++------------- dlls/gdi32/freetype.c | 115 ++++++++------------------------------ dlls/gdi32/gdi_private.h | 12 ++-- 3 files changed, 132 insertions(+), 137 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6f0349e8483ad388b28…

1 0

Alexandre Julliard : gdi32: Move the font cache out of freetype.c.
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: 19d13d0004db90e311cdb68c8d8026629f82a482 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19d13d0004db90e311cdb68c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 3 11:26:39 2020 +0100 gdi32: Move the font cache out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 293 ++++++++++++++++++++++++++++++++++++++++- dlls/gdi32/freetype.c | 336 +---------------------------------------------- dlls/gdi32/gdi_private.h | 3 + 3 files changed, 300 insertions(+), 332 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19d13d0004db90e311cd…

1 0

Alexandre Julliard : gdi32: Add a separate backend function to load the font list.
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: a84c60ed2ad79cc3cc6e57cfd4989b701e9be5d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a84c60ed2ad79cc3cc6e57cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 3 11:26:12 2020 +0100 gdi32: Add a separate backend function to load the font list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 11 ++++++++++- dlls/gdi32/freetype.c | 41 ++++++++++++++++++----------------------- dlls/gdi32/gdi_private.h | 1 + 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 26f183e4864..7bb0f513ca7 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3238,13 +3238,22 @@ static void init_font_options(void) */ void font_init(void) { + static const WCHAR mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N','T','_','M','U','T','E','X','_','_',0}; + HANDLE mutex; + if (RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Wine\\Fonts", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &wine_fonts_key, NULL )) return; init_font_options(); update_codepage(); - WineEngInit( &font_funcs ); + if (!WineEngInit( &font_funcs )) return; + + if (!(mutex = CreateMutexW( NULL, FALSE, mutex_nameW ))) return; + WaitForSingleObject( mutex, INFINITE ); + font_funcs->load_fonts(); + ReleaseMutex( mutex ); + reorder_font_list(); load_gdi_font_subst(); load_gdi_font_replacements(); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 50df968226b..dea032b7185 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -286,8 +286,6 @@ static struct list mappings_list = LIST_INIT( mappings_list ); static UINT default_aa_flags; static HKEY hkey_font_cache; -static const WCHAR font_mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N','T','_','M','U','T','E','X','_','_','\0'}; - 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 ); @@ -2168,29 +2166,11 @@ static void init_font_list(void) } /************************************************************* - * WineEngInit - * - * Initialize FreeType library and create a list of available faces + * freetype_load_fonts */ -BOOL WineEngInit( const struct font_backend_funcs **funcs ) +static void CDECL freetype_load_fonts(void) { DWORD disposition; - HANDLE font_mutex; - - if(!init_freetype()) return FALSE; - -#ifdef SONAME_LIBFONTCONFIG - init_fontconfig(); -#endif - - *funcs = &font_funcs; - - if((font_mutex = CreateMutexW(NULL, FALSE, font_mutex_nameW)) == NULL) - { - ERR("Failed to create font mutex\n"); - return FALSE; - } - WaitForSingleObject(font_mutex, INFINITE); create_font_cache_key(&hkey_font_cache, &disposition); @@ -2201,8 +2181,22 @@ BOOL WineEngInit( const struct font_backend_funcs **funcs ) if(disposition == REG_CREATED_NEW_KEY) update_reg_entries(); +} + +/************************************************************* + * WineEngInit + * + * Initialize FreeType library and create a list of available faces + */ +BOOL WineEngInit( const struct font_backend_funcs **funcs ) +{ + if(!init_freetype()) return FALSE; + +#ifdef SONAME_LIBFONTCONFIG + init_fontconfig(); +#endif - ReleaseMutex(font_mutex); + *funcs = &font_funcs; return TRUE; } @@ -5020,6 +5014,7 @@ static DWORD CDECL freetype_get_kerning_pairs( struct gdi_font *font, KERNINGPAI static const struct font_backend_funcs font_funcs = { freetype_SelectFont, + freetype_load_fonts, freetype_add_font, freetype_add_mem_font, freetype_remove_font, diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 4350be34851..f77ed4ec345 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -427,6 +427,7 @@ struct font_backend_funcs { struct gdi_font * (CDECL *pSelectFont)( DC *dc, HFONT hfont ); + void (CDECL *load_fonts)(void); INT (CDECL *add_font)( const WCHAR *file, DWORD flags ); INT (CDECL *add_mem_font)( void *ptr, SIZE_T size, DWORD flags ); BOOL (CDECL *remove_font)( const WCHAR *file, DWORD flags );

1 0

Alexandre Julliard : gdi32: Move the font list reordering out of freetype.c.
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: fc44dcdd03b0ec88f38b988849f4830b92b93879 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc44dcdd03b0ec88f38b9888… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 3 11:25:47 2020 +0100 gdi32: Move the font list reordering out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 59 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/freetype.c | 75 ------------------------------------------------ dlls/gdi32/gdi_private.h | 3 ++ 3 files changed, 62 insertions(+), 75 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index cf27f6063ee..26f183e4864 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -225,6 +225,42 @@ static const WCHAR Gulim[] = {'G','u','l','i','m',0}; static const WCHAR PMingLiU[] = {'P','M','i','n','g','L','i','U',0}; static const WCHAR Batang[] = {'B','a','t','a','n','g',0}; +static const WCHAR arial[] = {'A','r','i','a','l',0}; +static const WCHAR bitstream_vera_sans[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',0}; +static const WCHAR bitstream_vera_sans_mono[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',' ','M','o','n','o',0}; +static const WCHAR bitstream_vera_serif[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','e','r','i','f',0}; +static const WCHAR courier_new[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; +static const WCHAR liberation_mono[] = {'L','i','b','e','r','a','t','i','o','n',' ','M','o','n','o',0}; +static const WCHAR liberation_sans[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','a','n','s',0}; +static const WCHAR liberation_serif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f',0}; +static const WCHAR times_new_roman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0}; + +static const WCHAR * const default_serif_list[] = +{ + times_new_roman, + liberation_serif, + bitstream_vera_serif, + NULL +}; +static const WCHAR * const default_fixed_list[] = +{ + courier_new, + liberation_mono, + bitstream_vera_sans_mono, + NULL +}; +static const WCHAR * const default_sans_list[] = +{ + arial, + liberation_sans, + bitstream_vera_sans, + NULL +}; + +const WCHAR *default_serif = times_new_roman; +const WCHAR *default_fixed = courier_new; +const WCHAR *default_sans = arial; + static const struct nls_update_font_list { UINT ansi_cp, oem_cp; @@ -691,6 +727,28 @@ static void dump_gdi_font_list(void) } } +static const WCHAR *set_default_family( const WCHAR * const *name_list ) +{ + struct gdi_font_family *family; + const WCHAR * const *entry; + + for (entry = name_list; *entry; entry++) + { + if (!(family = find_family_from_name( *entry ))) continue; + list_remove( &family->entry ); + list_add_head( &font_list, &family->entry ); + return *entry; + } + return *name_list; +} + +static void reorder_font_list(void) +{ + default_serif = set_default_family( default_serif_list ); + default_fixed = set_default_family( default_fixed_list ); + default_sans = set_default_family( default_sans_list ); +} + 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 ) @@ -3187,6 +3245,7 @@ void font_init(void) init_font_options(); update_codepage(); WineEngInit( &font_funcs ); + reorder_font_list(); load_gdi_font_subst(); load_gdi_font_replacements(); load_system_links(); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ea76e90a7f8..50df968226b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -263,46 +263,8 @@ static const WCHAR winnt_font_reg_key[] = {'S','o','f','t','w','a','r','e','\\', static const WCHAR external_fonts_reg_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', 'F','o','n','t','s','\\','E','x','t','e','r','n','a','l',' ','F','o','n','t','s','\0'}; -/* Interesting and well-known (frequently-assumed!) font names */ -static const WCHAR arial[] = {'A','r','i','a','l',0}; -static const WCHAR bitstream_vera_sans[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',0}; -static const WCHAR bitstream_vera_sans_mono[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',' ','M','o','n','o',0}; -static const WCHAR bitstream_vera_serif[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','e','r','i','f',0}; -static const WCHAR courier_new[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; -static const WCHAR liberation_mono[] = {'L','i','b','e','r','a','t','i','o','n',' ','M','o','n','o',0}; -static const WCHAR liberation_sans[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','a','n','s',0}; -static const WCHAR liberation_serif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f',0}; -static const WCHAR times_new_roman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0}; static const WCHAR SymbolW[] = {'S','y','m','b','o','l','\0'}; -static const WCHAR *default_serif_list[] = -{ - times_new_roman, - liberation_serif, - bitstream_vera_serif, - NULL -}; - -static const WCHAR *default_fixed_list[] = -{ - courier_new, - liberation_mono, - bitstream_vera_sans_mono, - NULL -}; - -static const WCHAR *default_sans_list[] = -{ - arial, - liberation_sans, - bitstream_vera_sans, - NULL -}; - -static const WCHAR *default_serif = times_new_roman; -static const WCHAR *default_fixed = courier_new; -static const WCHAR *default_sans = arial; - /* Registry font cache key and value names */ static const WCHAR wine_fonts_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', 'F','o','n','t','s',0}; @@ -2205,41 +2167,6 @@ static void init_font_list(void) #endif } -static BOOL move_to_front(const WCHAR *name) -{ - Family *family, *cursor2; - LIST_FOR_EACH_ENTRY_SAFE(family, cursor2, &font_list, Family, entry) - { - if (!strncmpiW( family->family_name, name, LF_FACESIZE - 1 )) - { - list_remove(&family->entry); - list_add_head(&font_list, &family->entry); - return TRUE; - } - } - return FALSE; -} - -static const WCHAR *set_default(const WCHAR **name_list) -{ - const WCHAR **entry = name_list; - - while (*entry) - { - if (move_to_front(*entry)) return *entry; - entry++; - } - - return *name_list; -} - -static void reorder_font_list(void) -{ - default_serif = set_default( default_serif_list ); - default_fixed = set_default( default_fixed_list ); - default_sans = set_default( default_sans_list ); -} - /************************************************************* * WineEngInit * @@ -2272,8 +2199,6 @@ BOOL WineEngInit( const struct font_backend_funcs **funcs ) else load_font_list_from_cache(hkey_font_cache); - reorder_font_list(); - if(disposition == REG_CREATED_NEW_KEY) update_reg_entries(); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2d1d74e902b..4350be34851 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -479,6 +479,9 @@ extern struct gdi_font *create_gdi_font( const struct gdi_font_face *face, const const LOGFONTW *lf ) DECLSPEC_HIDDEN; extern void *get_GSUB_vert_feature( struct gdi_font *font ) DECLSPEC_HIDDEN; extern void font_init(void) DECLSPEC_HIDDEN; +extern const WCHAR *default_serif DECLSPEC_HIDDEN; +extern const WCHAR *default_fixed DECLSPEC_HIDDEN; +extern const WCHAR *default_sans DECLSPEC_HIDDEN; /* freetype.c */

1 0

Alexandre Julliard : gdi32: Move the default AA flags handling out of freetype.c.
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: de63a647d5813be38d61af7159d2fdf20372f319 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de63a647d5813be38d61af71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 3 11:25:30 2020 +0100 gdi32: Move the default AA flags handling out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 5 ++ dlls/gdi32/font.c | 209 +++++++++++++++++++++++------------------------ dlls/gdi32/freetype.c | 94 ++++++++------------- dlls/gdi32/gdi_private.h | 4 +- 4 files changed, 140 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de63a647d5813be38d61…

1 0

Paul Gofman : kernel32: Add string for E_FAIL error.
by Alexandre Julliard 03 Nov '20

03 Nov '20

1 0

Huw Davies : riched20: Use a paragraph ptr in the clipboard get text function.
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: 8b613eb2ed8e57c901402fa74390111e8556d6f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b613eb2ed8e57c901402fa7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 3 08:44:44 2020 +0000 riched20: Use a paragraph ptr in the clipboard get text function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/clipboard.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index 578fb02fd99..f74ca2dae1a 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -344,13 +344,12 @@ static HGLOBAL get_unicode_text(ME_TextEditor *editor, const ME_Cursor *start, i int pars = 0; WCHAR *data; HANDLE ret; - ME_DisplayItem *para; + ME_Paragraph *para; int nEnd = ME_GetCursorOfs(start) + nChars; /* count paragraphs in range */ - para = start->pPara; - while((para = para->member.para.next_para) && - para->member.para.nCharOfs <= nEnd) + para = &start->pPara->member.para; + while ((para = para_next( para )) && para->nCharOfs <= nEnd) pars++; ret = GlobalAlloc(GMEM_MOVEABLE, sizeof(WCHAR) * (nChars + pars + 1));

1 0

Huw Davies : riched20: Use para and row ptrs in the row number from offset function.
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: b132d8bf05631ab67ff8538ec84e35d6a79e3de3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b132d8bf05631ab67ff8538e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 3 08:44:43 2020 +0000 riched20: Use para and row ptrs in the row number from offset function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 12 ++++-------- dlls/riched20/editor.h | 2 +- dlls/riched20/row.c | 47 +++++++++++++++++++++-------------------------- 3 files changed, 26 insertions(+), 35 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 168dc51d827..41906d28e4c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4312,17 +4312,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_LINEFROMCHAR: { - if (wParam == -1) - return ME_RowNumberFromCharOfs(editor, ME_GetCursorOfs(&editor->pCursors[1])); - else - return ME_RowNumberFromCharOfs(editor, wParam); + if (wParam == -1) wParam = ME_GetCursorOfs( editor->pCursors + 1 ); + return row_number_from_char_ofs( editor, wParam ); } case EM_EXLINEFROMCHAR: { - if (lParam == -1) - return ME_RowNumberFromCharOfs(editor, ME_GetCursorOfs(&editor->pCursors[1])); - else - return ME_RowNumberFromCharOfs(editor, lParam); + if (lParam == -1) lParam = ME_GetCursorOfs( editor->pCursors + 1 ); + return row_number_from_char_ofs( editor, lParam ); } case EM_LINEINDEX: { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e5d580846d0..e884cbee2f3 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -118,7 +118,7 @@ ME_Row *row_from_cursor( ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) DECLSPEC_HIDDEN; ME_Row *row_next( ME_Row *row ) DECLSPEC_HIDDEN; ME_Run *row_next_run( ME_Row *row, ME_Run *run ) DECLSPEC_HIDDEN; -int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; +int row_number_from_char_ofs( ME_TextEditor *editor, int ofs ) DECLSPEC_HIDDEN; static inline ME_DisplayItem *row_get_di( ME_Row *row ) { return (ME_DisplayItem *)((ptrdiff_t)row - offsetof(ME_DisplayItem, member)); diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index a12a8c7449b..9a87cf27fb5 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -102,33 +102,28 @@ ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) } -int -ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) +int row_number_from_char_ofs( ME_TextEditor *editor, int ofs ) { - ME_DisplayItem *item = ME_FindItemFwd(editor->pBuffer->pFirst, diParagraph); - int nRow = 0; - - while (item->type == diParagraph && - item->member.para.next_para->member.para.nCharOfs <= nOfs) - { - nRow += item->member.para.nRows; - item = item->member.para.next_para; - } - if (item->type == diParagraph) - { - ME_DisplayItem *next_para = item->member.para.next_para; - - nOfs -= item->member.para.nCharOfs; - item = ME_FindItemFwd(item, diRun); - while ((item = ME_FindItemFwd(item, diStartRowOrParagraph)) != NULL) + ME_Paragraph *para = editor_first_para( editor ); + ME_Row *row; + ME_Cursor cursor; + int row_num = 0; + + while (para_next( para ) && para_next( para )->nCharOfs <= ofs) + { + row_num += para->nRows; + para = para_next( para ); + } + + if (para_next( para )) { - if (item == next_para) - break; - item = ME_FindItemFwd(item, diRun); - if (item->member.run.nCharOfs > nOfs) - break; - nRow++; + for (row = para_first_row( para ); row; row = row_next( row )) + { + row_end_cursor( row, &cursor, TRUE ); + if (ME_GetCursorOfs( &cursor ) > ofs ) break; + row_num++; + } } - } - return nRow; + + return row_num; }

1 0

Huw Davies : riched20: Remove unused ME_RowStart().
by Alexandre Julliard 03 Nov '20

03 Nov '20

Module: wine Branch: master Commit: 410dceb939d3b01fd80651578fcad291cb6cb43a URL: https://source.winehq.org/git/wine.git/?a=commit;h=410dceb939d3b01fd8065157… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 3 08:44:42 2020 +0000 riched20: Remove unused ME_RowStart(). Its functionality has been replaced with row_from_cursor(). 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/row.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index d0d34ac5afc..e5d580846d0 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -118,8 +118,6 @@ ME_Row *row_from_cursor( ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) DECLSPEC_HIDDEN; ME_Row *row_next( ME_Row *row ) DECLSPEC_HIDDEN; ME_Run *row_next_run( ME_Row *row, ME_Run *run ) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_RowStart(ME_DisplayItem *item) DECLSPEC_HIDDEN; -/* ME_DisplayItem *ME_RowEnd(ME_DisplayItem *item); */ int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs) DECLSPEC_HIDDEN; static inline ME_DisplayItem *row_get_di( ME_Row *row ) { diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index 2c77962b56b..a12a8c7449b 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -82,10 +82,6 @@ void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) cursor->nOffset = (item->type == diStartRow || include_eop) ? cursor->pRun->member.run.len : 0; } -ME_DisplayItem *ME_RowStart(ME_DisplayItem *item) { - return ME_FindItemBackOrHere(item, diStartRow); -} - ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) { ME_Paragraph *para = editor_first_para( editor );

1 0

← Newer
1
...
79
80
81
82
83
84
85
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2020