November 2020 - Wine-Commits

Will Mainio : msvcrt/tests: Add scanf tests for dashes in scanset.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

Module: wine Branch: master Commit: e0812be876af60bdfafe283b96779958c4e20540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0812be876af60bdfafe283b… Author: Will Mainio <will.mainio(a)fastmail.com> Date: Mon Nov 2 16:00:16 2020 +0100 msvcrt/tests: Add scanf tests for dashes in scanset. Signed-off-by: Will Mainio <will.mainio(a)fastmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/scanf.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 57d9cc0ba12..f0c7208e8e8 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -186,6 +186,22 @@ static void test_sscanf( void ) ok( ret == 1, "Error with format \"%s\"\n","%*[a-cd-dg-e]%c"); ok( buffer[0] == 'h', "Error with \"abcefgdh\" \"%c\"\n", buffer[0]); + ret = p_sscanf("-123", "%[-0-9]", buffer); + ok( ret == 1, "Error with format \"%s\"\n", "%[-0-9]"); + ok( strcmp("-123", buffer) == 0, "Error with \"-123\" \"%s\"\n", buffer); + + ret = p_sscanf("-321", "%[0-9-]", buffer); + ok( ret == 1, "Error with format \"%s\"\n", "%[0-9-]"); + ok( strcmp("-321", buffer) == 0, "Error with \"-321\" \"%s\"\n", buffer); + + ret = p_sscanf("-4123", "%[1-2-4]", buffer); + ok( ret == 1, "Error with format \"%s\"\n", "%[1-2-4]"); + ok( strcmp("-412", buffer) == 0, "Error with \"-412\" \"%s\"\n", buffer); + + ret = p_sscanf("-456123", "%[1-2-45-6]", buffer); + ok( ret == 1, "Error with format \"%s\"\n", "%[1-2-45-6]"); + ok( strcmp("-45612", buffer) == 0, "Error with \"-45612\" \"%s\"\n", buffer); + buffer1[0] = 'b'; ret = p_sscanf("a","%s%s", buffer, buffer1); ok( ret == 1, "expected 1, got %u\n", ret);

1 0

Jan Sikorski : wininet: Prevent use after free in logging.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

Module: wine Branch: master Commit: bcdb58cc7959afd5fa35ab039e6564934888b4c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcdb58cc7959afd5fa35ab03… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 30 12:13:23 2020 +0100 wininet: Prevent use after free in logging. Make logs which show values that are unmapped by cache_container_unlock_index() go before it's called. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/urlcache.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 3275cb19e6a..4a397b6b4de 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1808,9 +1808,9 @@ static BOOL urlcache_get_entry_info(const char *url, void *entry_info, url_entry = (const entry_url*)((LPBYTE)header + hash_entry->offset); if(url_entry->header.signature != URL_SIGNATURE) { - cache_container_unlock_index(container, header); FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPCSTR)&url_entry->header.signature, sizeof(DWORD))); + cache_container_unlock_index(container, header); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } @@ -2041,8 +2041,8 @@ BOOL WINAPI SetUrlCacheEntryInfoA(LPCSTR lpszUrlName, pEntry = (entry_header*)((LPBYTE)pHeader + pHashEntry->offset); if (pEntry->signature != URL_SIGNATURE) { - cache_container_unlock_index(pContainer, pHeader); FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&pEntry->signature, sizeof(DWORD))); + cache_container_unlock_index(pContainer, pHeader); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } @@ -2111,9 +2111,9 @@ static BOOL urlcache_entry_get_file(const char *url, void *entry_info, DWORD *si url_entry = (entry_url*)((LPBYTE)header + hash_entry->offset); if(url_entry->header.signature != URL_SIGNATURE) { - cache_container_unlock_index(container, header); FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&url_entry->header.signature, sizeof(DWORD))); + cache_container_unlock_index(container, header); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } @@ -4004,9 +4004,9 @@ BOOL WINAPI IsUrlCacheEntryExpiredA(LPCSTR url, DWORD dwFlags, FILETIME* pftLast pEntry = (const entry_header*)((LPBYTE)pHeader + pHashEntry->offset); if (pEntry->signature != URL_SIGNATURE) { + FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPCSTR)&pEntry->signature, sizeof(DWORD))); cache_container_unlock_index(pContainer, pHeader); memset(pftLastModified, 0, sizeof(*pftLastModified)); - FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPCSTR)&pEntry->signature, sizeof(DWORD))); return TRUE; }

1 0

Brendan Shanks : dbghelp: Use PEB->CloudFileFlags instead of PEB->Reserved for debug base address.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

Module: wine Branch: master Commit: f40195cd9206872388d01e72db92ddf6b3140f6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f40195cd9206872388d01e72… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Oct 30 08:17:15 2020 -0700 dbghelp: Use PEB->CloudFileFlags instead of PEB->Reserved for debug base address. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50077 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 4 ++-- dlls/ntdll/unix/virtual.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 9d33bc67f2b..e38687412eb 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -304,14 +304,14 @@ static BOOL check_live_target(struct process* pcs) PEB32 peb32; C_ASSERT(sizeof(void*) != 4 || FIELD_OFFSET(RTL_USER_PROCESS_PARAMETERS, Environment) == 0x48); if (!ReadProcessMemory(pcs->handle, pbi.PebBaseAddress, &peb32, sizeof(peb32), NULL)) return FALSE; - base = peb32.Reserved[0]; + if (!ReadProcessMemory(pcs->handle, (char *)pbi.PebBaseAddress + 0x460 /* CloudFileFlags */, &base, sizeof(base), NULL)) return FALSE; if (read_process_memory(pcs, peb32.ProcessParameters + 0x48, &env32, sizeof(env32))) env = env32; } else { PEB peb; if (!ReadProcessMemory(pcs->handle, pbi.PebBaseAddress, &peb, sizeof(peb), NULL)) return FALSE; - base = peb.Reserved[0]; + if (!ReadProcessMemory(pcs->handle, &peb.CloudFileFlags, &base, sizeof(base), NULL)) return FALSE; ReadProcessMemory(pcs->handle, &peb.ProcessParameters->Environment, &env, sizeof(env), NULL); } diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 614159b7d90..853eb0469b9 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2591,7 +2591,7 @@ TEB *virtual_alloc_first_teb(void) NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &block_size, MEM_COMMIT, PAGE_READWRITE ); NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&peb, 0, &peb_size, MEM_COMMIT, PAGE_READWRITE ); init_teb( teb, peb ); - *(ULONG_PTR *)peb->Reserved = get_image_address(); + *(ULONG_PTR *)&peb->CloudFileFlags = get_image_address(); return teb; }

1 0

Huw Davies : riched20: Use a run ptr in the link notify function.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

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

Alexandre Julliard : gdi32: Move the font enumeration out of freetype.c.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

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

Huw Davies : riched20: Use paragraph ptrs in the WM_CHAR handler.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

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

Huw Davies : riched20: Use para and row ptrs in the EM_GETFIRSTVISIBLELINE handler.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

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

Alexandre Julliard : gdi32: Move the creation of the child font list out of freetype.c.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

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 dumping of the font list out of freetype.c.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

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

Brendan Shanks : ntdll: Update the PEB structures for newer Windows versions.
by Alexandre Julliard Nov. 2, 2020

Nov. 2, 2020

Module: wine Branch: master Commit: d18724c8169d50818c2c27ff3fb0b0567a5a3932 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d18724c8169d50818c2c27ff… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Oct 30 08:17:14 2020 -0700 ntdll: Update the PEB structures for newer Windows versions. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index bd6a2c35932..36cc8e8e984 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -379,6 +379,12 @@ typedef struct _PEB PVOID WaitOnAddressHashTable [0x80]; /* 25c/3a0 */ PVOID TelemetryCoverageHeader; /* 45c/7a0 */ ULONG CloudFileFlags; /* 460/7a8 */ + ULONG CloudFileDiagFlags; /* 464/7ac */ + CHAR PlaceholderCompatibilityMode; /* 468/7b0 */ + CHAR PlaceholderCompatibilityModeReserved[7]; /* 469/7b1 */ + PVOID LeapSecondData; /* 470/7b8 */ + ULONG LeapSecondFlags; /* 474/7c0 */ + ULONG NtGlobalFlag2; /* 478/7c4 */ } PEB, *PPEB; @@ -617,6 +623,12 @@ typedef struct _PEB64 ULONG64 WaitOnAddressHashTable [0x80]; /* 03a0 */ ULONG64 TelemetryCoverageHeader; /* 07a0 */ ULONG CloudFileFlags; /* 07a8 */ + ULONG CloudFileDiagFlags; /* 07ac */ + CHAR PlaceholderCompatibilityMode; /* 07b0 */ + CHAR PlaceholderCompatibilityModeReserved[7]; /* 07b1 */ + ULONG64 LeapSecondData; /* 07b8 */ + ULONG LeapSecondFlags; /* 07c0 */ + ULONG NtGlobalFlag2; /* 07c4 */ } PEB64; typedef struct _TEB64

1 0