September 2022 - Wine-commits

Eric Pouech : winedbg: Enhance printing of variables or fields.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 001665d7354ca9a21de0d2a5cbfe0839e92446cd URL: https://gitlab.winehq.org/wine/wine/-/commit/001665d7354ca9a21de0d2a5cbfe08… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 30 18:15:26 2022 +0200 winedbg: Enhance printing of variables or fields. Prints 'int a[10]' (instead of 'int[10] a'). Ditto for variables/fields of type function pointer. And for pure type printing, no longer prints --none-- for arrays and function pointers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/dbg.y | 4 ++-- programs/winedbg/debugger.h | 4 ++-- programs/winedbg/expr.c | 2 +- programs/winedbg/stack.c | 3 ++- programs/winedbg/symbol.c | 40 +++++++++++++++++++++++++--------------- programs/winedbg/types.c | 39 ++++++++++++++++++++++----------------- 6 files changed, 54 insertions(+), 38 deletions(-)

1 0

Eric Pouech : dbghelp: Remove address field from symt_compiland.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 99eb63bd7a41b87d472bb622a5faf24d1fcd91c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/99eb63bd7a41b87d472bb622a5faf2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 30 18:14:24 2022 +0200 dbghelp: Remove address field from symt_compiland. It's mostly always set at 0, and native dbghelp doesn't expose it anyway. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/coff.c | 3 +-- dlls/dbghelp/dbghelp_private.h | 3 +-- dlls/dbghelp/dwarf.c | 7 ++----- dlls/dbghelp/elf_module.c | 3 +-- dlls/dbghelp/msc.c | 4 ++-- dlls/dbghelp/pe_module.c | 3 +-- dlls/dbghelp/stabs.c | 2 +- dlls/dbghelp/symbol.c | 4 +--- 8 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c index 0f29b131a86..efba167081e 100644 --- a/dlls/dbghelp/coff.c +++ b/dlls/dbghelp/coff.c @@ -114,8 +114,7 @@ static int coff_add_file(struct CoffFileSet* coff_files, struct module* module, file = coff_files->files + coff_files->nfiles; file->startaddr = 0xffffffff; file->endaddr = 0; - file->compiland = symt_new_compiland(module, 0, - source_new(module, NULL, filename)); + file->compiland = symt_new_compiland(module, source_new(module, NULL, filename)); file->linetab_offset = -1; file->linecnt = 0; file->entries = NULL; diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 24ac003df71..1e0a3423ea3 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -815,8 +815,7 @@ extern struct symt_ht* extern struct symt_module* symt_new_module(struct module* module) DECLSPEC_HIDDEN; extern struct symt_compiland* - symt_new_compiland(struct module* module, ULONG_PTR address, - unsigned src_idx) DECLSPEC_HIDDEN; + symt_new_compiland(struct module* module, unsigned src_idx) DECLSPEC_HIDDEN; extern struct symt_public* symt_new_public(struct module* module, struct symt_compiland* parent, diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 71163ced733..30cd35076d3 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2970,7 +2970,7 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) struct vector* children; dwarf2_debug_info_t* child = NULL; unsigned int i; - struct attribute stmt_list, low_pc; + struct attribute stmt_list; struct attribute comp_dir; struct attribute language; @@ -2981,15 +2981,12 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) if (!dwarf2_find_attribute(di, DW_AT_comp_dir, &comp_dir)) comp_dir.u.string = NULL; - if (!dwarf2_find_attribute(di, DW_AT_low_pc, &low_pc)) - low_pc.u.uvalue = 0; - if (!dwarf2_find_attribute(di, DW_AT_language, &language)) language.u.uvalue = DW_LANG_C; ctx->language = language.u.uvalue; - ctx->compiland = symt_new_compiland(ctx->module_ctx->module, ctx->module_ctx->load_offset + low_pc.u.uvalue, + ctx->compiland = symt_new_compiland(ctx->module_ctx->module, source_new(ctx->module_ctx->module, comp_dir.u.string, name.u.string)); dwarf2_cache_cuhead(ctx->module_ctx->module->format_info[DFI_DWARF]->u.dwarf2_info, ctx->compiland, &ctx->head); di->symt = &ctx->compiland->symt; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 404c7c11dbb..4d96b5c60a7 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -699,8 +699,7 @@ static void elf_hash_symtab(struct module* module, struct pool* pool, { case ELF_STT_FILE: if (symname) - compiland = symt_new_compiland(module, sym.st_value, - source_new(module, NULL, symname)); + compiland = symt_new_compiland(module, source_new(module, NULL, symname)); else compiland = NULL; continue; diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index a5b688bae17..0109e4dd255 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2504,14 +2504,14 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, case S_OBJNAME: TRACE("S-ObjName-V3 %s\n", sym->objname_v3.name); - compiland = symt_new_compiland(msc_dbg->module, 0 /* FIXME */, + compiland = symt_new_compiland(msc_dbg->module, source_new(msc_dbg->module, NULL, sym->objname_v3.name)); break; case S_OBJNAME_ST: TRACE("S-ObjName-V1 %s\n", terminate_string(&sym->objname_v1.p_name)); - compiland = symt_new_compiland(msc_dbg->module, 0 /* FIXME */, + compiland = symt_new_compiland(msc_dbg->module, source_new(msc_dbg->module, NULL, terminate_string(&sym->objname_v1.p_name))); break; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 3e697912718..6b61c1de6e5 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -470,8 +470,7 @@ static BOOL pe_load_coff_symbol_table(struct module* module) if (name[0] == '_') name++; if (!compiland && lastfilename) - compiland = symt_new_compiland(module, 0, - source_new(module, NULL, lastfilename)); + compiland = symt_new_compiland(module, source_new(module, NULL, lastfilename)); if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) symt_new_public(module, compiland, name, FALSE, diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index b22fb714973..badb07e3b5c 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1570,7 +1570,7 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, { stabs_reset_includes(); source_idx = source_new(module, srcpath, ptr); - compiland = symt_new_compiland(module, 0 /* FIXME */, source_idx); + compiland = symt_new_compiland(module, source_idx); } else { diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index adc36da4a49..7d0cc6005f2 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -228,8 +228,7 @@ struct symt_module* symt_new_module(struct module* module) return sym; } -struct symt_compiland* symt_new_compiland(struct module* module, - ULONG_PTR address, unsigned src_idx) +struct symt_compiland* symt_new_compiland(struct module* module, unsigned src_idx) { struct symt_compiland* sym; struct symt_compiland** p; @@ -240,7 +239,6 @@ struct symt_compiland* symt_new_compiland(struct module* module, { sym->symt.tag = SymTagCompiland; sym->container = module->top; - sym->address = address; sym->source = src_idx; vector_init(&sym->vchildren, sizeof(struct symt*), 32); sym->user = NULL;

1 0

Eric Pouech : dbghelp: Expose local static variables' address.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: b990eaa8a686c5b4b1ff4b6b7610742a3db3ec34 URL: https://gitlab.winehq.org/wine/wine/-/commit/b990eaa8a686c5b4b1ff4b6b761074… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Sep 30 18:15:04 2022 +0200 dbghelp: Expose local static variables' address. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/type.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 1e0a3423ea3..fd887718d8c 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -192,7 +192,7 @@ struct symt_data struct symt* type; union /* depends on kind */ { - /* DataIs{Global, FileStatic}: + /* DataIs{Global, FileStatic, StaticLocal}: * with loc.kind * loc_absolute loc.offset is address * loc_tlsrel loc.offset is TLS index address diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 9d39d490965..cb1c7f7bc0d 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -143,6 +143,7 @@ BOOL symt_get_address(const struct symt* type, ULONG64* addr) { case DataIsGlobal: case DataIsFileStatic: + case DataIsStaticLocal: *addr = ((const struct symt_data*)type)->u.var.offset; break; default: return FALSE;

1 0

Jacek Caban : winevulkan: Introduce conversion_context and use it for conversion memory allocation.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: e1d5337354942b97493e4ecaa06fd330d2101a7d URL: https://gitlab.winehq.org/wine/wine/-/commit/e1d5337354942b97493e4ecaa06fd3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 23 21:15:32 2022 +0200 winevulkan: Introduce conversion_context and use it for conversion memory allocation. --- dlls/winevulkan/make_vulkan | 401 ++-------- dlls/winevulkan/vulkan.c | 44 +- dlls/winevulkan/vulkan_private.h | 38 + dlls/winevulkan/vulkan_thunks.c | 1579 +++++++++++++------------------------- dlls/winevulkan/vulkan_thunks.h | 7 +- 5 files changed, 653 insertions(+), 1416 deletions(-)

1 0

Rémi Bernon : mf/tests: Factor transform (Get|Set)(Input|Output)CurrentType tests together.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 4e4d31e1d55aac2ee26081ca489916186c22804d URL: https://gitlab.winehq.org/wine/wine/-/commit/4e4d31e1d55aac2ee26081ca489916… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 30 09:42:53 2022 +0200 mf/tests: Factor transform (Get|Set)(Input|Output)CurrentType tests together. --- dlls/mf/tests/transform.c | 541 ++++++++++++++++++++++++++-------------------- 1 file changed, 306 insertions(+), 235 deletions(-)

1 0

Rémi Bernon : mf/tests: Add some AAC encoder MFT encoding tests.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: cc8569dd656a028eb22bd3af029161aeeca96f3d URL: https://gitlab.winehq.org/wine/wine/-/commit/cc8569dd656a028eb22bd3af029161… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 30 08:18:59 2022 +0200 mf/tests: Add some AAC encoder MFT encoding tests. --- dlls/mf/tests/aacencdata.bin | Bin 0 -> 24861 bytes dlls/mf/tests/resource.rc | 3 ++ dlls/mf/tests/transform.c | 108 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 105 insertions(+), 6 deletions(-) diff --git a/dlls/mf/tests/aacencdata.bin b/dlls/mf/tests/aacencdata.bin new file mode 100644 index 00000000000..355310632fa Binary files /dev/null and b/dlls/mf/tests/aacencdata.bin differ diff --git a/dlls/mf/tests/resource.rc b/dlls/mf/tests/resource.rc index 43493319046..25ac6d2fe0c 100644 --- a/dlls/mf/tests/resource.rc +++ b/dlls/mf/tests/resource.rc @@ -26,6 +26,9 @@ audiodata.bin RCDATA audiodata.bin /* @makedep: audioconvdata.bin */ audioconvdata.bin RCDATA audioconvdata.bin +/* @makedep: aacencdata.bin */ +aacencdata.bin RCDATA aacencdata.bin + /* @makedep: wmaencdata.bin */ wmaencdata.bin RCDATA wmaencdata.bin diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index d700f8a222b..f4148692489 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -894,6 +894,13 @@ static void dump_mf_media_buffer(IMFMediaBuffer *buffer, const struct buffer_des buffer_desc->dump(data, length, &buffer_desc->rect, output); else { + if (buffer_desc->length == -1) + { + ret = WriteFile(output, &length, sizeof(length), &written, NULL); + ok(ret, "WriteFile failed, error %lu\n", GetLastError()); + ok(written == sizeof(length), "written %lu bytes\n", written); + } + ret = WriteFile(output, data, length, &written, NULL); ok(ret, "WriteFile failed, error %lu\n", GetLastError()); ok(written == length, "written %lu bytes\n", written); @@ -930,14 +937,21 @@ static void dump_mf_sample_collection(IMFCollection *samples, const struct sampl static DWORD check_mf_media_buffer_(int line, IMFMediaBuffer *buffer, const struct buffer_desc *expect, const BYTE **expect_data, DWORD *expect_data_len) { - DWORD length, diff = 0; + DWORD length, diff = 0, expect_length = expect->length; HRESULT hr; BYTE *data; + if (expect_length == -1) + { + expect_length = *(DWORD *)*expect_data; + *expect_data = *expect_data + sizeof(DWORD); + *expect_data_len = *expect_data_len - sizeof(DWORD); + } + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, &length); ok_(__FILE__, line)(hr == S_OK, "Lock returned %#lx\n", hr); todo_wine_if(expect->todo_length) - ok_(__FILE__, line)(length == expect->length, "got length %#lx\n", length); + ok_(__FILE__, line)(length == expect_length, "got length %#lx\n", length); if (*expect_data_len < length) todo_wine_if(expect->todo_length) @@ -968,8 +982,9 @@ struct check_mf_sample_context static void check_mf_sample_buffer(IMFMediaBuffer *buffer, const struct buffer_desc *expect, void *context) { struct check_mf_sample_context *ctx = context; + DWORD expect_length = expect->length == -1 ? *(DWORD *)ctx->data : expect->length; ctx->diff += check_mf_media_buffer_(ctx->line, buffer, expect, &ctx->data, &ctx->data_len); - ctx->total_length += expect->length; + ctx->total_length += expect_length; } #define check_mf_sample(a, b, c, d) check_mf_sample_(__LINE__, a, b, c, d) @@ -1021,8 +1036,8 @@ static DWORD check_mf_sample_(int line, IMFSample *sample, const struct sample_d ok_(__FILE__, line)(*expect_data_len >= ctx.total_length, "missing %#lx data\n", ctx.total_length - *expect_data_len); - *expect_data = *expect_data + min(total_length, *expect_data_len); - *expect_data_len = *expect_data_len - min(total_length, *expect_data_len); + *expect_data = ctx.data; + *expect_data_len = ctx.data_len; return ctx.diff / buffer_count; } @@ -1622,11 +1637,35 @@ static void test_aac_encoder(void) const MFT_OUTPUT_STREAM_INFO initial_output_info = {0}, output_info = {.cbSize = 0x600}; const MFT_INPUT_STREAM_INFO input_info = {0}; + const struct buffer_desc output_buffer_desc[] = + { + {.length = -1 /* variable */}, + }; + const struct attribute_desc output_sample_attributes[] = + { + ATTR_UINT32(MFSampleExtension_CleanPoint, 1), + {0}, + }; + const struct sample_desc output_sample_desc[] = + { + { + .repeat_count = 88, + .attributes = output_sample_attributes, + .sample_time = 0, .sample_duration = 113823, + .buffer_count = 1, .buffers = output_buffer_desc, + }, + }; + MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_AAC}; MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_PCM}; + IMFSample *input_sample, *output_sample; + IMFCollection *output_samples; + ULONG i, ret, audio_data_len; + DWORD length, output_status; IMFTransform *transform; + const BYTE *audio_data; HRESULT hr; - ULONG ret; + LONG ref; hr = CoInitialize(NULL); ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr); @@ -1662,6 +1701,63 @@ static void test_aac_encoder(void) check_mft_get_input_stream_info(transform, &input_info); check_mft_get_output_stream_info(transform, &output_info); + if (!has_video_processor) + { + win_skip("Skipping AAC encoder tests on Win7\n"); + goto done; + } + + load_resource(L"audiodata.bin", &audio_data, &audio_data_len); + ok(audio_data_len == 179928, "got length %lu\n", audio_data_len); + + input_sample = create_sample(audio_data, audio_data_len); + hr = IMFSample_SetSampleTime(input_sample, 0); + ok(hr == S_OK, "SetSampleTime returned %#lx\n", hr); + hr = IMFSample_SetSampleDuration(input_sample, 10000000); + ok(hr == S_OK, "SetSampleDuration returned %#lx\n", hr); + hr = IMFTransform_ProcessInput(transform, 0, input_sample, 0); + ok(hr == S_OK, "ProcessInput returned %#lx\n", hr); + hr = IMFTransform_ProcessMessage(transform, MFT_MESSAGE_COMMAND_DRAIN, 0); + ok(hr == S_OK, "ProcessMessage returned %#lx\n", hr); + hr = IMFTransform_ProcessInput(transform, 0, input_sample, 0); + ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#lx\n", hr); + ref = IMFSample_Release(input_sample); + ok(ref <= 1, "Release returned %ld\n", ref); + + hr = MFCreateCollection(&output_samples); + ok(hr == S_OK, "MFCreateCollection returned %#lx\n", hr); + + output_sample = create_sample(NULL, output_info.cbSize); + for (i = 0; SUCCEEDED(hr = check_mft_process_output(transform, output_sample, &output_status)); i++) + { + winetest_push_context("%lu", i); + ok(hr == S_OK, "ProcessOutput returned %#lx\n", hr); + hr = IMFCollection_AddElement(output_samples, (IUnknown *)output_sample); + ok(hr == S_OK, "AddElement returned %#lx\n", hr); + ref = IMFSample_Release(output_sample); + ok(ref == 1, "Release returned %ld\n", ref); + output_sample = create_sample(NULL, output_info.cbSize); + winetest_pop_context(); + } + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr); + ret = IMFSample_Release(output_sample); + ok(ret == 0, "Release returned %lu\n", ret); + ok(i == 88, "got %lu output samples\n", i); + + ret = check_mf_sample_collection(output_samples, output_sample_desc, L"aacencdata.bin"); + ok(ret == 0, "got %lu%% diff\n", ret); + IMFCollection_Release(output_samples); + + output_sample = create_sample(NULL, output_info.cbSize); + hr = check_mft_process_output(transform, output_sample, &output_status); + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr); + hr = IMFSample_GetTotalLength(output_sample, &length); + ok(hr == S_OK, "GetTotalLength returned %#lx\n", hr); + ok(length == 0, "got length %lu\n", length); + ret = IMFSample_Release(output_sample); + ok(ret == 0, "Release returned %lu\n", ret); + +done: ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %lu\n", ret);

1 0

Rémi Bernon : mf/tests: Add some AAC decoder MFT decoding tests.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 802a3b6fcf45635a415fbce797ca992ecadd87c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/802a3b6fcf45635a415fbce797ca99… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 22 14:17:07 2022 +0200 mf/tests: Add some AAC decoder MFT decoding tests. --- dlls/mf/tests/aacdecdata.bin | Bin 0 -> 2048 bytes dlls/mf/tests/resource.rc | 3 ++ dlls/mf/tests/transform.c | 84 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 86 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/aacdecdata.bin b/dlls/mf/tests/aacdecdata.bin new file mode 100644 index 00000000000..2ff06b66e40 Binary files /dev/null and b/dlls/mf/tests/aacdecdata.bin differ diff --git a/dlls/mf/tests/resource.rc b/dlls/mf/tests/resource.rc index 25ac6d2fe0c..08d123d5c8f 100644 --- a/dlls/mf/tests/resource.rc +++ b/dlls/mf/tests/resource.rc @@ -29,6 +29,9 @@ audioconvdata.bin RCDATA audioconvdata.bin /* @makedep: aacencdata.bin */ aacencdata.bin RCDATA aacencdata.bin +/* @makedep: aacdecdata.bin */ +aacdecdata.bin RCDATA aacdecdata.bin + /* @makedep: wmaencdata.bin */ wmaencdata.bin RCDATA wmaencdata.bin diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index f4148692489..0e0ae2417d5 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -1889,11 +1889,33 @@ static void test_aac_decoder(void) MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE | MFT_INPUT_STREAM_HOLDS_BUFFERS, }; + const struct buffer_desc output_buffer_desc[] = + { + {.length = 0x800}, + }; + const struct attribute_desc output_sample_attributes[] = + { + ATTR_UINT32(MFSampleExtension_CleanPoint, 1), + {0}, + }; + const struct sample_desc output_sample_desc[] = + { + { + .attributes = output_sample_attributes + (has_video_processor ? 0 : 1) /* MFSampleExtension_CleanPoint missing on Win7 */, + .sample_time = 0, .sample_duration = 232200, + .buffer_count = 1, .buffers = output_buffer_desc, + }, + }; + MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_Float}; MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_AAC}; + IMFSample *input_sample, *output_sample; + ULONG i, ret, ref, aacenc_data_len; + IMFCollection *output_samples; + DWORD length, output_status; IMFMediaType *media_type; IMFTransform *transform; - ULONG i, ret; + const BYTE *aacenc_data; HRESULT hr; hr = CoInitialize(NULL); @@ -1974,6 +1996,66 @@ static void test_aac_decoder(void) check_mft_get_input_stream_info(transform, &input_info); check_mft_get_output_stream_info(transform, &output_info); + load_resource(L"aacencdata.bin", &aacenc_data, &aacenc_data_len); + ok(aacenc_data_len == 24861, "got length %lu\n", aacenc_data_len); + + input_sample = create_sample(aacenc_data + sizeof(DWORD), *(DWORD *)aacenc_data); + hr = IMFTransform_ProcessInput(transform, 0, input_sample, 0); + ok(hr == S_OK, "ProcessInput returned %#lx\n", hr); + hr = IMFTransform_ProcessInput(transform, 0, input_sample, 0); + ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#lx\n", hr); + + /* As output_info.dwFlags doesn't have MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES + * IMFTransform_ProcessOutput needs a sample or returns MF_E_TRANSFORM_NEED_MORE_INPUT */ + + hr = check_mft_process_output(transform, NULL, &output_status); + ok(hr == E_INVALIDARG, "ProcessOutput returned %#lx\n", hr); + ok(output_status == 0, "got output[0].dwStatus %#lx\n", output_status); + hr = IMFTransform_ProcessInput(transform, 0, input_sample, 0); + ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#lx\n", hr); + + hr = IMFTransform_ProcessMessage(transform, MFT_MESSAGE_COMMAND_DRAIN, 0); + ok(hr == S_OK, "ProcessMessage returned %#lx\n", hr); + hr = IMFTransform_ProcessInput(transform, 0, input_sample, 0); + ok(hr == MF_E_NOTACCEPTING, "ProcessInput returned %#lx\n", hr); + + hr = MFCreateCollection(&output_samples); + ok(hr == S_OK, "MFCreateCollection returned %#lx\n", hr); + + output_sample = create_sample(NULL, output_info.cbSize); + for (i = 0; SUCCEEDED(hr = check_mft_process_output(transform, output_sample, &output_status)); i++) + { + winetest_push_context("%lu", i); + ok(hr == S_OK, "ProcessOutput returned %#lx\n", hr); + hr = IMFCollection_AddElement(output_samples, (IUnknown *)output_sample); + ok(hr == S_OK, "AddElement returned %#lx\n", hr); + ref = IMFSample_Release(output_sample); + ok(ref == 1, "Release returned %ld\n", ref); + output_sample = create_sample(NULL, output_info.cbSize); + winetest_pop_context(); + } + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr); + ok(output_status == MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE, "got output[0].dwStatus %#lx\n", output_status); + ret = IMFSample_Release(output_sample); + ok(ret == 0, "Release returned %lu\n", ret); + ok(i == 1, "got %lu output samples\n", i); + + ret = check_mf_sample_collection(output_samples, output_sample_desc, L"aacdecdata.bin"); + ok(ret == 0, "got %lu%% diff\n", ret); + IMFCollection_Release(output_samples); + + output_sample = create_sample(NULL, output_info.cbSize); + hr = check_mft_process_output(transform, output_sample, &output_status); + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr); + ok(output_status == MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE, "got output[0].dwStatus %#lx\n", output_status); + hr = IMFSample_GetTotalLength(output_sample, &length); + ok(hr == S_OK, "GetTotalLength returned %#lx\n", hr); + ok(length == 0, "got length %lu\n", length); + ret = IMFSample_Release(output_sample); + ok(ret == 0, "Release returned %lu\n", ret); + + ret = IMFSample_Release(input_sample); + ok(ret == 0, "Release returned %lu\n", ret); ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %lu\n", ret);

1 0

Rémi Bernon : mf/tests: Avoid setting transform types while enumerating.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 9652f6a2469d6151e4d09f5efd220b1f2ad93484 URL: https://gitlab.winehq.org/wine/wine/-/commit/9652f6a2469d6151e4d09f5efd220b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 22 14:22:22 2022 +0200 mf/tests: Avoid setting transform types while enumerating. Some transform do not handle the MFT_SET_TYPE_TEST_ONLY correctly, and setting the type may have undesired side effects. We already check the required attributes consistently now. --- dlls/mf/tests/transform.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 0e0ae2417d5..c494891c78a 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -1951,9 +1951,6 @@ static void test_aac_decoder(void) ok(hr == S_OK, "GetInputAvailableType returned %#lx\n", hr); check_media_type(media_type, expect_input_attributes, -1); check_media_type(media_type, expect_available_inputs[i], -1); - hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); - if (i != 1) ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); - else ok(hr == MF_E_INVALIDMEDIATYPE, "SetInputType returned %#lx.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret <= 1, "Release returned %lu\n", ret); winetest_pop_context(); @@ -1980,8 +1977,6 @@ static void test_aac_decoder(void) ok(hr == S_OK, "GetOutputAvailableType returned %#lx\n", hr); check_media_type(media_type, expect_output_attributes, -1); check_media_type(media_type, expect_available_outputs[i], -1); - hr = IMFTransform_SetOutputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); - ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret <= 1, "Release returned %lu\n", ret); winetest_pop_context(); @@ -2542,8 +2537,6 @@ static void test_wma_decoder(void) winetest_push_context("in %lu", i); ok(hr == S_OK, "GetInputAvailableType returned %#lx\n", hr); check_media_type(media_type, expect_available_inputs[i], -1); - hr = IMFTransform_SetInputType(transform, 0, media_type, 0); - ok(hr == MF_E_INVALIDMEDIATYPE, "SetInputType returned %#lx.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret); winetest_pop_context(); @@ -3546,8 +3539,6 @@ static void test_audio_convert(void) winetest_push_context("in %lu", i); ok(hr == S_OK, "GetInputAvailableType returned %#lx\n", hr); check_media_type(media_type, expect_available_inputs[i], -1); - hr = IMFTransform_SetInputType(transform, 0, media_type, 0); - ok(hr == MF_E_INVALIDMEDIATYPE, "SetInputType returned %#lx.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret); winetest_pop_context(); @@ -3928,14 +3919,6 @@ static void test_color_convert(void) ok(hr == S_OK, "GetInputAvailableType returned %#lx\n", hr); check_media_type(media_type, expect_available_common, -1); check_media_type(media_type, expect_available_inputs[i], -1); - hr = IMFTransform_SetInputType(transform, 0, media_type, 0); - if (i == 12) - { - todo_wine - ok(hr == MF_E_INVALIDMEDIATYPE, "SetInputType returned %#lx.\n", hr); - } - else - ok(hr == E_INVALIDARG, "SetInputType returned %#lx.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret); winetest_pop_context(); @@ -4823,8 +4806,6 @@ static void test_mp3_decoder(void) winetest_push_context("in %lu", i); ok(hr == S_OK, "GetInputAvailableType returned %#lx\n", hr); check_media_type(media_type, expect_available_inputs[i], -1); - hr = IMFTransform_SetInputType(transform, 0, media_type, 0); - ok(hr == MF_E_INVALIDMEDIATYPE, "SetInputType returned %#lx.\n", hr); ret = IMFMediaType_Release(media_type); ok(ret == 0, "Release returned %lu\n", ret); winetest_pop_context();

1 0

Rémi Bernon : mf/tests: Test WMV decoder MFT / DMO presence and media types.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 24ca2bd2319996c7569e6e2b525b03d6d443545e URL: https://gitlab.winehq.org/wine/wine/-/commit/24ca2bd2319996c7569e6e2b525b03… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 8 10:22:27 2022 +0200 mf/tests: Test WMV decoder MFT / DMO presence and media types. --- dlls/mf/tests/transform.c | 481 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 416 insertions(+), 65 deletions(-)

1 0

Rémi Bernon : mf/tests: Test WMV encoder MFT / DMO presence and media types.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: a75e7d0d73091ee4717d2322e20a89c6223e8096 URL: https://gitlab.winehq.org/wine/wine/-/commit/a75e7d0d73091ee4717d2322e20a89… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 30 08:21:56 2022 +0200 mf/tests: Test WMV encoder MFT / DMO presence and media types. --- dlls/mf/tests/transform.c | 382 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 367 insertions(+), 15 deletions(-)

1 0