wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Eric Pouech : dbghelp/dwarf: Store each subrange for an inlined function.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: fb34c82ef80c4657ea262e4e2f121208db741da0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb34c82ef80c4657ea262e4e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Oct 28 08:58:04 2021 +0200 dbghelp/dwarf: Store each subrange for an inlined function. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 15 ++++++++++ dlls/dbghelp/dwarf.c | 63 ++++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/symbol.c | 36 ++++++++++++++++++++++++ 3 files changed, 114 insertions(+) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 34f51c28608..2a277a14751 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -268,6 +268,18 @@ struct addr_range DWORD64 high; /* absolute address of first byte after the range */ }; +/* tests whether ar2 is inside ar1 */ +static inline BOOL addr_range_inside(const struct addr_range* ar1, const struct addr_range* ar2) +{ + return ar1->low <= ar2->low && ar2->high <= ar1->high; +} + +/* tests whether ar1 and ar2 are disjoint */ +static inline BOOL addr_range_disjoint(const struct addr_range* ar1, const struct addr_range* ar2) +{ + return ar1->high <= ar2->low || ar2->high <= ar1->low; +} + /* a symt_inlinesite* can be casted to a symt_function* to access all function bits */ struct symt_inlinesite { @@ -841,6 +853,9 @@ extern struct symt_hierarchy_point* enum SymTagEnum point, const struct location* loc, const char* name) DECLSPEC_HIDDEN; +extern BOOL symt_add_inlinesite_range(struct module* module, + struct symt_inlinesite* inlined, + ULONG_PTR low, ULONG_PTR high) DECLSPEC_HIDDEN; extern struct symt_thunk* symt_new_thunk(struct module* module, struct symt_compiland* parent, diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index a01b72c4fc8..1ea8d2df773 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1272,6 +1272,66 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in } } +static BOOL dwarf2_feed_inlined_ranges(dwarf2_parse_context_t* ctx, const dwarf2_debug_info_t* di, + struct symt_inlinesite* inlined) +{ + struct attribute range; + + if (dwarf2_find_attribute(di, DW_AT_ranges, &range)) + { + dwarf2_traverse_context_t traverse; + + traverse.data = ctx->module_ctx->sections[section_ranges].address + range.u.uvalue; + traverse.end_data = ctx->module_ctx->sections[section_ranges].address + + ctx->module_ctx->sections[section_ranges].size; + + while (traverse.data + 2 * ctx->head.word_size < traverse.end_data) + { + ULONG_PTR low = dwarf2_parse_addr_head(&traverse, &ctx->head); + ULONG_PTR high = dwarf2_parse_addr_head(&traverse, &ctx->head); + if (low == 0 && high == 0) break; + if (low == (ctx->head.word_size == 8 ? (~(DWORD64)0u) : (DWORD64)(~0u))) + FIXME("unsupported yet (base address selection)\n"); + /* range values are relative to start of compilation unit */ + symt_add_inlinesite_range(ctx->module_ctx->module, inlined, + ctx->compiland->address + low, ctx->compiland->address + high); + } + + return TRUE; + } + else + { + struct attribute low_pc; + struct attribute high_pc; + + if (!dwarf2_find_attribute(di, DW_AT_low_pc, &low_pc) || + !dwarf2_find_attribute(di, DW_AT_high_pc, &high_pc)) + return FALSE; + if (ctx->head.version >= 4) + switch (high_pc.form) + { + case DW_FORM_addr: + break; + case DW_FORM_data1: + case DW_FORM_data2: + case DW_FORM_data4: + case DW_FORM_data8: + case DW_FORM_sdata: + case DW_FORM_udata: + /* From dwarf4 on, when FORM's class is constant, high_pc is an offset from low_pc */ + high_pc.u.uvalue += low_pc.u.uvalue; + break; + default: + FIXME("Unsupported class for high_pc\n"); + break; + } + symt_add_inlinesite_range(ctx->module_ctx->module, inlined, + ctx->module_ctx->load_offset + low_pc.u.uvalue, + ctx->module_ctx->load_offset + high_pc.u.uvalue); + return TRUE; + } +} + /****************************************************************** * dwarf2_read_one_debug_info * @@ -2038,6 +2098,9 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, subpgm->current_func = (struct symt_function*)inlined; subpgm->current_block = NULL; + if (!dwarf2_feed_inlined_ranges(subpgm->ctx, di, inlined)) + WARN("cannot read ranges\n"); + children = dwarf2_get_di_children(di); if (children) for (i = 0; i < vector_length(children); i++) { diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index aebe5fee098..9b7c5f3078e 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -576,6 +576,42 @@ struct symt_hierarchy_point* symt_add_function_point(struct module* module, return sym; } +/* low and high are absolute addresses */ +BOOL symt_add_inlinesite_range(struct module* module, + struct symt_inlinesite* inlined, + ULONG_PTR low, ULONG_PTR high) +{ + struct addr_range* p; + + p = vector_add(&inlined->vranges, &module->pool); + p->low = low; + p->high = high; + if (TRUE) + { + int i; + + /* see dbghelp_private.h for the assumptions */ + for (i = 0; i < inlined->vranges.num_elts - 1; i++) + { + if (!addr_range_disjoint((struct addr_range*)vector_at(&inlined->vranges, i), p)) + { + FIXME("Added addr_range isn't disjoint from siblings\n"); + } + } + for ( ; inlined->func.symt.tag != SymTagFunction; inlined = (struct symt_inlinesite*)symt_get_upper_inlined(inlined)) + { + for (i = 0; i < inlined->vranges.num_elts; i++) + { + struct addr_range* ar = (struct addr_range*)vector_at(&inlined->vranges, i); + if (!addr_range_disjoint(ar, p) && !addr_range_inside(ar, p)) + FIXME("Added addr_range not compatible with parent\n"); + } + } + } + + return TRUE; +} + struct symt_thunk* symt_new_thunk(struct module* module, struct symt_compiland* compiland, const char* name, THUNK_ORDINAL ord,

1 0

Eric Pouech : dbghelp/dwarf: Generate proper inline functions.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: 690c2e51bfba7028b69523c6f334a5f413714b69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=690c2e51bfba7028b69523c6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Oct 28 08:57:50 2021 +0200 dbghelp/dwarf: Generate proper inline functions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 16 ++++++++ dlls/dbghelp/dwarf.c | 81 +++++++++++++++++++++++-------------- dlls/dbghelp/symbol.c | 90 ++++++++++++++++++++++++++++++++++-------- 3 files changed, 141 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=690c2e51bfba7028b695…

1 0

Eric Pouech : dbghelp/dwarf: Add current block as a field in dwarf2_subprogram_t.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: ecb91941b3bcbdc0e7ff15ba2a6286c8aceba49a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecb91941b3bcbdc0e7ff15ba… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Oct 28 08:57:38 2021 +0200 dbghelp/dwarf: Add current block as a field in dwarf2_subprogram_t. Instead of passing it as a parameter in various subprogram related functions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 59 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 86650e991a8..ef86e6bffe0 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1812,6 +1812,7 @@ typedef struct dwarf2_subprogram_s { dwarf2_parse_context_t* ctx; struct symt_function* func; + struct symt_block* current_block; BOOL non_computed_variable; struct location frame; } dwarf2_subprogram_t; @@ -1822,7 +1823,6 @@ typedef struct dwarf2_subprogram_s * Parses any variable (parameter, local/global variable) */ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, - struct symt_block* block, dwarf2_debug_info_t* di) { struct symt* param_type; @@ -1832,7 +1832,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, TRACE("%s\n", dwarf2_debug_di(di)); - is_pmt = !block && di->abbrev->tag == DW_TAG_formal_parameter; + is_pmt = !subpgm->current_block && di->abbrev->tag == DW_TAG_formal_parameter; param_type = dwarf2_lookup_type(di); if (!dwarf2_find_attribute(di, DW_AT_name, &name)) { @@ -1873,7 +1873,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, if (subpgm->func) symt_add_func_local(subpgm->ctx->module_ctx->module, subpgm->func, is_pmt ? DataIsParam : DataIsLocal, - &loc, block, param_type, name.u.string); + &loc, subpgm->current_block, param_type, name.u.string); break; } } @@ -1939,7 +1939,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, { if (is_pmt) FIXME("Unsupported constant (parameter) %s in function '%s'\n", debugstr_a(name.u.string), subpgm->func->hash_elt.name); di->symt = &symt_add_func_constant(subpgm->ctx->module_ctx->module, - subpgm->func, block, + subpgm->func, subpgm->current_block, param_type, name.u.string, &v)->symt; } else @@ -1955,7 +1955,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, loc.reg = loc_err_no_location; symt_add_func_local(subpgm->ctx->module_ctx->module, subpgm->func, is_pmt ? DataIsParam : DataIsLocal, - &loc, block, param_type, name.u.string); + &loc, subpgm->current_block, param_type, name.u.string); } else { @@ -1994,16 +1994,13 @@ static void dwarf2_parse_subprogram_label(dwarf2_subprogram_t* subpgm, } static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, - struct symt_block* parent_block, - dwarf2_debug_info_t* di); + dwarf2_debug_info_t* di); static struct symt* dwarf2_parse_subroutine_type(dwarf2_debug_info_t* di); static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, - struct symt_block* parent_block, dwarf2_debug_info_t* di) { - struct symt_block* block; ULONG_PTR low_pc, high_pc; struct vector* children; dwarf2_debug_info_t*child; @@ -2017,9 +2014,9 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, return; } - block = symt_open_func_block(subpgm->ctx->module_ctx->module, subpgm->func, parent_block, - subpgm->ctx->module_ctx->load_offset + low_pc - subpgm->func->address, - high_pc - low_pc); + subpgm->current_block = symt_open_func_block(subpgm->ctx->module_ctx->module, subpgm->func, subpgm->current_block, + subpgm->ctx->module_ctx->load_offset + low_pc - subpgm->func->address, + high_pc - low_pc); children = dwarf2_get_di_children(di); if (children) for (i = 0; i < vector_length(children); i++) @@ -2030,13 +2027,13 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, { case DW_TAG_formal_parameter: case DW_TAG_variable: - dwarf2_parse_variable(subpgm, block, child); + dwarf2_parse_variable(subpgm, child); break; case DW_TAG_lexical_block: - dwarf2_parse_subprogram_block(subpgm, block, child); + dwarf2_parse_subprogram_block(subpgm, child); break; case DW_TAG_inlined_subroutine: - dwarf2_parse_inlined_subroutine(subpgm, block, child); + dwarf2_parse_inlined_subroutine(subpgm, child); break; case DW_TAG_label: dwarf2_parse_subprogram_label(subpgm, child); @@ -2049,14 +2046,14 @@ static void dwarf2_parse_inlined_subroutine(dwarf2_subprogram_t* subpgm, child->abbrev->tag, dwarf2_debug_di(di)); } } - symt_close_func_block(subpgm->ctx->module_ctx->module, subpgm->func, block, 0); + symt_close_func_block(subpgm->ctx->module_ctx->module, subpgm->func, subpgm->current_block, 0); + subpgm->current_block = symt_check_tag(subpgm->current_block->container, SymTagBlock) ? + (struct symt_block*)subpgm->current_block->container : NULL; } static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, - struct symt_block* parent_block, dwarf2_debug_info_t* di) { - struct symt_block* block; ULONG_PTR low_pc, high_pc; struct vector* children; dwarf2_debug_info_t*child; @@ -2070,9 +2067,9 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, return; } - block = symt_open_func_block(subpgm->ctx->module_ctx->module, subpgm->func, parent_block, - subpgm->ctx->module_ctx->load_offset + low_pc - subpgm->func->address, - high_pc - low_pc); + subpgm->current_block = symt_open_func_block(subpgm->ctx->module_ctx->module, subpgm->func, subpgm->current_block, + subpgm->ctx->module_ctx->load_offset + low_pc - subpgm->func->address, + high_pc - low_pc); children = dwarf2_get_di_children(di); if (children) for (i = 0; i < vector_length(children); i++) @@ -2082,10 +2079,10 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, switch (child->abbrev->tag) { case DW_TAG_inlined_subroutine: - dwarf2_parse_inlined_subroutine(subpgm, block, child); + dwarf2_parse_inlined_subroutine(subpgm, child); break; case DW_TAG_variable: - dwarf2_parse_variable(subpgm, block, child); + dwarf2_parse_variable(subpgm, child); break; case DW_TAG_pointer_type: dwarf2_parse_pointer_type(child); @@ -2097,7 +2094,7 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, dwarf2_parse_const_type(child); break; case DW_TAG_lexical_block: - dwarf2_parse_subprogram_block(subpgm, block, child); + dwarf2_parse_subprogram_block(subpgm, child); break; case DW_TAG_subprogram: /* FIXME: likely a declaration (to be checked) @@ -2131,7 +2128,9 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, } } - symt_close_func_block(subpgm->ctx->module_ctx->module, subpgm->func, block, 0); + symt_close_func_block(subpgm->ctx->module_ctx->module, subpgm->func, subpgm->current_block, 0); + subpgm->current_block = symt_check_tag(subpgm->current_block->container, SymTagBlock) ? + (struct symt_block*)subpgm->current_block->container : NULL; } static struct symt* dwarf2_parse_subprogram(dwarf2_debug_info_t* di) @@ -2203,6 +2202,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_debug_info_t* di) subpgm.frame.offset = 0; } subpgm.non_computed_variable = FALSE; + subpgm.current_block = NULL; children = dwarf2_get_di_children(di); if (children) for (i = 0; i < vector_length(children); i++) @@ -2213,13 +2213,13 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_debug_info_t* di) { case DW_TAG_variable: case DW_TAG_formal_parameter: - dwarf2_parse_variable(&subpgm, NULL, child); + dwarf2_parse_variable(&subpgm, child); break; case DW_TAG_lexical_block: - dwarf2_parse_subprogram_block(&subpgm, NULL, child); + dwarf2_parse_subprogram_block(&subpgm, child); break; case DW_TAG_inlined_subroutine: - dwarf2_parse_inlined_subroutine(&subpgm, NULL, child); + dwarf2_parse_inlined_subroutine(&subpgm, child); break; case DW_TAG_pointer_type: dwarf2_parse_pointer_type(child); @@ -2396,10 +2396,11 @@ static void dwarf2_load_one_entry(dwarf2_debug_info_t* di) subpgm.ctx = di->unit_ctx; subpgm.func = NULL; + subpgm.current_block = NULL; subpgm.frame.kind = loc_absolute; subpgm.frame.offset = 0; subpgm.frame.reg = Wine_DW_no_register; - dwarf2_parse_variable(&subpgm, NULL, di); + dwarf2_parse_variable(&subpgm, di); } break; case DW_TAG_namespace:

1 0

Eric Pouech : dbghelp: Introduce symt_inlinesite (SymTagInlineSite) to support inline sites.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: b9290c987a44aea935488b274764bceadfa24247 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9290c987a44aea935488b27… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Oct 28 08:57:24 2021 +0200 dbghelp: Introduce symt_inlinesite (SymTagInlineSite) to support inline sites. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 51 ++++++++++++++++++++++++++++++++++++++++-- dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/msc.c | 4 ++-- dlls/dbghelp/symbol.c | 16 ++++++------- dlls/dbghelp/type.c | 16 +++++++++++++ 5 files changed, 75 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9290c987a44aea93548…

1 0

Eric Pouech : dbghelp: Correct type of exported function addresses in PE module.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: fd5c709c6b17fb4660c63a4e80742fd244d0e801 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd5c709c6b17fb4660c63a4e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Oct 28 16:46:10 2021 +0200 dbghelp: Correct type of exported function addresses in PE module. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/pe_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 278f3c71c98..35db3edf40f 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -688,7 +688,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* IMAGE_DIRECTORY_ENTRY_EXPORT, &size))) { const WORD* ordinals = NULL; - const DWORD_PTR* functions = NULL; + const DWORD* functions = NULL; const DWORD* names = NULL; unsigned int j; char buffer[16];

1 0

Francois Gouget : winetest: Don't truncate oversize reports before sending them.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: 99d36ccfb966050cc11c1faa41b07ad0bcd5c45b URL: https://source.winehq.org/git/wine.git/?a=commit;h=99d36ccfb966050cc11c1faa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 28 12:42:59 2021 +0200 winetest: Don't truncate oversize reports before sending them. test.winehq.org already sets $CGI::POST_MAX to reject oversize reports. Furthermore truncated reports are rejected anyway. So avoid the code duplication and inconsistencies between the winetest and test.winehq.org (or other site) size limits. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/send.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/programs/winetest/send.c b/programs/winetest/send.c index 4b575e11a34..2416faa3192 100644 --- a/programs/winetest/send.c +++ b/programs/winetest/send.c @@ -162,15 +162,9 @@ send_file_direct (const char * url, const char *name) report (R_WARNING, "Can't open file '%s': %u", name, GetLastError()); goto abort1; } - filesize = GetFileSize( file, NULL ); - if (filesize > 1.5*1024*1024) { - report (R_WARNING, - "File too big (%.1f MB > 1.5 MB); submitting partial report.", - filesize/1024.0/1024); - filesize = (DWORD) 1.5*1024*1024; - } report (R_STATUS, "Sending header"); + filesize = GetFileSize( file, NULL ); str = strmake (&total, body1, name); ret = send_str (s, head, filesize + total + sizeof body2 - 1) || send_buf (s, str, total); @@ -339,14 +333,6 @@ send_file_wininet (const char *url, const char *name) goto done; } - filesize = GetFileSize( file, NULL ); - if (filesize > 1.5*1024*1024) { - report (R_WARNING, - "File too big (%.1f MB > 1.5 MB); submitting partial report.", - filesize/1024.0/1024); - filesize = 1.5*1024*1024; - } - report (R_STATUS, "Opening %s connection to %s:%d", (uc.nScheme == INTERNET_SCHEME_HTTP ? "http" : "https"), uc.lpszHostName, uc.nPort); @@ -369,6 +355,7 @@ send_file_wininet (const char *url, const char *name) } report (R_STATUS, "Sending request"); + filesize = GetFileSize( file, NULL ); str = strmake (&total, body1, name); memset(&buffers_in, 0, sizeof(INTERNET_BUFFERSA)); buffers_in.dwStructSize = sizeof(INTERNET_BUFFERSA);

1 0

Nikolay Sivov : evr/mixer: Handle substream zorder for dxva blitting.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: 58efe0f43ee61c4e972dee7dce85ba02ee624261 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58efe0f43ee61c4e972dee7d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 28 17:33:20 2021 +0300 evr/mixer: Handle substream zorder for dxva blitting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 74 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 18 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 1db2fd3a9f4..631ee1ba645 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -81,6 +81,7 @@ struct video_mixer struct input_stream inputs[MAX_MIXER_INPUT_STREAMS]; unsigned int input_ids[MAX_MIXER_INPUT_STREAMS]; + struct input_stream *zorder[MAX_MIXER_INPUT_STREAMS]; unsigned int input_count; struct output_stream output; @@ -183,6 +184,22 @@ static void video_mixer_init_input(struct input_stream *stream) stream->rect.right = stream->rect.bottom = 1.0f; } +static int __cdecl video_mixer_zorder_sort_compare(const void *a, const void *b) +{ + const struct input_stream *left = *(void **)a, *right = *(void **)b; + return left->zorder != right->zorder ? (left->zorder < right->zorder ? -1 : 1) : 0; +}; + +static void video_mixer_update_zorder_map(struct video_mixer *mixer) +{ + unsigned int i; + + for (i = 0; i < mixer->input_count; ++i) + mixer->zorder[i] = &mixer->inputs[i]; + + qsort(mixer->zorder, mixer->input_count, sizeof(*mixer->zorder), video_mixer_zorder_sort_compare); +} + static void video_mixer_clear_types(struct video_mixer *mixer) { unsigned int i; @@ -501,6 +518,7 @@ static HRESULT WINAPI video_mixer_transform_DeleteInputStream(IMFTransform *ifac memmove(&mixer->inputs[idx], &mixer->inputs[idx + 1], (mixer->input_count - idx) * sizeof(*mixer->inputs)); memmove(&mixer->input_ids[idx], &mixer->input_ids[idx + 1], (mixer->input_count - idx) * sizeof(*mixer->input_ids)); + video_mixer_update_zorder_map(mixer); } } @@ -570,6 +588,8 @@ static HRESULT WINAPI video_mixer_transform_AddInputStreams(IMFTransform *iface, input->zorder = zorder; zorder++; } + + video_mixer_update_zorder_map(mixer); } } LeaveCriticalSection(&mixer->cs); @@ -1227,13 +1247,13 @@ static void video_mixer_scale_rect(RECT *rect, unsigned int width, unsigned int static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) { - DXVA2_VideoSample samples[1] = {{ 0 }}; + DXVA2_VideoSample samples[MAX_MIXER_INPUT_STREAMS] = {{ 0 }}; DXVA2_VideoProcessBltParams params = { 0 }; MFVideoNormalizedRect zoom_rect; struct input_stream *stream; - IDirect3DSurface9 *surface; D3DSURFACE_DESC desc; - HRESULT hr; + HRESULT hr = S_OK; + unsigned int i; IDirect3DSurface9_GetDesc(rt, &desc); @@ -1246,26 +1266,40 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) video_mixer_scale_rect(&params.TargetRect, desc.Width, desc.Height, &zoom_rect); - /* FIXME: for now only handle reference stream. */ + for (i = 0; i < mixer->input_count; ++i) + { + IDirect3DSurface9 *surface; - video_mixer_get_input(mixer, 0, &stream); + stream = mixer->zorder[i]; - if (FAILED(hr = video_mixer_get_sample_surface(stream->sample, &surface))) - { - WARN("Failed to get source surface, hr %#x.\n", hr); - return; - } + if (FAILED(hr = video_mixer_get_sample_surface(stream->sample, &surface))) + { + WARN("Failed to get source surface for stream %u, hr %#x.\n", i, hr); + break; + } - IDirect3DSurface9_GetDesc(surface, &desc); + IDirect3DSurface9_GetDesc(surface, &desc); - samples[0].SrcSurface = surface; - SetRect(&samples[0].SrcRect, 0, 0, desc.Width, desc.Height); - video_mixer_scale_rect(&samples[0].DstRect, desc.Width, desc.Height, &stream->rect); + samples[i].SampleFormat.SampleFormat = stream->id == 0 ? DXVA2_SampleProgressiveFrame : DXVA2_SampleSubStream; + samples[i].SrcSurface = surface; + SetRect(&samples[i].SrcRect, 0, 0, desc.Width, desc.Height); + video_mixer_scale_rect(&samples[i].DstRect, desc.Width, desc.Height, &stream->rect); + } - if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, 1, NULL))) - WARN("Failed to process samples, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, + mixer->input_count, NULL))) + { + WARN("Failed to process samples, hr %#x.\n", hr); + } + } - IDirect3DSurface9_Release(surface); + for (i = 0; i < mixer->input_count; ++i) + { + if (samples[i].SrcSurface) + IDirect3DSurface9_Release(samples[i].SrcSurface); + } } static HRESULT video_mixer_get_sample_desired_time(IMFSample *sample, LONGLONG *timestamp, LONGLONG *duration) @@ -1542,8 +1576,11 @@ static HRESULT WINAPI video_mixer_control_SetStreamZOrder(IMFVideoMixerControl2 /* Lowest zorder only applies to reference stream. */ if (id && !zorder) hr = MF_E_INVALIDREQUEST; - else + else if (stream->zorder != zorder) + { stream->zorder = zorder; + video_mixer_update_zorder_map(mixer); + } } LeaveCriticalSection(&mixer->cs); @@ -2449,6 +2486,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->lower_bound = MFT_OUTPUT_BOUND_LOWER_UNBOUNDED; object->upper_bound = MFT_OUTPUT_BOUND_UPPER_UNBOUNDED; video_mixer_init_input(&object->inputs[0]); + video_mixer_update_zorder_map(object); InitializeCriticalSection(&object->cs); if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) {

1 0

Nikolay Sivov : evr/presenter: Handle shutdown state in more methods.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: c94f86dac3dcd4708e77564e3d5b964616cf3cbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c94f86dac3dcd4708e77564e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 28 17:33:19 2021 +0300 evr/presenter: Handle shutdown state in more methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 68 +++++++++++++++++++++++++++++++++++++++++++++------- dlls/evr/tests/evr.c | 6 ----- 2 files changed, 59 insertions(+), 15 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 027d0338896..a91510b13bc 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -31,9 +31,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr); +/* + Initial state represents just created object, presenter never returns to this state. + Shutdown state is entered on ReleaseServicePointers(), terminal state. + Started/stopped/paused states are controlled by clock state changes. +*/ + enum presenter_state { - PRESENTER_STATE_SHUT_DOWN = 0, + PRESENTER_STATE_INITIAL = 0, + PRESENTER_STATE_SHUT_DOWN, PRESENTER_STATE_STARTED, PRESENTER_STATE_STOPPED, PRESENTER_STATE_PAUSED, @@ -603,6 +610,9 @@ static HRESULT video_presenter_process_input(struct video_presenter *presenter) IMFSample *sample; DWORD status; + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + return MF_E_SHUTDOWN; + if (!presenter->media_type) return S_OK; @@ -708,6 +718,9 @@ static HRESULT video_presenter_start_streaming(struct video_presenter *presenter { HRESULT hr; + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + return MF_E_SHUTDOWN; + if (presenter->thread.hthread) return S_OK; @@ -968,7 +981,12 @@ static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, M switch (message) { case MFVP_MESSAGE_INVALIDATEMEDIATYPE: - hr = presenter->mixer ? video_presenter_invalidate_media_type(presenter) : MF_E_INVALIDREQUEST; + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!presenter->mixer) + hr = MF_E_INVALIDREQUEST; + else + hr = video_presenter_invalidate_media_type(presenter); break; case MFVP_MESSAGE_BEGINSTREAMING: hr = video_presenter_start_streaming(presenter); @@ -1238,6 +1256,7 @@ static HRESULT WINAPI video_presenter_control_GetNativeVideoSize(IMFVideoDisplay SIZE *aspect_ratio) { struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + HRESULT hr = S_OK; TRACE("%p, %p, %p.\n", iface, video_size, aspect_ratio); @@ -1245,21 +1264,40 @@ static HRESULT WINAPI video_presenter_control_GetNativeVideoSize(IMFVideoDisplay return E_POINTER; EnterCriticalSection(&presenter->cs); - if (video_size) - *video_size = presenter->native_size; - if (aspect_ratio) - *aspect_ratio = presenter->native_ratio; + + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + { + if (video_size) + *video_size = presenter->native_size; + if (aspect_ratio) + *aspect_ratio = presenter->native_ratio; + } + LeaveCriticalSection(&presenter->cs); - return S_OK; + return hr; } static HRESULT WINAPI video_presenter_control_GetIdealVideoSize(IMFVideoDisplayControl *iface, SIZE *min_size, SIZE *max_size) { + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + HRESULT hr; + FIXME("%p, %p, %p.\n", iface, min_size, max_size); - return E_NOTIMPL; + EnterCriticalSection(&presenter->cs); + + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + hr = E_NOTIMPL; + + LeaveCriticalSection(&presenter->cs); + + return hr; } static HRESULT WINAPI video_presenter_control_SetVideoPosition(IMFVideoDisplayControl *iface, @@ -1425,9 +1463,21 @@ static HRESULT WINAPI video_presenter_control_GetVideoWindow(IMFVideoDisplayCont static HRESULT WINAPI video_presenter_control_RepaintVideo(IMFVideoDisplayControl *iface) { + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + HRESULT hr; + FIXME("%p.\n", iface); - return E_NOTIMPL; + EnterCriticalSection(&presenter->cs); + + if (presenter->state == PRESENTER_STATE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + hr = E_NOTIMPL; + + LeaveCriticalSection(&presenter->cs); + + return hr; } static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayControl *iface, BITMAPINFOHEADER *header, diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index b7e3ad174df..6a711e30581 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2353,18 +2353,15 @@ static void test_presenter_shutdown(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_BEGINSTREAMING, 0); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_ENDSTREAMING, 0); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFVideoPresenter_GetCurrentMediaType(presenter, &media_type); @@ -2374,11 +2371,9 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &size); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetIdealVideoSize(display_control, &size, &size); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); SetRect(&rect, 0, 0, 10, 10); @@ -2404,7 +2399,6 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_RepaintVideo(display_control); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client);

1 0

Andrew Eikum : mf/session: Forward MR_STREAM_VOLUME_SERVICE requests to SAR node.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: 43993feb2ca43969d392bc48daa42ee026f9feee URL: https://source.winehq.org/git/wine.git/?a=commit;h=43993feb2ca43969d392bc48… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 28 17:33:01 2021 +0300 mf/session: Forward MR_STREAM_VOLUME_SERVICE requests to SAR node. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 0377b19c51f..e3d77864494 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2080,7 +2080,8 @@ static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGU { hr = session_get_video_render_service(session, service, riid, obj); } - else if (IsEqualGUID(service, &MR_POLICY_VOLUME_SERVICE)) + else if (IsEqualGUID(service, &MR_POLICY_VOLUME_SERVICE) || + IsEqualGUID(service, &MR_STREAM_VOLUME_SERVICE)) { hr = session_get_audio_render_service(session, service, riid, obj); }

1 0

Rémi Bernon : mfreadwrite/reader: Add recognition of ftypeMSNV mp4 header.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: ff0a13c86e7307803371b657d9067e1f55d5f7fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff0a13c86e7307803371b657… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 27 17:04:14 2021 +0200 mfreadwrite/reader: Add recognition of ftypeMSNV mp4 header. Needed by Greedfall intro videos. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index d26778dad36..7bcb52eaaa6 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2395,6 +2395,7 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) static const unsigned char wavmagic[] = { 'R', 'I', 'F', 'F',0x00,0x00,0x00,0x00, 'W', 'A', 'V', 'E', 'f', 'm', 't', ' '}; static const unsigned char wavmask[] = {0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; static const unsigned char isommagic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'i', 's', 'o', 'm',0x00,0x00,0x00,0x00}; + static const unsigned char mp4_magic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'M', 'S', 'N', 'V',0x00,0x00,0x00,0x00}; static const unsigned char mp42magic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'm', 'p', '4', '2',0x00,0x00,0x00,0x00}; static const unsigned char mp4mask[] = {0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00}; static const struct stream_content_url_hint @@ -2409,6 +2410,7 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) { wavmagic, L".wav", wavmask }, { isommagic, L".mp4", mp4mask }, { mp42magic, L".mp4", mp4mask }, + { mp4_magic, L".mp4", mp4mask }, }; unsigned char buffer[4 * sizeof(unsigned int)], pattern[4 * sizeof(unsigned int)]; unsigned int i, j, length = 0, caps = 0;

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
117
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021