September 2022 - Wine-Commits

Eric Pouech : dbghelp: Support depth relating to top function for inline sites.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: cffdaabbc9a1ca12fc349841b6b65caa43c6b556 URL: https://gitlab.winehq.org/wine/wine/-/commit/cffdaabbc9a1ca12fc349841b6b65c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 13 16:25:13 2022 +0200 dbghelp: Support depth relating to top function for inline sites. When using an inline context which depth points towards the top level function (so when it's not strictly speaking an inline context), native falls back to picking information in the top level function. So we do now in SymSetScopeFromInlineContext() and SymFromInlineContext() (instead of returning an error). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp.c | 6 +++--- dlls/dbghelp/symbol.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index c154d8d9713..df257bb4639 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -712,8 +712,6 @@ BOOL WINAPI SymSetScopeFromInlineContext(HANDLE hProcess, ULONG64 addr, DWORD in switch (IFC_MODE(inlinectx)) { - case IFC_MODE_IGNORE: - case IFC_MODE_REGULAR: return SymSetScopeFromAddr(hProcess, addr); case IFC_MODE_INLINE: if (!module_init_pair(&pair, hProcess, addr)) return FALSE; inlined = symt_find_inlined_site(pair.effective, addr, inlinectx); @@ -723,7 +721,9 @@ BOOL WINAPI SymSetScopeFromInlineContext(HANDLE hProcess, ULONG64 addr, DWORD in pair.pcs->localscope_symt = &inlined->func.symt; return TRUE; } - return FALSE; + /* fall through */ + case IFC_MODE_IGNORE: + case IFC_MODE_REGULAR: return SymSetScopeFromAddr(hProcess, addr); default: SetLastError(ERROR_INVALID_PARAMETER); return FALSE; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 8e432e4be08..7b0324f5013 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -2675,9 +2675,6 @@ BOOL WINAPI SymFromInlineContext(HANDLE hProcess, DWORD64 addr, ULONG inline_ctx switch (IFC_MODE(inline_ctx)) { - case IFC_MODE_IGNORE: - case IFC_MODE_REGULAR: - return SymFromAddr(hProcess, addr, disp, si); case IFC_MODE_INLINE: if (!module_init_pair(&pair, hProcess, addr)) return FALSE; inlined = symt_find_inlined_site(pair.effective, addr, inline_ctx); @@ -2688,6 +2685,9 @@ BOOL WINAPI SymFromInlineContext(HANDLE hProcess, DWORD64 addr, ULONG inline_ctx return TRUE; } /* fall through */ + case IFC_MODE_IGNORE: + case IFC_MODE_REGULAR: + return SymFromAddr(hProcess, addr, disp, si); default: SetLastError(ERROR_INVALID_PARAMETER); return FALSE;

1 0

Eric Pouech : winedump: Print signed integers with %d.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 76d97b6e8e4b5831f2cb0e564f6560c4806c8a39 URL: https://gitlab.winehq.org/wine/wine/-/commit/76d97b6e8e4b5831f2cb0e564f6560… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 13 16:25:13 2022 +0200 winedump: Print signed integers with %d. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- tools/winedump/msc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index b5708017651..561d3ca98ca 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1284,7 +1284,7 @@ static void dump_binannot(const unsigned char* ba, const char* last, unsigned in case BA_OP_ChangeCodeOffsetAndLineOffset: { unsigned p1 = binannot_uncompress(&ba); - printf("%*s | ChangeCodeOffsetAndLineOffset %u %u (0x%x)\n", indent, "", p1 & 0xf, binannot_getsigned(p1 >> 4), p1); + printf("%*s | ChangeCodeOffsetAndLineOffset %u %d (0x%x)\n", indent, "", p1 & 0xf, binannot_getsigned(p1 >> 4), p1); } break; case BA_OP_ChangeCodeLengthAndCodeOffset:

1 0

Nikolay Sivov : dwrite/layout: Limit text window passed to MapCharacters() to the range of characters to map.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 47b2750309010092eb840b83d22c10a5e84d56f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/47b2750309010092eb840b83d22c10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 13 10:50:05 2022 +0300 dwrite/layout: Limit text window passed to MapCharacters() to the range of characters to map. Fallback instance does not get access to layout contents outside of given range. This could be observed with a custom fallback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/layout.c | 61 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 17 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 6dca45bf376..0d08ba99de6 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1,5 +1,5 @@ /* - * Copyright 2012, 2014-2021 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2022 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -226,6 +226,13 @@ struct dwrite_textlayout WCHAR *str; UINT32 len; + + struct + { + unsigned int offset; + unsigned int length; + } text_source; + struct dwrite_textformat_data format; struct list strike_ranges; struct list underline_ranges; @@ -595,6 +602,13 @@ static inline void layout_get_font_height(float emsize, const DWRITE_FONT_METRIC *height = SCALE_FONT_METRIC(fontmetrics->ascent + fontmetrics->descent + fontmetrics->lineGap, emsize, fontmetrics); } +static inline void layout_initialize_text_source(struct dwrite_textlayout *layout, unsigned int offset, + unsigned int length) +{ + layout->text_source.offset = offset; + layout->text_source.length = length; +} + static HRESULT layout_itemize(struct dwrite_textlayout *layout) { IDWriteTextAnalyzer2 *analyzer; @@ -604,6 +618,7 @@ static HRESULT layout_itemize(struct dwrite_textlayout *layout) analyzer = get_text_analyzer(); + layout_initialize_text_source(layout, 0, layout->len); LIST_FOR_EACH_ENTRY(range, &layout->ranges, struct layout_range, h.entry) { /* We don't care about ranges that don't contain any text. */ if (range->h.range.startPosition >= layout->len) @@ -666,9 +681,10 @@ static HRESULT layout_map_run_characters(struct dwrite_textlayout *layout, struc run = &r->u.regular; + layout_initialize_text_source(layout, run->descr.textPosition, run->descr.stringLength); hr = IDWriteFontFallback_MapCharacters(fallback, (IDWriteTextAnalysisSource *)&layout->IDWriteTextAnalysisSource1_iface, - run->descr.textPosition, run->descr.stringLength, collection, range->fontfamily, range->weight, - range->style, range->stretch, &mapped_length, &font, &scale); + 0, run->descr.stringLength, collection, range->fontfamily, range->weight, range->style, range->stretch, + &mapped_length, &font, &scale); if (FAILED(hr)) { WARN("%s: failed to map family %s, collection %p, hr %#lx.\n", debugstr_rundescr(&run->descr), @@ -1238,6 +1254,7 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) analyzer = get_text_analyzer(); + layout_initialize_text_source(layout, 0, layout->len); if (FAILED(hr = IDWriteTextAnalyzer2_AnalyzeLineBreakpoints(analyzer, (IDWriteTextAnalysisSource *)&layout->IDWriteTextAnalysisSource1_iface, 0, layout->len, (IDWriteTextAnalysisSink *)&layout->IDWriteTextAnalysisSink1_iface))) @@ -5047,11 +5064,13 @@ static HRESULT WINAPI dwritetextlayout_source_GetTextAtPosition(IDWriteTextAnaly TRACE("%p, %u, %p, %p.\n", iface, position, text, text_len); - if (position < layout->len) { - *text = &layout->str[position]; - *text_len = layout->len - position; + if (position < layout->text_source.length) + { + *text = &layout->str[position + layout->text_source.offset]; + *text_len = layout->text_source.length - position; } - else { + else + { *text = NULL; *text_len = 0; } @@ -5066,11 +5085,13 @@ static HRESULT WINAPI dwritetextlayout_source_GetTextBeforePosition(IDWriteTextA TRACE("%p, %u, %p, %p.\n", iface, position, text, text_len); - if (position > 0 && position < layout->len) { - *text = layout->str; + if (position && position < layout->text_source.length) + { + *text = &layout->str[layout->text_source.offset]; *text_len = position; } - else { + else + { *text = NULL; *text_len = 0; } @@ -5088,24 +5109,30 @@ static HRESULT WINAPI dwritetextlayout_source_GetLocaleName(IDWriteTextAnalysisS UINT32 position, UINT32* text_len, WCHAR const** locale) { struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSource1(iface); - struct layout_range *range = get_layout_range_by_pos(layout, position); + struct layout_range *range, *next; + unsigned int end; - if (position < layout->len) { - struct layout_range *next; + if (position < layout->text_source.length) + { + position += layout->text_source.offset; + end = layout->text_source.offset + layout->text_source.length; + + range = get_layout_range_by_pos(layout, position); *locale = range->locale; - *text_len = range->h.range.length - position; + *text_len = range->h.range.startPosition + range->h.range.length - position; next = LIST_ENTRY(list_next(&layout->ranges, &range->h.entry), struct layout_range, h.entry); - while (next && next->h.range.startPosition < layout->len && !wcscmp(range->locale, next->locale)) + while (next && next->h.range.startPosition < end && !wcscmp(range->locale, next->locale)) { *text_len += next->h.range.length; next = LIST_ENTRY(list_next(&layout->ranges, &next->h.entry), struct layout_range, h.entry); } - *text_len = min(*text_len, layout->len - position); + *text_len = min(*text_len, layout->text_source.length - position); } - else { + else + { *locale = NULL; *text_len = 0; }

1 0

Rémi Bernon : wineandroid.drv: Add missing DM_DISPLAYORIENTATION flag on display mode.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 37c2c6e352d3464f3fdecc8e93ef2c091458023e URL: https://gitlab.winehq.org/wine/wine/-/commit/37c2c6e352d3464f3fdecc8e93ef2c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 9 08:30:41 2022 +0200 wineandroid.drv: Add missing DM_DISPLAYORIENTATION flag on display mode. --- dlls/wineandroid.drv/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index aba642d1c5d..2cd01bd3f50 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -289,7 +289,7 @@ BOOL ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manag }; const DEVMODEW mode = { - .dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + .dmFields = DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, .dmBitsPerPel = screen_bpp, .dmPelsWidth = screen_width, .dmPelsHeight = screen_height, .dmDisplayFrequency = 60, }; device_manager->add_gpu( &gpu, param );

1 0

Eric Pouech : dbghelp: Store all address ranges for inline sites.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 6424b9d6b70ead890f729917fafc09a36d44a51b URL: https://gitlab.winehq.org/wine/wine/-/commit/6424b9d6b70ead890f729917fafc09… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 13 16:25:13 2022 +0200 dbghelp: Store all address ranges for inline sites. Store all the internal address ranges for an inline site (as we already do in dwarf debug info). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 71 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 811c8ffa165..ca2fe1c9302 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2043,6 +2043,18 @@ static BOOL cv_dbgsubsect_find_inlinee(const struct msc_debug_info* msc_dbg, return FALSE; } +static inline void inline_site_update_last_range(struct symt_inlinesite* inlined, ULONG_PTR hi) +{ + unsigned num = inlined->vranges.num_elts; + if (num) + { + struct addr_range* range = vector_at(&inlined->vranges, num - 1); + /* only change range if it has no span (code start without code end) */ + if (range->low == range->high) + range->high = hi; + } +} + static struct symt_inlinesite* codeview_create_inline_site(const struct msc_debug_info* msc_dbg, const struct cv_module_snarf* cvmod, struct symt_function* top_func, @@ -2053,11 +2065,10 @@ static struct symt_inlinesite* codeview_create_inline_site(const struct msc_debu { const struct CV_DebugSSubsectionHeader_t* hdr_files = NULL; const union codeview_type* cvt; - DWORD64 addr; struct symt_inlinesite* inlined; struct cv_binannot cvba; BOOL srcok, found = FALSE; - unsigned first, offset, length, line, srcfile; + unsigned offset, line, srcfile; const struct CV_Checksum_t* chksms; if (!cvmod->ipi_ctp || !(cvt = codeview_jump_to_type(cvmod->ipi_ctp, inlinee))) @@ -2066,7 +2077,6 @@ static struct symt_inlinesite* codeview_create_inline_site(const struct msc_debu return NULL; } - addr = top_func->address; /* grasp first code offset in binary annotation to compute inline site start address */ cvba.annot = annot; cvba.last_annot = last_annot; @@ -2075,19 +2085,16 @@ static struct symt_inlinesite* codeview_create_inline_site(const struct msc_debu cvba.opcode == BA_OP_ChangeCodeOffset || cvba.opcode == BA_OP_ChangeCodeOffsetAndLineOffset) { - addr += first = cvba.arg1; - length = 0; + offset = cvba.arg1; found = TRUE; break; } else if (cvba.opcode == BA_OP_ChangeCodeLengthAndCodeOffset) { - addr += first = cvba.arg2; - length = cvba.arg1; + offset = cvba.arg2; found = TRUE; break; } - offset = first; if (!found) { @@ -2099,13 +2106,13 @@ static struct symt_inlinesite* codeview_create_inline_site(const struct msc_debu { case LF_FUNC_ID: inlined = symt_new_inlinesite(msc_dbg->module, top_func, container, - cvt->func_id_v3.name, addr, + cvt->func_id_v3.name, top_func->address + offset, codeview_get_type(cvt->func_id_v3.type, FALSE)); break; case LF_MFUNC_ID: /* FIXME we just declare a function, not a method */ inlined = symt_new_inlinesite(msc_dbg->module, top_func, container, - cvt->mfunc_id_v3.name, addr, + cvt->mfunc_id_v3.name, top_func->address + offset, codeview_get_type(cvt->mfunc_id_v3.type, FALSE)); break; default: @@ -2123,27 +2130,35 @@ static struct symt_inlinesite* codeview_create_inline_site(const struct msc_debu if (!hdr_files) return FALSE; srcok = cv_dbgsubsect_find_inlinee(msc_dbg, inlinee, cvmod, hdr_files, &srcfile, &line); - if (srcok) - symt_add_func_line(msc_dbg->module, &inlined->func, srcfile, line, top_func->address + offset); - else + if (!srcok) srcfile = line = 0; - for (;;) + + /* rescan all annotations and store ranges & line information */ + offset = 0; + cvba.annot = annot; + cvba.last_annot = last_annot; + + while (codeview_advance_binannot(&cvba)) { - if (!codeview_advance_binannot(&cvba)) break; switch (cvba.opcode) { case BA_OP_CodeOffset: - first = offset = cvba.arg1; - length = 1; + offset = cvba.arg1; break; case BA_OP_ChangeCodeOffset: offset += cvba.arg1; - length = 1; + inline_site_update_last_range(inlined, top_func->address + offset); if (srcok) symt_add_func_line(msc_dbg->module, &inlined->func, srcfile, line, top_func->address + offset); + symt_add_inlinesite_range(msc_dbg->module, inlined, top_func->address + offset, top_func->address + offset); break; case BA_OP_ChangeCodeLength: - length = cvba.arg1; + /* this op doesn't seem widely used... */ + if (inlined->vranges.num_elts) + { + struct addr_range* range = vector_at(&inlined->vranges, inlined->vranges.num_elts - 1); + inline_site_update_last_range(inlined, range->low + cvba.arg1); + } break; case BA_OP_ChangeFile: chksms = CV_RECORD_GAP(hdr_files, cvba.arg1); @@ -2154,24 +2169,32 @@ static struct symt_inlinesite* codeview_create_inline_site(const struct msc_debu line += binannot_getsigned(cvba.arg1); break; case BA_OP_ChangeCodeOffsetAndLineOffset: - if (srcok) - symt_add_func_line(msc_dbg->module, &inlined->func, srcfile, line, top_func->address + offset); line += binannot_getsigned(cvba.arg2); offset += cvba.arg1; - length = 1; + inline_site_update_last_range(inlined, top_func->address + offset); + if (srcok) + symt_add_func_line(msc_dbg->module, &inlined->func, srcfile, line, top_func->address + offset); + symt_add_inlinesite_range(msc_dbg->module, inlined, top_func->address + offset, top_func->address + offset); break; case BA_OP_ChangeCodeLengthAndCodeOffset: offset += cvba.arg2; - length = cvba.arg1; + inline_site_update_last_range(inlined, top_func->address + offset); if (srcok) symt_add_func_line(msc_dbg->module, &inlined->func, srcfile, line, top_func->address + offset); + symt_add_inlinesite_range(msc_dbg->module, inlined, top_func->address + offset, top_func->address + offset + cvba.arg1); break; default: WARN("Unsupported op %d\n", cvba.opcode); break; } } - symt_add_inlinesite_range(msc_dbg->module, inlined, top_func->address + first, top_func->address + offset + length); + if (inlined->vranges.num_elts) + { + struct addr_range* range = vector_at(&inlined->vranges, inlined->vranges.num_elts - 1); + if (range->low == range->high) WARN("pending empty range at end of %s inside %s\n", + inlined->func.hash_elt.name, + top_func->hash_elt.name); + } return inlined; }

1 0

Nikolay Sivov : dwrite/layout: Use already resolved or last resort fonts when setting dummy line metrics.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: b783100773acfef1ad70d6b6784f8b847755e645 URL: https://gitlab.winehq.org/wine/wine/-/commit/b783100773acfef1ad70d6b6784f8b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 13 00:19:57 2022 +0300 dwrite/layout: Use already resolved or last resort fonts when setting dummy line metrics. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/layout.c | 76 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 31 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 85f45b4036e..becb2678687 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -719,15 +719,12 @@ static HRESULT layout_map_run_characters(struct dwrite_textlayout *layout, struc return hr; } -static HRESULT layout_run_set_last_resort_font(struct dwrite_textlayout *layout, struct layout_run *r) +static HRESULT layout_run_get_last_resort_font(const struct dwrite_textlayout *layout, const struct layout_range *range, + IDWriteFontFace **fontface, float *size) { - struct regular_layout_run *run = &r->u.regular; - struct layout_range *range; IDWriteFont *font; HRESULT hr; - range = get_layout_range_by_pos(layout, run->descr.textPosition); - if (FAILED(create_matching_font(range->collection, range->fontfamily, range->weight, range->style, range->stretch, &IID_IDWriteFont3, (void **)&font))) { @@ -739,7 +736,7 @@ static HRESULT layout_run_set_last_resort_font(struct dwrite_textlayout *layout, } } - hr = IDWriteFont_CreateFontFace(font, &run->run.fontFace); + hr = IDWriteFont_CreateFontFace(font, fontface); IDWriteFont_Release(font); if (FAILED(hr)) { @@ -747,7 +744,7 @@ static HRESULT layout_run_set_last_resort_font(struct dwrite_textlayout *layout, return hr; } - run->run.fontEmSize = range->fontsize; + *size = range->fontsize; return hr; } @@ -795,7 +792,10 @@ static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout) } if (remaining) - hr = layout_run_set_last_resort_font(layout, remaining); + { + hr = layout_run_get_last_resort_font(layout, get_layout_range_by_pos(layout, remaining->u.regular.descr.textPosition), + &remaining->u.regular.run.fontFace, &remaining->u.regular.run.fontEmSize); + } if (FAILED(hr)) break; } @@ -1856,29 +1856,51 @@ static HRESULT layout_add_underline(struct dwrite_textlayout *layout, struct lay return S_OK; } -/* Adds zero width line, metrics are derived from font at specified text position. */ -static HRESULT layout_set_dummy_line_metrics(struct dwrite_textlayout *layout, UINT32 pos) +static inline struct regular_layout_run * layout_get_last_run(const struct dwrite_textlayout *layout) +{ + struct layout_run *r; + struct list *e; + + if (!(e = list_tail(&layout->runs))) return NULL; + r = LIST_ENTRY(e, struct layout_run, entry); + if (r->kind != LAYOUT_RUN_REGULAR) return NULL; + return &r->u.regular; +} + +/* Adds a dummy line if: + - there's no text, metrics come from first range in this case; + - last ended with a mandatory break, metrics come from last text position. +*/ +static HRESULT layout_set_dummy_line_metrics(struct dwrite_textlayout *layout) { DWRITE_LINE_METRICS1 metrics = { 0 }; DWRITE_FONT_METRICS fontmetrics; - struct layout_range *range; + struct regular_layout_run *run; IDWriteFontFace *fontface; - IDWriteFont *font; + float size; HRESULT hr; - range = get_layout_range_by_pos(layout, pos); - if (FAILED(hr = create_matching_font(range->collection, range->fontfamily, range->weight, range->style, - range->stretch, &IID_IDWriteFont, (void **)&font))) + if (layout->cluster_count && !layout->clustermetrics[layout->cluster_count - 1].isNewline) + return S_OK; + + if (!layout->cluster_count) { - return hr; + if (FAILED(hr = layout_run_get_last_resort_font(layout, get_layout_range_by_pos(layout, 0), &fontface, &size))) + return hr; + } + else if (!(run = layout_get_last_run(layout))) + { + return S_OK; + } + else + { + fontface = run->run.fontFace; + IDWriteFontFace_AddRef(fontface); + size = run->run.fontEmSize; } - hr = IDWriteFont_CreateFontFace(font, &fontface); - IDWriteFont_Release(font); - if (FAILED(hr)) - return hr; - layout_get_font_metrics(layout, fontface, range->fontsize, &fontmetrics); - layout_get_font_height(range->fontsize, &fontmetrics, &metrics.baseline, &metrics.height); + layout_get_font_metrics(layout, fontface, size, &fontmetrics); + layout_get_font_height(size, &fontmetrics, &metrics.baseline, &metrics.height); IDWriteFontFace_Release(fontface); return layout_set_line_metrics(layout, &metrics); @@ -2156,15 +2178,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) width = 0.0f; } - /* Add dummy line if: - - there's no text, metrics come from first range in this case; - - last ended with a mandatory break, metrics come from last text position. - */ - if (layout->len == 0) - hr = layout_set_dummy_line_metrics(layout, 0); - else if (layout->cluster_count && layout->clustermetrics[layout->cluster_count - 1].isNewline) - hr = layout_set_dummy_line_metrics(layout, layout->len - 1); - if (FAILED(hr)) + if (FAILED(hr = layout_set_dummy_line_metrics(layout))) return hr; layout->metrics.left = is_rtl ? layout->metrics.layoutWidth - layout->metrics.width : 0.0f;

1 0

Nikolay Sivov : dwrite/layout: Keep system font collection for each layout.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 8d2bca638de824148d374485312197d3e1a8677a URL: https://gitlab.winehq.org/wine/wine/-/commit/8d2bca638de824148d374485312197… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 12 22:54:30 2022 +0300 dwrite/layout: Keep system font collection for each layout. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/layout.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 9150e75f289..85f45b4036e 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -222,6 +222,7 @@ struct dwrite_textlayout LONG refcount; IDWriteFactory7 *factory; + IDWriteFontCollection *system_collection; WCHAR *str; UINT32 len; @@ -642,7 +643,7 @@ static HRESULT layout_itemize(struct dwrite_textlayout *layout) } static HRESULT layout_map_run_characters(struct dwrite_textlayout *layout, struct layout_run *r, - IDWriteFontCollection *system_collection, IDWriteFontFallback *fallback, struct layout_run **remaining) + IDWriteFontFallback *fallback, struct layout_run **remaining) { struct regular_layout_run *run = &r->u.regular; IDWriteFontCollection *collection; @@ -653,7 +654,7 @@ static HRESULT layout_map_run_characters(struct dwrite_textlayout *layout, struc *remaining = NULL; range = get_layout_range_by_pos(layout, run->descr.textPosition); - collection = range->collection ? range->collection : system_collection; + collection = range->collection ? range->collection : layout->system_collection; length = run->descr.stringLength; @@ -718,8 +719,7 @@ static HRESULT layout_map_run_characters(struct dwrite_textlayout *layout, struc return hr; } -static HRESULT layout_run_set_last_resort_font(struct dwrite_textlayout *layout, struct layout_run *r, - IDWriteFontCollection *system_collection) +static HRESULT layout_run_set_last_resort_font(struct dwrite_textlayout *layout, struct layout_run *r) { struct regular_layout_run *run = &r->u.regular; struct layout_range *range; @@ -731,7 +731,7 @@ static HRESULT layout_run_set_last_resort_font(struct dwrite_textlayout *layout, if (FAILED(create_matching_font(range->collection, range->fontfamily, range->weight, range->style, range->stretch, &IID_IDWriteFont3, (void **)&font))) { - if (FAILED(hr = create_matching_font(system_collection, L"Tahoma", range->weight, range->style, + if (FAILED(hr = create_matching_font(layout->system_collection, L"Tahoma", range->weight, range->style, range->stretch, &IID_IDWriteFont3, (void **)&font))) { WARN("Failed to create last resort font, hr %#lx.\n", hr); @@ -754,22 +754,13 @@ static HRESULT layout_run_set_last_resort_font(struct dwrite_textlayout *layout, static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout) { - IDWriteFontCollection *system_collection; IDWriteFontFallback *system_fallback; struct layout_run *r, *remaining; HRESULT hr; - if (FAILED(hr = IDWriteFactory5_GetSystemFontCollection((IDWriteFactory5 *)layout->factory, FALSE, - (IDWriteFontCollection1 **)&system_collection, FALSE))) - { - WARN("Failed to get system collection, hr %#lx.\n", hr); - return hr; - } - if (FAILED(hr = IDWriteFactory7_GetSystemFontFallback(layout->factory, &system_fallback))) { WARN("Failed to get system fallback, hr %#lx.\n", hr); - IDWriteFontCollection_Release(system_collection); return hr; } @@ -786,7 +777,7 @@ static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout) if (run->sa.shapes == DWRITE_SCRIPT_SHAPES_NO_VISUAL) { - if (FAILED(hr = layout_map_run_characters(layout, r, system_collection, system_fallback, &remaining))) + if (FAILED(hr = layout_map_run_characters(layout, r, system_fallback, &remaining))) { WARN("Failed to map fonts for non-visual run, hr %#lx.\n", hr); break; @@ -795,21 +786,20 @@ static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout) else { if (layout->format.fallback) - hr = layout_map_run_characters(layout, r, system_collection, layout->format.fallback, &remaining); + hr = layout_map_run_characters(layout, r, layout->format.fallback, &remaining); else remaining = r; if (remaining) - hr = layout_map_run_characters(layout, remaining, system_collection, system_fallback, &remaining); + hr = layout_map_run_characters(layout, remaining, system_fallback, &remaining); } if (remaining) - hr = layout_run_set_last_resort_font(layout, remaining, system_collection); + hr = layout_run_set_last_resort_font(layout, remaining); if (FAILED(hr)) break; } - IDWriteFontCollection_Release(system_collection); IDWriteFontFallback_Release(system_fallback); return hr; @@ -2923,6 +2913,8 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout4 *iface) if (!refcount) { IDWriteFactory7_Release(layout->factory); + if (layout->system_collection) + IDWriteFontCollection_Release(layout->system_collection); free_layout_ranges_list(layout); free_layout_eruns(layout); free_layout_runs(layout); @@ -5297,6 +5289,13 @@ static HRESULT init_textlayout(const struct textlayout_desc *desc, struct dwrite list_add_head(&layout->effects, &effect->entry); list_add_head(&layout->spacing, &spacing->entry); list_add_head(&layout->typographies, &typography->entry); + + if (FAILED(hr = IDWriteFactory5_GetSystemFontCollection((IDWriteFactory5 *)layout->factory, FALSE, + (IDWriteFontCollection1 **)&layout->system_collection, FALSE))) + { + goto fail; + } + return S_OK; fail:

1 0

Nikolay Sivov : dwrite/layout: Constify some internal helpers arguments.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 31ab7f87dbbdf57e8659a60f11e6b12a2ad1b241 URL: https://gitlab.winehq.org/wine/wine/-/commit/31ab7f87dbbdf57e8659a60f11e6b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 13 08:56:41 2022 +0300 dwrite/layout: Constify some internal helpers arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/layout.c | 63 ++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 32 deletions(-)

1 0

Zebediah Figura : wined3d: Pass a draw count of 1 to Vulkan indirect draw commands.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 69c219dd78ab8194b78e05571e60328031c36664 URL: https://gitlab.winehq.org/wine/wine/-/commit/69c219dd78ab8194b78e05571e6032… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 31 20:24:53 2022 -0500 wined3d: Pass a draw count of 1 to Vulkan indirect draw commands. Spotted by Philip Rebohle. This fixes rendering in "Discovery Tour by Assassin's Creed: Ancient Egypt". --- dlls/wined3d/adapter_vk.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index bf93e4a1c19..90ffec4b1f7 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1813,23 +1813,14 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, if (parameters->indirect) { struct wined3d_bo_vk *bo = wined3d_bo_vk(indirect_vk->b.buffer_object); - uint32_t stride, size; wined3d_context_vk_reference_bo(context_vk, bo); - size = indirect_vk->b.resource.size - parameters->u.indirect.offset; - if (parameters->indexed) - { - stride = sizeof(VkDrawIndexedIndirectCommand); VK_CALL(vkCmdDrawIndexedIndirect(vk_command_buffer, bo->vk_buffer, - bo->b.buffer_offset + parameters->u.indirect.offset, size / stride, stride)); - } + bo->b.buffer_offset + parameters->u.indirect.offset, 1, sizeof(VkDrawIndexedIndirectCommand))); else - { - stride = sizeof(VkDrawIndirectCommand); VK_CALL(vkCmdDrawIndirect(vk_command_buffer, bo->vk_buffer, - bo->b.buffer_offset + parameters->u.indirect.offset, size / stride, stride)); - } + bo->b.buffer_offset + parameters->u.indirect.offset, 1, sizeof(VkDrawIndirectCommand))); } else {

1 0

Zebediah Figura : d3d8: Remove an incorrect comment.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: fdd8c0748b7dfc8e63b8509d309f0814692e8dfe URL: https://gitlab.winehq.org/wine/wine/-/commit/fdd8c0748b7dfc8e63b8509d309f08… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 30 15:30:42 2022 -0500 d3d8: Remove an incorrect comment. This was probably added on the assumption that IDirect3DDevice8::CopyRects() behaves like the similar IDirect3DDevice9::UpdateSurface(), but it does not. --- dlls/d3d8/device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b8193a83cbc..5113e11fb33 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1346,9 +1346,6 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, TRACE("iface %p, src_surface %p, src_rects %p, rect_count %u, dst_surface %p, dst_points %p.\n", iface, src_surface, src_rects, rect_count, dst_surface, dst_points); - /* Check that the source texture is in WINED3D_POOL_SYSTEM_MEM and the - * destination texture is in WINED3D_POOL_DEFAULT. */ - wined3d_mutex_lock(); wined3d_texture_get_sub_resource_desc(src->wined3d_texture, src->sub_resource_idx, &wined3d_desc); if (wined3d_desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL)

1 0