wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Huw Davies : riched20: Use run ptrs in the EM_GETLINECOUNT handler.
by Alexandre Julliard 02 Nov '20

02 Nov '20

Module: wine Branch: master Commit: d55bc24001b3354150e69184177070b0277649f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d55bc24001b3354150e69184… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 2 08:23:18 2020 +0000 riched20: Use run ptrs in the EM_GETLINECOUNT handler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c01bd873634..66f6bd5e114 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4291,27 +4291,24 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_GETLINECOUNT: { - ME_DisplayItem *item = editor->pBuffer->pLast; - int nRows = editor->total_rows; - ME_DisplayItem *prev_para = NULL, *last_para = NULL; - - last_para = ME_FindItemBack(item, diRun); - prev_para = ME_FindItemBack(last_para, diRun); - assert(last_para); - assert(last_para->member.run.nFlags & MERF_ENDPARA); - if (editor->bEmulateVersion10 && prev_para && - last_para->member.run.nCharOfs == 0 && - prev_para->member.run.len == 1 && - *get_text( &prev_para->member.run, 0 ) == '\r') + int count = editor->total_rows; + ME_Run *prev_run, *last_run; + + last_run = para_end_run( para_prev( editor_end_para( editor ) ) ); + prev_run = run_prev_all_paras( last_run ); + + if (editor->bEmulateVersion10 && prev_run && last_run->nCharOfs == 0 && + prev_run->len == 1 && *get_text( prev_run, 0 ) == '\r') { /* In 1.0 emulation, the last solitary \r at the very end of the text (if one exists) is NOT a line break. FIXME: this is an ugly hack. This should have a more regular model. */ - nRows--; + count--; } - TRACE("EM_GETLINECOUNT: nRows==%d\n", nRows); - return max(1, nRows); + count = max(1, count); + TRACE("EM_GETLINECOUNT: count==%d\n", count); + return count; } case EM_LINEFROMCHAR: {

1 0

Huw Davies : riched20: Return a row ptr from the row from row number function.
by Alexandre Julliard 02 Nov '20

02 Nov '20

Module: wine Branch: master Commit: fe2fd44e0a30c519c3b650f69f0e94a6212cc7b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe2fd44e0a30c519c3b650f6… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 2 08:23:17 2020 +0000 riched20: Return a row ptr from the row from row number function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 48 +++++++++++++++++++++++++++--------------------- dlls/riched20/editor.h | 2 +- dlls/riched20/row.c | 42 +++++++++++++++--------------------------- 3 files changed, 43 insertions(+), 49 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 620cb4fedcb..c01bd873634 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4237,26 +4237,32 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_GETLINE: { - ME_DisplayItem *run; + ME_Row *row; + ME_Run *run; const unsigned int nMaxChars = *(WORD *) lParam; unsigned int nCharsLeft = nMaxChars; char *dest = (char *) lParam; BOOL wroteNull = FALSE; + ME_Cursor start, end; TRACE("EM_GETLINE: row=%d, nMaxChars=%d (%s)\n", (int) wParam, nMaxChars, unicode ? "Unicode" : "Ansi"); - run = ME_FindRowWithNumber(editor, wParam); - if (run == NULL) - return 0; + row = row_from_row_number( editor, wParam ); + if (row == NULL) return 0; - while (nCharsLeft && (run = ME_FindItemFwd(run, diRunOrStartRow)) - && run->type == diRun) + row_first_cursor( row, &start ); + row_end_cursor( row, &end, TRUE ); + run = &start.pRun->member.run; + while (nCharsLeft) { - WCHAR *str = get_text( &run->member.run, 0 ); + WCHAR *str; unsigned int nCopy; + int ofs = (run == &start.pRun->member.run) ? start.nOffset : 0; + int len = (run == &end.pRun->member.run) ? end.nOffset : run->len; - nCopy = min(nCharsLeft, run->member.run.len); + str = get_text( run, ofs ); + nCopy = min( nCharsLeft, len ); if (unicode) memcpy(dest, str, nCopy * sizeof(WCHAR)); @@ -4265,6 +4271,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, nCharsLeft, NULL, NULL); dest += nCopy * (unicode ? sizeof(WCHAR) : 1); nCharsLeft -= nCopy; + if (run == &end.pRun->member.run) break; + run = row_next_run( row, run ); } /* append line termination, space allowing */ @@ -4321,20 +4329,18 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_LINEINDEX: { - ME_DisplayItem *item, *para; - int nCharOfs; + ME_Row *row; + ME_Cursor cursor; + int ofs; - if (wParam == -1) - item = ME_FindItemBack(editor->pCursors[0].pRun, diStartRow); - else - item = ME_FindRowWithNumber(editor, wParam); - if (!item) - return -1; - para = ME_GetParagraph(item); - item = ME_FindItemFwd(item, diRun); - nCharOfs = para->member.para.nCharOfs + item->member.run.nCharOfs; - TRACE("EM_LINEINDEX: nCharOfs==%d\n", nCharOfs); - return nCharOfs; + if (wParam == -1) row = row_from_cursor( editor->pCursors ); + else row = row_from_row_number( editor, wParam ); + if (!row) return -1; + + row_first_cursor( row, &cursor ); + ofs = ME_GetCursorOfs( &cursor ); + TRACE( "EM_LINEINDEX: nCharOfs==%d\n", ofs ); + return ofs; } case EM_LINELENGTH: { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 5f93aa39db9..d0d34ac5afc 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -115,11 +115,11 @@ void row_end_cursor( ME_Row *row, ME_Cursor *cursor, BOOL include_eop ) DECLSPEC void row_first_cursor( ME_Row *row, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Run *row_first_run( ME_Row *row ) DECLSPEC_HIDDEN; 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); */ -ME_DisplayItem *ME_FindRowWithNumber(ME_TextEditor *editor, int nRow) DECLSPEC_HIDDEN; 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 ba082244cfc..2c77962b56b 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -82,39 +82,27 @@ 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; } -/* I'm sure these functions would simplify some code in caret ops etc, - * I just didn't remember them when I wrote that code - */ - ME_DisplayItem *ME_RowStart(ME_DisplayItem *item) { return ME_FindItemBackOrHere(item, diStartRow); } -/* -ME_DisplayItem *ME_RowEnd(ME_DisplayItem *item) { - ME_DisplayItem *item2 = ME_FindItemFwd(item, diStartRowOrParagraphOrEnd); - if (!item2) return NULL; - return ME_FindItemBack(item, diRun); -} -*/ - -ME_DisplayItem * -ME_FindRowWithNumber(ME_TextEditor *editor, int nRow) +ME_Row *row_from_row_number( ME_TextEditor *editor, int row_num ) { - ME_DisplayItem *item = ME_FindItemFwd(editor->pBuffer->pFirst, diParagraph); - int nCount = 0; + ME_Paragraph *para = editor_first_para( editor ); + ME_Row *row; + int count = 0; - while (item->type == diParagraph && - nCount + item->member.para.nRows <= nRow) - { - nCount += item->member.para.nRows; - item = item->member.para.next_para; - } - if (item->type != diParagraph) - return NULL; - for (item = ME_FindItemFwd(item, diStartRow); item && nCount < nRow; nCount++) - item = ME_FindItemFwd(item, diStartRow); - return item; + while (para_next( para ) && count + para->nRows <= row_num) + { + count += para->nRows; + para = para_next( para ); + } + if (!para_next( para )) return NULL; + + for (row = para_first_row( para ); row && count < row_num; count++) + row = row_next( row ); + + return row; }

1 0

Huw Davies : riched20: Use para and row ptrs in the EM_GETFIRSTVISIBLELINE handler.
by Alexandre Julliard 02 Nov '20

02 Nov '20

Module: wine Branch: master Commit: c5b1378756efdd17cc0c9c1a5b2476170ed5fb67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5b1378756efdd17cc0c9c1a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 2 08:23:16 2020 +0000 riched20: Use para and row ptrs in the EM_GETFIRSTVISIBLELINE handler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 38553f7add3..620cb4fedcb 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4044,25 +4044,24 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return ((PARAFORMAT2 *)lParam)->dwMask; case EM_GETFIRSTVISIBLELINE: { - ME_DisplayItem *p = editor->pBuffer->pFirst; + ME_Paragraph *para = editor_first_para( editor ); + ME_Row *row; int y = editor->vert_si.nPos; - int ypara = 0; int count = 0; - int ystart, yend; - while(p) { - p = ME_FindItemFwd(p, diStartRowOrParagraphOrEnd); - if (p->type == diTextEnd) - break; - if (p->type == diParagraph) { - ypara = p->member.para.pt.y; - continue; - } - ystart = ypara + p->member.row.pt.y; - yend = ystart + p->member.row.nHeight; - if (y < yend) { - break; - } + + while (para_next( para )) + { + if (y < para->pt.y + para->nHeight) break; + count += para->nRows; + para = para_next( para ); + } + + row = para_first_row( para ); + while (row) + { + if (y < para->pt.y + row->pt.y + row->nHeight) break; count++; + row = row_next( row ); } return count; }

1 0

Huw Davies : riched20: Use a run ptr in the link notify function.
by Alexandre Julliard 02 Nov '20

02 Nov '20

Module: wine Branch: master Commit: 8046b5bc96d243293857109ed8b24d5813a39f64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8046b5bc96d243293857109e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 2 08:23:15 2020 +0000 riched20: Use a run ptr in the link notify function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b54b9334265..38553f7add3 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3451,8 +3451,9 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM int x,y; BOOL isExact; ME_Cursor cursor; /* The start of the clicked text. */ - + ME_Run *run; ENLINK info; + x = (short)LOWORD(lParam); y = (short)HIWORD(lParam); ME_CharFromPos(editor, x, y, &cursor, &isExact); @@ -3460,8 +3461,6 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM if (is_link( &cursor.pRun->member.run )) { /* The clicked run has CFE_LINK set */ - ME_DisplayItem *di; - info.nmhdr.hwndFrom = NULL; info.nmhdr.idFrom = 0; info.nmhdr.code = EN_LINK; @@ -3472,15 +3471,15 @@ static void ME_LinkNotify(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM /* find the first contiguous run with CFE_LINK set */ info.chrg.cpMin = ME_GetCursorOfs(&cursor); - di = cursor.pRun; - while (ME_PrevRun( NULL, &di, FALSE ) && is_link( &di->member.run )) - info.chrg.cpMin -= di->member.run.len; + run = &cursor.pRun->member.run; + while ((run = run_prev( run )) && is_link( run )) + info.chrg.cpMin -= run->len; /* find the last contiguous run with CFE_LINK set */ info.chrg.cpMax = ME_GetCursorOfs(&cursor) + cursor.pRun->member.run.len; - di = cursor.pRun; - while (ME_NextRun( NULL, &di, FALSE ) && is_link( &di->member.run )) - info.chrg.cpMax += di->member.run.len; + run = &cursor.pRun->member.run; + while ((run = run_next( run )) && is_link( run )) + info.chrg.cpMax += run->len; ITextHost_TxNotify(editor->texthost, info.nmhdr.code, &info); }

1 0

Huw Davies : riched20: Use paragraph ptrs in the WM_CHAR handler.
by Alexandre Julliard 02 Nov '20

02 Nov '20

Module: wine Branch: master Commit: 50c8fe4560f1a3489662fd513bd27634c8a0eb43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50c8fe4560f1a3489662fd51… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 2 08:23:14 2020 +0000 riched20: Use paragraph ptrs in the WM_CHAR handler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c1138bd1dab..b54b9334265 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -897,13 +897,13 @@ void ME_RTFTblAttrHook(RTF_Info *info) if (cellNum >= MAX_TABLE_CELLS) break; info->tableDef->cells[cellNum].rightBoundary = info->rtfParam; - if (cellNum < MAX_TAB_STOPS) { + if (cellNum < MAX_TAB_STOPS) + { /* Tab stops were used to store cell positions before v4.1 but v4.1 * still seems to set the tabstops without using them. */ - ME_DisplayItem *para = info->editor->pCursors[0].pPara; - PARAFORMAT2 *pFmt = &para->member.para.fmt; - pFmt->rgxTabs[cellNum] &= ~0x00FFFFFF; - pFmt->rgxTabs[cellNum] |= 0x00FFFFFF & info->rtfParam; + PARAFORMAT2 *fmt = &info->editor->pCursors[0].pPara->member.para.fmt; + fmt->rgxTabs[cellNum] &= ~0x00FFFFFF; + fmt->rgxTabs[cellNum] |= 0x00FFFFFF & info->rtfParam; } info->tableDef->numCellsDefined++; break; @@ -2795,7 +2795,7 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, if ((unsigned)wstr >= ' ' || wstr == '\t') { ME_Cursor cursor = editor->pCursors[0]; - ME_DisplayItem *para = cursor.pPara; + ME_Paragraph *para = &cursor.pPara->member.para; int from, to; BOOL ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; ME_GetSelectionOfs(editor, &from, &to); @@ -2803,38 +2803,40 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, /* v4.1 allows tabs to be inserted with ctrl key down */ !(ctrl_is_down && !editor->bEmulateVersion10)) { - ME_DisplayItem *para; BOOL selected_row = FALSE; - para = cursor.pPara; if (ME_IsSelection(editor) && cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && - to == ME_GetCursorOfs(&editor->pCursors[0]) && - para->member.para.prev_para->type == diParagraph) + to == ME_GetCursorOfs(&editor->pCursors[0]) && para_prev( para )) { - para = para->member.para.prev_para; + para = para_prev( para ); selected_row = TRUE; } - if (ME_IsInTable(para)) + if (para_in_table( para )) { table_handle_tab( editor, selected_row ); ME_CommitUndo(editor); return 0; } - } else if (!editor->bEmulateVersion10) { /* v4.1 */ - if (para->member.para.nFlags & MEPF_ROWEND) { - if (from == to) { - para = para->member.para.next_para; - if (para->member.para.nFlags & MEPF_ROWSTART) - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + } + else if (!editor->bEmulateVersion10) /* v4.1 */ + { + if (para->nFlags & MEPF_ROWEND) + { + if (from == to) + { + para = para_next( para ); + if (para->nFlags & MEPF_ROWSTART) 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 */ - if (ME_IsInTable(cursor.pRun) && + } + else /* v1.0 - 3.0 */ + { + if (para_in_table( para ) && cursor.pRun->member.run.nFlags & MERF_ENDPARA && from == to) {

1 0

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

02 Nov '20

Module: wine Branch: master Commit: 356ad03fcf7d3204d89b243a543076e2ada465b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=356ad03fcf7d3204d89b243a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 31 16:13:33 2020 +0100 gdi32: Move the font enumeration out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 300 +++++++++++++++++++++++++++++++++++++++++++- dlls/gdi32/freetype.c | 319 ----------------------------------------------- dlls/gdi32/gdi_private.h | 8 -- 3 files changed, 298 insertions(+), 329 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=356ad03fcf7d3204d89b…

1 0

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

02 Nov '20

Module: wine Branch: master Commit: c9b21a57075d01297b320def739b85dd2c6ef100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9b21a57075d01297b320def… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 31 15:58:54 2020 +0100 gdi32: Add a helper function to create a font from a face. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 31 +++++++++++++++++++++---------- dlls/gdi32/freetype.c | 19 +++---------------- dlls/gdi32/gdi_private.h | 3 ++- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5cca897fd40..abc202afcc3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1016,7 +1016,7 @@ static void free_font_handle( DWORD handle ) } } -struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) +static struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) { UINT len = file ? strlenW(file) : 0; struct gdi_font *font = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -1083,6 +1083,25 @@ void set_gdi_font_names( struct gdi_font *font, const WCHAR *family_name, const font->otm.otmpFaceName = (char *)strdupW( full_name ); } +struct gdi_font *create_gdi_font( const struct gdi_font_face *face, const WCHAR *family_name, + const LOGFONTW *lf ) +{ + struct gdi_font *font; + + if (!(font = alloc_gdi_font( face->file, face->data_ptr, face->data_size ))) return NULL; + font->fs = face->fs; + font->lf = *lf; + font->fake_italic = (lf->lfItalic && !(face->ntmFlags & NTM_ITALIC)); + font->fake_bold = (lf->lfWeight > 550 && !(face->ntmFlags & NTM_BOLD)); + font->scalable = face->scalable; + font->face_index = face->face_index; + font->ntmFlags = face->ntmFlags; + font->aa_flags = HIWORD( face->flags ); + if (!family_name) family_name = face->family->family_name; + set_gdi_font_names( font, family_name, face->style_name, face->full_name ); + return font; +} + struct glyph_metrics { GLYPHMETRICS gm; @@ -1490,22 +1509,14 @@ static void add_child_font( struct gdi_font *font, const WCHAR *family_name ) } if (!best_face) return; - child = alloc_gdi_font( best_face->file, best_face->data_ptr, best_face->data_size ); - child->fake_italic = italic && !(best_face->ntmFlags & NTM_ITALIC); - child->fake_bold = bold && !(best_face->ntmFlags & NTM_BOLD); - child->lf = font->lf; + if (!(child = create_gdi_font( best_face, family_name, &font->lf ))) return; child->matrix = font->matrix; child->can_use_bitmap = font->can_use_bitmap; - child->face_index = best_face->face_index; - child->ntmFlags = best_face->ntmFlags; - child->aa_flags = HIWORD( best_face->flags ); child->scale_y = font->scale_y; child->aveWidth = font->aveWidth; child->charset = font->charset; child->codepage = font->codepage; child->base_font = font; - set_gdi_font_names( child, family_name, best_face->style_name, best_face->full_name ); - list_add_tail( &font->child_fonts, &child->entry ); TRACE( "created child font %p for base %p\n", child, font ); } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 59095d4e6d8..ff57a971976 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3274,20 +3274,10 @@ found_face: height = lf.lfHeight; TRACE("not in cache\n"); - font = alloc_gdi_font( face->file, face->data_ptr, face->data_size ); + font = create_gdi_font( face, orig_name, &lf ); font->matrix = dcmat; - font->lf = lf; font->can_use_bitmap = can_use_bitmap; - font->fake_italic = (it && !(face->ntmFlags & NTM_ITALIC)); - font->fake_bold = (bd && !(face->ntmFlags & NTM_BOLD)); - font->fs = face->fs; - font->face_index = face->face_index; - font->ntmFlags = face->ntmFlags; - font->aa_flags = HIWORD( face->flags ); - set_gdi_font_names( font, orig_name ? orig_name : family->family_name, - face->style_name, face->full_name ); - if(csi.fs.fsCsb[0]) { font->charset = lf.lfCharSet; font->codepage = csi.ciACP; @@ -3506,6 +3496,7 @@ static void GetEnumStructs(Face *face, const WCHAR *family_name, LPENUMLOGFONTEX NEWTEXTMETRICEXW *pntm) { struct gdi_font *font; + LOGFONTW lf = { .lfHeight = 100 }; if (face->cached_enum_data) { @@ -3515,11 +3506,7 @@ static void GetEnumStructs(Face *face, const WCHAR *family_name, LPENUMLOGFONTEX return; } - font = alloc_gdi_font( face->file, face->data_ptr, face->data_size ); - font->lf.lfHeight = 100; - font->face_index = face->face_index; - font->ntmFlags = face->ntmFlags; - set_gdi_font_names( font, family_name, face->style_name, face->full_name ); + if (!(font = create_gdi_font( face, family_name, &lf ))) return; if (!freetype_load_font( font )) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index fd3f434399e..6f5266c0053 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -474,7 +474,6 @@ extern struct gdi_font_family *find_family_from_font_links( const WCHAR *name, c FONTSIGNATURE fs ) DECLSPEC_HIDDEN; extern void create_child_font_list( struct gdi_font *font ) DECLSPEC_HIDDEN; -extern struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) DECLSPEC_HIDDEN; extern void free_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN; extern void cache_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN; extern struct gdi_font *find_cached_gdi_font( const LOGFONTW *lf, const FMAT2 *matrix, @@ -482,6 +481,8 @@ extern struct gdi_font *find_cached_gdi_font( const LOGFONTW *lf, const FMAT2 *m static inline const WCHAR *get_gdi_font_name( struct gdi_font *font ) { return (WCHAR *)font->otm.otmpFamilyName; } extern void set_gdi_font_names( struct gdi_font *font, const WCHAR *family_name, const WCHAR *style_name, const WCHAR *full_name ) DECLSPEC_HIDDEN; +extern struct gdi_font *create_gdi_font( const struct gdi_font_face *face, const WCHAR *family_name, + 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 CRITICAL_SECTION font_cs DECLSPEC_HIDDEN;

1 0

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

02 Nov '20

Module: wine Branch: master Commit: ef77b38888d7fb68647ace9fb030be5b47c39189 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef77b38888d7fb68647ace9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 31 10:21:00 2020 +0100 gdi32: Move the dumping of the font list out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 19 +++++++++++++++++++ dlls/gdi32/freetype.c | 19 ------------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3f6e74fee1c..5cca897fd40 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -667,6 +667,24 @@ static void load_gdi_font_replacements(void) RegCloseKey( hkey ); } +static void dump_gdi_font_list(void) +{ + struct gdi_font_family *family; + struct gdi_font_face *face; + + LIST_FOR_EACH_ENTRY( family, &font_list, struct gdi_font_family, entry ) + { + TRACE( "Family: %s\n", debugstr_w(family->family_name) ); + LIST_FOR_EACH_ENTRY( face, &family->faces, struct gdi_font_face, entry ) + { + TRACE( "\t%s\t%s\t%08x", debugstr_w(face->style_name), debugstr_w(face->full_name), + face->fs.fsCsb[0] ); + if (!face->scalable) TRACE(" %d", face->size.height ); + TRACE("\n"); + } + } +} + 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 ) @@ -2778,6 +2796,7 @@ void font_init(void) load_gdi_font_subst(); load_gdi_font_replacements(); load_system_links(); + dump_gdi_font_list(); dump_gdi_font_subst(); } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 936e8539a8d..59095d4e6d8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1653,23 +1653,6 @@ static INT CDECL freetype_remove_font( const WCHAR *file, DWORD flags ) return count; } -static void DumpFontList(void) -{ - Family *family; - Face *face; - - LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { - TRACE( "Family: %s\n", debugstr_w(family->family_name) ); - LIST_FOR_EACH_ENTRY( face, &family->faces, Face, entry ) { - TRACE( "\t%s\t%s\t%08x", debugstr_w(face->style_name), debugstr_w(face->full_name), - face->fs.fsCsb[0] ); - if(!face->scalable) - TRACE(" %d", face->size.height); - TRACE("\n"); - } - } -} - #ifdef __ANDROID__ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) { @@ -2321,8 +2304,6 @@ BOOL WineEngInit( const struct font_backend_funcs **funcs ) reorder_font_list(); - DumpFontList(); - if(disposition == REG_CREATED_NEW_KEY) update_reg_entries();

1 0

Alexandre Julliard : gdi32: Move the creation of the child font list out of freetype.c.
by Alexandre Julliard 02 Nov '20

02 Nov '20

Module: wine Branch: master Commit: 8d4336c5fa8ac99365629d142dae50860468dc2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d4336c5fa8ac99365629d14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 31 10:20:26 2020 +0100 gdi32: Move the creation of the child font list out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 78 +++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/freetype.c | 91 ------------------------------------------------ dlls/gdi32/gdi_private.h | 1 + 3 files changed, 79 insertions(+), 91 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4dabc332736..3f6e74fee1c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1446,6 +1446,84 @@ static UINT get_GSUB_vert_glyph( struct gdi_font *font, UINT glyph ) return GSUB_apply_feature( font->gsub_table, font->vert_feature, glyph ); } +static void add_child_font( struct gdi_font *font, const WCHAR *family_name ) +{ + struct gdi_font *child; + struct gdi_font_family *family; + struct gdi_font_face *child_face, *best_face = NULL; + UINT penalty = 0, new_penalty = 0; + BOOL bold, italic, bd, it; + + italic = !!font->lf.lfItalic; + bold = font->lf.lfWeight > FW_MEDIUM; + + if (!(family = find_family_from_name( family_name ))) return; + + LIST_FOR_EACH_ENTRY( child_face, get_family_face_list(family), struct gdi_font_face, entry ) + { + it = !!(child_face->ntmFlags & NTM_ITALIC); + bd = !!(child_face->ntmFlags & NTM_BOLD); + new_penalty = ( it ^ italic ) + ( bd ^ bold ); + if (!best_face || new_penalty < penalty) + { + penalty = new_penalty; + best_face = child_face; + } + } + if (!best_face) return; + + child = alloc_gdi_font( best_face->file, best_face->data_ptr, best_face->data_size ); + child->fake_italic = italic && !(best_face->ntmFlags & NTM_ITALIC); + child->fake_bold = bold && !(best_face->ntmFlags & NTM_BOLD); + child->lf = font->lf; + child->matrix = font->matrix; + child->can_use_bitmap = font->can_use_bitmap; + child->face_index = best_face->face_index; + child->ntmFlags = best_face->ntmFlags; + child->aa_flags = HIWORD( best_face->flags ); + child->scale_y = font->scale_y; + child->aveWidth = font->aveWidth; + child->charset = font->charset; + child->codepage = font->codepage; + child->base_font = font; + set_gdi_font_names( child, family_name, best_face->style_name, best_face->full_name ); + + list_add_tail( &font->child_fonts, &child->entry ); + TRACE( "created child font %p for base %p\n", child, font ); +} + +void create_child_font_list( struct gdi_font *font ) +{ + static const WCHAR szDefaultFallbackLink[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}; + struct gdi_font_link *font_link; + struct gdi_font_link_entry *entry; + const WCHAR* font_name; + + if (!(font_name = get_gdi_font_subst( get_gdi_font_name(font), -1, NULL ))) + font_name = get_gdi_font_name( font ); + + if ((font_link = find_gdi_font_link( font_name ))) + { + TRACE("found entry in system list\n"); + LIST_FOR_EACH_ENTRY( entry, &font_link->links, struct gdi_font_link_entry, entry ) + add_child_font( font, entry->family_name ); + } + /* + * if not SYMBOL or OEM then we also get all the fonts for Microsoft + * Sans Serif. This is how asian windows get default fallbacks for fonts + */ + if (is_dbcs_ansi_cp(GetACP()) && font->charset != SYMBOL_CHARSET && font->charset != OEM_CHARSET && + strcmpiW( font_name, szDefaultFallbackLink ) != 0) + { + if ((font_link = find_gdi_font_link( szDefaultFallbackLink ))) + { + TRACE("found entry in default fallback list\n"); + LIST_FOR_EACH_ENTRY( entry, &font_link->links, struct gdi_font_link_entry, entry ) + add_child_font( font, entry->family_name ); + } + } +} + /* font cache */ static struct list gdi_font_list = LIST_INIT( gdi_font_list ); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b4bfd902309..936e8539a8d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -338,8 +338,6 @@ static BOOL antialias_fakes = TRUE; static const WCHAR font_mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N','T','_','M','U','T','E','X','_','_','\0'}; -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 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 ); @@ -2136,14 +2134,6 @@ static void delete_external_font_keys(void) if(winnt_key) RegCloseKey(winnt_key); } -static inline BOOL is_dbcs_ansi_cp(UINT ansi_cp) -{ - return ( ansi_cp == 932 /* CP932 for Japanese */ - || ansi_cp == 936 /* CP936 for Chinese Simplified */ - || ansi_cp == 949 /* CP949 for Korean */ - || ansi_cp == 950 ); /* CP950 for Chinese Traditional */ -} - static BOOL init_freetype(void) { ft_handle = dlopen(SONAME_LIBFREETYPE, RTLD_NOW); @@ -2712,87 +2702,6 @@ static LONG load_VDMX(struct gdi_font *font, LONG height) return ppem; } -/************************************************************* - * add_child_font - */ -static void add_child_font( struct gdi_font *font, const WCHAR *family_name ) -{ - struct gdi_font *child; - Family *family; - Face *child_face, *best_face = NULL; - UINT penalty = 0, new_penalty = 0; - BOOL bold, italic, bd, it; - - italic = !!font->lf.lfItalic; - bold = font->lf.lfWeight > FW_MEDIUM; - - if (!(family = find_family_from_name( family_name ))) return; - - LIST_FOR_EACH_ENTRY( child_face, get_face_list_from_family( family ), Face, entry ) - { - it = !!(child_face->ntmFlags & NTM_ITALIC); - bd = !!(child_face->ntmFlags & NTM_BOLD); - new_penalty = ( it ^ italic ) + ( bd ^ bold ); - if (!best_face || new_penalty < penalty) - { - penalty = new_penalty; - best_face = child_face; - } - } - if (!best_face) return; - - child = alloc_gdi_font( best_face->file, best_face->data_ptr, best_face->data_size ); - child->fake_italic = italic && !(best_face->ntmFlags & NTM_ITALIC); - child->fake_bold = bold && !(best_face->ntmFlags & NTM_BOLD); - child->lf = font->lf; - child->matrix = font->matrix; - child->can_use_bitmap = font->can_use_bitmap; - child->face_index = best_face->face_index; - child->ntmFlags = best_face->ntmFlags; - child->aa_flags = HIWORD( best_face->flags ); - child->scale_y = font->scale_y; - child->base_font = font; - set_gdi_font_names( child, family_name, best_face->style_name, best_face->full_name ); - - list_add_tail( &font->child_fonts, &child->entry ); - TRACE( "created child font %p for base %p\n", child, font ); -} - -/************************************************************* - * create_child_font_list - */ -static void create_child_font_list( struct gdi_font *font ) -{ - struct gdi_font_link *font_link; - struct gdi_font_link_entry *entry; - const WCHAR* font_name; - - if (!(font_name = get_gdi_font_subst( get_gdi_font_name(font), -1, NULL ))) - font_name = get_gdi_font_name( font ); - font_link = find_gdi_font_link(font_name); - if (font_link != NULL) - { - TRACE("found entry in system list\n"); - LIST_FOR_EACH_ENTRY( entry, &font_link->links, struct gdi_font_link_entry, entry ) - add_child_font( font, entry->family_name ); - } - /* - * if not SYMBOL or OEM then we also get all the fonts for Microsoft - * Sans Serif. This is how asian windows get default fallbacks for fonts - */ - if (is_dbcs_ansi_cp(GetACP()) && font->charset != SYMBOL_CHARSET && font->charset != OEM_CHARSET && - strcmpiW(font_name,szDefaultFallbackLink) != 0) - { - font_link = find_gdi_font_link(szDefaultFallbackLink); - if (font_link != NULL) - { - TRACE("found entry in default fallback list\n"); - LIST_FOR_EACH_ENTRY( entry, &font_link->links, struct gdi_font_link_entry, entry ) - add_child_font( font, entry->family_name ); - } - } -} - static BOOL select_charmap(FT_Face ft_face, FT_Encoding encoding) { FT_Error ft_err = FT_Err_Invalid_CharMap_Handle; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e73c4d3b417..fd3f434399e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -472,6 +472,7 @@ extern struct gdi_font_face *create_face( const WCHAR *style, const WCHAR *fulln extern struct gdi_font_link *find_gdi_font_link( const WCHAR *name ) DECLSPEC_HIDDEN; extern struct gdi_font_family *find_family_from_font_links( const WCHAR *name, const WCHAR *subst, FONTSIGNATURE fs ) DECLSPEC_HIDDEN; +extern void create_child_font_list( struct gdi_font *font ) DECLSPEC_HIDDEN; extern struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_T data_size ) DECLSPEC_HIDDEN; extern void free_gdi_font( struct gdi_font *font ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Move the font link support out of freetype.c.
by Alexandre Julliard 02 Nov '20

02 Nov '20

Module: wine Branch: master Commit: bc19adf47406190b95266868f896c3d94789a255 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc19adf47406190b95266868… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 31 10:19:08 2020 +0100 gdi32: Move the font link support out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 286 +++++++++++++++++++++++++++++++- dlls/gdi32/freetype.c | 420 ++++------------------------------------------- dlls/gdi32/gdi_private.h | 21 ++- 3 files changed, 336 insertions(+), 391 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc19adf47406190b9526…

1 0

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