September 2022 - Wine-commits

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

30 Sep '22

Module: wine Branch: master Commit: cf59a6f9b64409716d4f0a974bdc9464e059e7a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf59a6f9b64409716d4f0a974bdc94… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 21 20:00:30 2022 +0200 mf/tests: Add some WMV encoder MFT / DMO encoding tests. --- dlls/mf/tests/resource.rc | 3 ++ dlls/mf/tests/transform.c | 94 ++++++++++++++++++++++++++++++++++++++++++- dlls/mf/tests/wmvencdata.bin | Bin 0 -> 911 bytes 3 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/resource.rc b/dlls/mf/tests/resource.rc index 08d123d5c8f..6cbf64d4528 100644 --- a/dlls/mf/tests/resource.rc +++ b/dlls/mf/tests/resource.rc @@ -38,6 +38,9 @@ wmaencdata.bin RCDATA wmaencdata.bin /* @makedep: wmadecdata.bin */ wmadecdata.bin RCDATA wmadecdata.bin +/* @makedep: wmvencdata.bin */ +wmvencdata.bin RCDATA wmvencdata.bin + /* Generated with: * gst-launch-1.0 filesrc location=dlls/mf/tests/audiodata.bin ! \ * audio/x-raw,format=F32LE,rate=22050,channels=2,layout=interleaved ! \ diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 8daa2ce1d3a..dc3ae2b7201 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -572,7 +572,7 @@ static HRESULT check_mft_process_output_(int line, IMFTransform *transform, IMFS { static const DWORD expect_flags = MFT_OUTPUT_DATA_BUFFER_INCOMPLETE | MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE | MFT_OUTPUT_DATA_BUFFER_STREAM_END | MFT_OUTPUT_DATA_BUFFER_NO_SAMPLE; - MFT_OUTPUT_DATA_BUFFER output[2]; + MFT_OUTPUT_DATA_BUFFER output[3]; HRESULT hr, ret; DWORD status; @@ -3917,12 +3917,47 @@ static void test_wmv_encoder(void) .cbAlignment = 1, }; + const struct buffer_desc output_buffer_desc[] = + { + {.length = -1 /* variable */}, + }; + const struct attribute_desc output_sample_attributes_key[] = + { + ATTR_UINT32(MFSampleExtension_CleanPoint, 1), + {0}, + }; + const struct attribute_desc output_sample_attributes[] = + { + ATTR_UINT32(MFSampleExtension_CleanPoint, 0), + {0}, + }; + const struct sample_desc output_sample_desc[] = + { + { + .attributes = output_sample_attributes_key, + .sample_time = 0, .sample_duration = 333333, + .buffer_count = 1, .buffers = output_buffer_desc, + }, + { + .attributes = output_sample_attributes, + .sample_time = 333333, .sample_duration = 333333, + .buffer_count = 1, .buffers = output_buffer_desc, .repeat_count = 4 + }, + }; + MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_WMV1}; MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_NV12}; + IMFSample *input_sample, *output_sample; + DWORD status, length, output_status; + MFT_OUTPUT_DATA_BUFFER output; + IMFCollection *output_samples; + const BYTE *nv12frame_data; IMFMediaType *media_type; + ULONG nv12frame_data_len; IMFTransform *transform; ULONG i, ret; HRESULT hr; + LONG ref; hr = CoInitialize(NULL); ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr); @@ -3986,6 +4021,63 @@ static void test_wmv_encoder(void) check_mft_get_input_stream_info(transform, S_OK, &expect_input_info); check_mft_get_output_stream_info(transform, S_OK, &expect_output_info); + if (!has_video_processor) + { + win_skip("Skipping WMV encoder tests on Win7\n"); + goto done; + } + + load_resource(L"nv12frame.bmp", &nv12frame_data, &nv12frame_data_len); + /* skip BMP header and RGB data from the dump */ + length = *(DWORD *)(nv12frame_data + 2); + nv12frame_data_len = nv12frame_data_len - length; + nv12frame_data = nv12frame_data + length; + ok(nv12frame_data_len == 13824, "got length %lu\n", nv12frame_data_len); + + hr = MFCreateCollection(&output_samples); + ok(hr == S_OK, "MFCreateCollection returned %#lx\n", hr); + + for (i = 0; i < 5; i++) + { + input_sample = create_sample(nv12frame_data, nv12frame_data_len); + hr = IMFSample_SetSampleTime(input_sample, i * 333333); + ok(hr == S_OK, "SetSampleTime returned %#lx\n", hr); + hr = IMFSample_SetSampleDuration(input_sample, 333333); + 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); + ref = IMFSample_Release(input_sample); + ok(ref <= 1, "Release returned %ld\n", ref); + + output_sample = create_sample(NULL, expect_output_info.cbSize); + hr = check_mft_process_output(transform, output_sample, &output_status); + 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); + } + + ret = check_mf_sample_collection(output_samples, output_sample_desc, L"wmvencdata.bin"); + ok(ret == 0, "got %lu%% diff\n", ret); + IMFCollection_Release(output_samples); + + output_sample = create_sample(NULL, expect_output_info.cbSize); + status = 0xdeadbeef; + memset(&output, 0, sizeof(output)); + output.pSample = output_sample; + hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); + ok(hr == MF_E_TRANSFORM_NEED_MORE_INPUT, "ProcessOutput returned %#lx\n", hr); + ok(output.pSample == output_sample, "got pSample %p\n", output.pSample); + ok(output.dwStatus == 0, "got dwStatus %#lx\n", output.dwStatus); + ok(status == 0, "got status %#lx\n", status); + hr = IMFSample_GetTotalLength(output.pSample, &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); diff --git a/dlls/mf/tests/wmvencdata.bin b/dlls/mf/tests/wmvencdata.bin new file mode 100644 index 00000000000..a409afaf143 Binary files /dev/null and b/dlls/mf/tests/wmvencdata.bin differ

1 0

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

30 Sep '22

Module: wine Branch: master Commit: f942a1109a0e26cfbbe8dfa530d2597bc7293873 URL: https://gitlab.winehq.org/wine/wine/-/commit/f942a1109a0e26cfbbe8dfa530d259… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 21 20:01:29 2022 +0200 mf/tests: Add some WMV decoder MFT / DMO decoding tests. --- dlls/mf/tests/transform.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index dc3ae2b7201..e66baa6e7c9 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -4336,11 +4336,33 @@ static void test_wmv_decoder(void) .cbAlignment = 1, }; + const struct attribute_desc output_sample_attributes[] = + { + ATTR_UINT32(MFSampleExtension_CleanPoint, 1), + {0}, + }; + const struct buffer_desc output_buffer_desc_nv12 = + { + .length = actual_width * actual_height * 3 / 2, + .compare = compare_nv12, .dump = dump_nv12, .rect = {.right = 82, .bottom = 84}, + }; + const struct sample_desc output_sample_desc_nv12 = + { + .attributes = output_sample_attributes, + .sample_time = 0, .sample_duration = 333333, + .buffer_count = 1, .buffers = &output_buffer_desc_nv12, + }; + MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_WMV1}; + IMFSample *input_sample, *output_sample; + IMFCollection *output_samples; IMFMediaType *media_type; IMFTransform *transform; - ULONG i, ret; + const BYTE *wmvenc_data; + ULONG wmvenc_data_len; + DWORD output_status; + ULONG i, ret, ref; HRESULT hr; hr = CoInitialize(NULL); @@ -4425,6 +4447,44 @@ static void test_wmv_decoder(void) check_mft_get_input_stream_info(transform, S_OK, &expect_input_info); check_mft_get_output_stream_info(transform, S_OK, &expect_output_info); + load_resource(L"wmvencdata.bin", &wmvenc_data, &wmvenc_data_len); + + input_sample = create_sample(wmvenc_data + sizeof(DWORD), *(DWORD *)wmvenc_data); + wmvenc_data_len -= *(DWORD *)wmvenc_data + sizeof(DWORD); + wmvenc_data += *(DWORD *)wmvenc_data + sizeof(DWORD); + hr = IMFSample_SetSampleTime(input_sample, 0); + ok(hr == S_OK, "SetSampleTime returned %#lx\n", hr); + hr = IMFSample_SetSampleDuration(input_sample, 333333); + 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); + ret = IMFSample_Release(input_sample); + ok(ret <= 1, "Release returned %ld\n", ret); + + hr = MFCreateCollection(&output_samples); + ok(hr == S_OK, "MFCreateCollection returned %#lx\n", hr); + + output_sample = create_sample(NULL, expect_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, expect_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 == 1, "got %lu output samples\n", i); + + ret = check_mf_sample_collection(output_samples, &output_sample_desc_nv12, L"nv12frame.bmp"); + ok(ret == 0, "got %lu%% diff\n", ret); + IMFCollection_Release(output_samples); + skip_tests: ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %lu\n", ret);

1 0

Rémi Bernon : makedep: Add an import type parameter to add_import_libs.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: c1a0b74d98ca8b266af6e2add402eeb6ae1ca56f URL: https://gitlab.winehq.org/wine/wine/-/commit/c1a0b74d98ca8b266af6e2add402ee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 29 19:53:45 2022 +0200 makedep: Add an import type parameter to add_import_libs. --- tools/makedep.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 69b4a4c660b..7045dab9541 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2176,12 +2176,17 @@ static struct strarray add_default_imports( const struct makefile *make, struct return ret; } +enum import_type +{ + IMPORT_TYPE_DIRECT, + IMPORT_TYPE_DELAYED, +}; /******************************************************************* * add_import_libs */ static struct strarray add_import_libs( const struct makefile *make, struct strarray *deps, - struct strarray imports, int delay, int is_cross ) + struct strarray imports, enum import_type type, int is_cross ) { struct strarray ret = empty_strarray; unsigned int i, j; @@ -2215,7 +2220,7 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra { const char *ext = NULL; - if (delay && !delay_load_flag && (is_cross || !*dll_ext)) ext = ".delay.a"; + if (type == IMPORT_TYPE_DELAYED && !delay_load_flag && (is_cross || !*dll_ext)) ext = ".delay.a"; else if (is_cross) ext = ".cross.a"; if (ext) lib = replace_extension( lib, ".a", ext ); strarray_add_uniq( deps, lib ); @@ -2967,7 +2972,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, if (!dll_flags.count) dll_flags = make->extradllflags; if (!strarray_exists( &dll_flags, "-nodefaultlibs" )) imports = add_default_imports( make, imports ); - all_libs = add_import_libs( make, &dep_libs, imports, 0, make->is_cross ); + all_libs = add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, make->is_cross ); dll_name = strmake( "%s.dll%s", obj, make->is_cross ? "" : dll_ext ); obj_name = strmake( "%s%s", obj_dir_path( make, obj ), make->is_cross ? ".cross.o" : ".o" ); output_file = obj_dir_path( make, dll_name ); @@ -3166,8 +3171,8 @@ static void output_module( struct makefile *make ) if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) imports = add_default_imports( make, imports ); - strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 1, make->is_cross )); - strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, 0, make->is_cross )); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, IMPORT_TYPE_DELAYED, make->is_cross )); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, make->is_cross )); if (!make->use_msvcrt) { @@ -3331,7 +3336,7 @@ static void output_unix_lib( struct makefile *make ) strarray_add( &unix_imports, "winecrt0" ); if (spec_file) strarray_add( &unix_deps, spec_file ); - strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, 0, 0 )); + strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, IMPORT_TYPE_DIRECT, 0 )); strarray_addall( &unix_libs, get_expanded_make_var_array( make, "UNIX_LIBS" )); strarray_addall( &unix_libs, libs ); } @@ -3455,7 +3460,7 @@ static void output_test_module( struct makefile *make ) char *testres = replace_extension( make->testdll, ".dll", "_test.res" ); struct strarray dep_libs = empty_strarray; struct strarray all_libs = add_import_libs( make, &dep_libs, add_default_imports( make, make->imports ), - 0, make->is_cross ); + IMPORT_TYPE_DIRECT, make->is_cross ); struct makefile *parent = get_parent_makefile( make ); const char *ext = make->is_cross ? "" : dll_ext; const char *debug_file;

1 0

Rémi Bernon : makedep: Link default imports separately from direct imports.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 214223edc39eab074a6923f83f4bc00d4485ec03 URL: https://gitlab.winehq.org/wine/wine/-/commit/214223edc39eab074a6923f83f4bc0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 29 20:04:44 2022 +0200 makedep: Link default imports separately from direct imports. --- tools/makedep.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 7045dab9541..527cbd3c058 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2151,19 +2151,17 @@ static const char *get_crt_define( const struct makefile *make ) /******************************************************************* - * add_default_imports + * get_default_imports */ -static struct strarray add_default_imports( const struct makefile *make, struct strarray imports ) +static struct strarray get_default_imports( const struct makefile *make, struct strarray imports ) { struct strarray ret = empty_strarray; const char *crt_dll = get_default_crt( make ); unsigned int i; for (i = 0; i < imports.count; i++) - { - if (is_crt_module( imports.str[i] )) crt_dll = imports.str[i]; - else strarray_add( &ret, imports.str[i] ); - } + if (is_crt_module( imports.str[i] )) + crt_dll = imports.str[i]; strarray_add( &ret, "winecrt0" ); if (crt_dll) strarray_add( &ret, crt_dll ); @@ -2180,6 +2178,7 @@ enum import_type { IMPORT_TYPE_DIRECT, IMPORT_TYPE_DELAYED, + IMPORT_TYPE_DEFAULT, }; /******************************************************************* @@ -2196,6 +2195,9 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra const char *name = imports.str[i]; const char *lib = NULL; + /* add crt import lib only when adding the default imports libs */ + if (is_crt_module( imports.str[i] ) && type != IMPORT_TYPE_DEFAULT) continue; + if (name[0] == '-') { switch (name[1]) @@ -2964,15 +2966,18 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, { struct strarray imports = get_expanded_file_local_var( make, obj, "IMPORTS" ); struct strarray dll_flags = get_expanded_file_local_var( make, obj, "EXTRADLLFLAGS" ); - struct strarray all_libs, dep_libs = empty_strarray; + struct strarray all_libs = empty_strarray, dep_libs = empty_strarray; + struct strarray default_imports = empty_strarray; char *dll_name, *obj_name, *output_file; const char *debug_file; if (!imports.count) imports = make->imports; if (!dll_flags.count) dll_flags = make->extradllflags; - if (!strarray_exists( &dll_flags, "-nodefaultlibs" )) imports = add_default_imports( make, imports ); + if (!strarray_exists( &dll_flags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports ); + + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, make->is_cross ) ); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, make->is_cross ) ); - all_libs = add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, make->is_cross ); dll_name = strmake( "%s.dll%s", obj, make->is_cross ? "" : dll_ext ); obj_name = strmake( "%s%s", obj_dir_path( make, obj ), make->is_cross ? ".cross.o" : ".o" ); output_file = obj_dir_path( make, dll_name ); @@ -3152,6 +3157,7 @@ static char *get_unix_lib_name( struct makefile *make ) */ static void output_module( struct makefile *make ) { + struct strarray default_imports = empty_strarray; struct strarray all_libs = empty_strarray; struct strarray dep_libs = empty_strarray; struct strarray imports = make->imports; @@ -3168,11 +3174,11 @@ static void output_module( struct makefile *make ) if (*dll_ext && !make->is_cross && !make->data_only) module_name = strmake( "%s%s", make->module, dll_ext ); - if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) - imports = add_default_imports( make, imports ); + if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports ); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, IMPORT_TYPE_DELAYED, make->is_cross )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, make->is_cross )); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, make->is_cross ) ); if (!make->use_msvcrt) { @@ -3458,14 +3464,16 @@ static void output_test_module( struct makefile *make ) char *testmodule = replace_extension( make->testdll, ".dll", "_test.exe" ); char *stripped = replace_extension( make->testdll, ".dll", "_test-stripped.exe" ); char *testres = replace_extension( make->testdll, ".dll", "_test.res" ); - struct strarray dep_libs = empty_strarray; - struct strarray all_libs = add_import_libs( make, &dep_libs, add_default_imports( make, make->imports ), - IMPORT_TYPE_DIRECT, make->is_cross ); + struct strarray default_imports = get_default_imports( make, make->imports ); + struct strarray dep_libs = empty_strarray, all_libs = empty_strarray; struct makefile *parent = get_parent_makefile( make ); const char *ext = make->is_cross ? "" : dll_ext; const char *debug_file; char *output_file; + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, IMPORT_TYPE_DIRECT, make->is_cross ) ); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, make->is_cross ) ); + strarray_add( &make->all_targets, strmake( "%s%s", testmodule, ext )); strarray_add( &make->clean_files, strmake( "%s%s", stripped, ext )); output_file = strmake( "%s%s", obj_dir_path( make, testmodule ), ext );

1 0

Rémi Bernon : makedep: Link with imported libs before delay imported libs.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: c90e03e3cb1740c03f69f7f87354f7a8f24c6656 URL: https://gitlab.winehq.org/wine/wine/-/commit/c90e03e3cb1740c03f69f7f87354f7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 29 20:05:30 2022 +0200 makedep: Link with imported libs before delay imported libs. In order to favor direct imports over delayed imports, for instance when the delay imported module forwards symbols from the imported module. --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 527cbd3c058..d7e045bdd6e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3176,8 +3176,8 @@ static void output_module( struct makefile *make ) if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports ); - strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, IMPORT_TYPE_DELAYED, make->is_cross )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, make->is_cross )); + strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, IMPORT_TYPE_DELAYED, make->is_cross )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, make->is_cross ) ); if (!make->use_msvcrt)

1 0

Rémi Bernon : shcore: Use delay import for user32 and ole32.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 81e9b72dc967c2fa3aab4eca238f4a017fddd36a URL: https://gitlab.winehq.org/wine/wine/-/commit/81e9b72dc967c2fa3aab4eca238f4a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 29 18:02:45 2022 +0200 shcore: Use delay import for user32 and ole32. And drop gdi32 which isn't required. --- dlls/shcore/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/Makefile.in b/dlls/shcore/Makefile.in index 7c4d161a558..61840e9a056 100644 --- a/dlls/shcore/Makefile.in +++ b/dlls/shcore/Makefile.in @@ -1,6 +1,7 @@ MODULE = shcore.dll IMPORTLIB = shcore -IMPORTS = user32 gdi32 ole32 advapi32 +IMPORTS = advapi32 +DELAYIMPORTS = user32 ole32 EXTRADLLFLAGS = -Wb,--prefer-native

1 0

Rémi Bernon : regedit: Call InitCommonControls after command-line has been processed.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 99b3862e67b0841e2eb4f5f0d099b0403917c581 URL: https://gitlab.winehq.org/wine/wine/-/commit/99b3862e67b0841e2eb4f5f0d099b0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 29 18:03:26 2022 +0200 regedit: Call InitCommonControls after command-line has been processed. Avoid triggering the load of comctl32 early. --- programs/regedit/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index e776ec9d0f7..b1035629726 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -132,8 +132,6 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi HACCEL hAccel; BOOL is_wow64; - InitCommonControls(); - if (ProcessCmdLine(GetCommandLineW())) { return 0; } @@ -161,6 +159,8 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi Wow64RevertWow64FsRedirection( redir ); } + InitCommonControls(); + /* Initialize global strings */ LoadStringW(hInstance, IDS_APP_TITLE, szTitle, ARRAY_SIZE(szTitle)); LoadStringW(hInstance, IDS_REGISTRY_DEFAULT_VALUE, g_pszDefaultValueName, ARRAY_SIZE(g_pszDefaultValueName));

1 0

Rémi Bernon : regedit: Add a direct import for shcore.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 4c60f67f00afbdfe6ab9db3fcd57b299d1317f0f URL: https://gitlab.winehq.org/wine/wine/-/commit/4c60f67f00afbdfe6ab9db3fcd57b2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 29 18:04:31 2022 +0200 regedit: Add a direct import for shcore. For CommandLineToArgvW. --- programs/regedit/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index 9f8fb5af165..77ef7b3163a 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -1,5 +1,5 @@ MODULE = regedit.exe -IMPORTS = advapi32 +IMPORTS = advapi32 shcore DELAYIMPORTS = shlwapi shell32 comdlg32 comctl32 user32 gdi32 EXTRADLLFLAGS = -mwindows -municode

1 0

Alexandre Julliard : mmdevapi/tests: Mark some failing tests as flaky.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: 1237ae4f9de336c8d47f93ae40b9efcca968f55d URL: https://gitlab.winehq.org/wine/wine/-/commit/1237ae4f9de336c8d47f93ae40b9ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 30 18:43:25 2022 +0200 mmdevapi/tests: Mark some failing tests as flaky. --- dlls/mmdevapi/tests/render.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index ac714980c6f..8e000f03acb 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1034,11 +1034,12 @@ static void test_clock(int share) * BufferSize must be rounded up, maximum 2s says MSDN * but it is rounded down modulo fragment ! */ if (share) - ok(gbsize == bufsize, - "BufferSize %u at rate %lu\n", gbsize, pwfx->nSamplesPerSec); + ok(gbsize == bufsize, + "BufferSize %u at rate %lu\n", gbsize, pwfx->nSamplesPerSec); else - ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024, - "BufferSize %u misfits fragment size %u at rate %lu\n", gbsize, fragment, pwfx->nSamplesPerSec); + flaky + ok(gbsize == parts * fragment || gbsize == MulDiv(bufsize, 1, 1024) * 1024, + "BufferSize %u misfits fragment size %u at rate %lu\n", gbsize, fragment, pwfx->nSamplesPerSec); /* In shared mode, GetCurrentPadding decreases in multiples of * fragment size (i.e. updated only at period ticks), whereas @@ -1111,6 +1112,7 @@ static void test_clock(int share) ok(hr == S_OK, "GetPosition failed: %08lx\n", hr); ok(pos > 0, "Position %u vs. last %u\n", (UINT)pos,0); /* in rare cases is slept*1.1 not enough with dmix */ + flaky ok(pos*1000/freq <= slept*1.4, "Position %u too far after playing %ums\n", (UINT)pos, slept); last = pos; @@ -2211,6 +2213,7 @@ static void test_worst_case(void) for(i = 0; i <= 99; i++){ /* 100 x 10ms = 1 second */ r = WaitForSingleObject(event, 60 + defp / 10000); + flaky_wine ok(r == WAIT_OBJECT_0, "Wait iteration %d gave %lx\n", i, r); /* the app has nearly one period time to feed data */

1 0

Paul Gofman : crypt32: Set correct exponent length in decoded BCRYPT_RSAKEY_BLOB.
by Alexandre Julliard 30 Sep '22

30 Sep '22

Module: wine Branch: master Commit: cc3fc9a47d24a7afd2c7e6050e27bf291c98f3f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc3fc9a47d24a7afd2c7e6050e27bf… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 29 16:51:16 2022 -0500 crypt32: Set correct exponent length in decoded BCRYPT_RSAKEY_BLOB. --- dlls/crypt32/decode.c | 31 +++++++++++++++++++++++-------- dlls/crypt32/tests/encode.c | 20 ++++++++++---------- 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 60f9868ed67..22e15360cf3 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3874,7 +3874,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCertPolicyConstraints( struct DECODED_RSA_PUB_KEY { - DWORD pubexp; + CRYPT_INTEGER_BLOB pubexp; CRYPT_INTEGER_BLOB modulus; }; @@ -3893,12 +3893,23 @@ static BOOL CRYPT_raw_decode_rsa_pub_key(struct DECODED_RSA_PUB_KEY **decodedKey FALSE, TRUE, offsetof(struct DECODED_RSA_PUB_KEY, modulus.pbData), 0 }, { ASN_INTEGER, offsetof(struct DECODED_RSA_PUB_KEY, pubexp), - CRYPT_AsnDecodeIntInternal, sizeof(DWORD), FALSE, FALSE, 0, 0 }, + CRYPT_AsnDecodeUnsignedIntegerInternal, sizeof(CRYPT_INTEGER_BLOB), + FALSE, TRUE, offsetof(struct DECODED_RSA_PUB_KEY, pubexp.pbData), + 0 }, }; ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, decodedKey, size, NULL, NULL); + + if (ret && (*decodedKey)->pubexp.cbData > sizeof(DWORD)) + { + WARN("Unexpected exponent length %lu.\n", (*decodedKey)->pubexp.cbData); + LocalFree(*decodedKey); + SetLastError(CRYPT_E_ASN1_LARGE); + ret = FALSE; + } + return ret; } @@ -3920,7 +3931,7 @@ static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey_Bcrypt(DWORD dwCertEncodingType, if (ret) { /* Header, exponent, and modulus */ - DWORD bytesNeeded = sizeof(BCRYPT_RSAKEY_BLOB) + sizeof(DWORD) + + DWORD bytesNeeded = sizeof(BCRYPT_RSAKEY_BLOB) + decodedKey->pubexp.cbData + decodedKey->modulus.cbData; if (!pvStructInfo) @@ -3939,7 +3950,7 @@ static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey_Bcrypt(DWORD dwCertEncodingType, hdr = pvStructInfo; hdr->Magic = BCRYPT_RSAPUBLIC_MAGIC; hdr->BitLength = decodedKey->modulus.cbData * 8; - hdr->cbPublicExp = sizeof(DWORD); + hdr->cbPublicExp = decodedKey->pubexp.cbData; hdr->cbModulus = decodedKey->modulus.cbData; hdr->cbPrime1 = 0; hdr->cbPrime2 = 0; @@ -3947,9 +3958,9 @@ static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey_Bcrypt(DWORD dwCertEncodingType, * in big-endian format, so we need to convert from little-endian */ CRYPT_CopyReversed((BYTE *)pvStructInfo + sizeof(BCRYPT_RSAKEY_BLOB), - (BYTE *)&decodedKey->pubexp, sizeof(DWORD)); + decodedKey->pubexp.pbData, hdr->cbPublicExp); CRYPT_CopyReversed((BYTE *)pvStructInfo + sizeof(BCRYPT_RSAKEY_BLOB) + - sizeof(DWORD), decodedKey->modulus.pbData, + hdr->cbPublicExp, decodedKey->modulus.pbData, decodedKey->modulus.cbData); } LocalFree(decodedKey); @@ -3984,13 +3995,13 @@ static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey(DWORD dwCertEncodingType, if (!pvStructInfo) { *pcbStructInfo = bytesNeeded; - ret = TRUE; } else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, bytesNeeded))) { BLOBHEADER *hdr; RSAPUBKEY *rsaPubKey; + unsigned int i; if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) pvStructInfo = *(BYTE **)pvStructInfo; @@ -4002,7 +4013,11 @@ static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey(DWORD dwCertEncodingType, rsaPubKey = (RSAPUBKEY *)((BYTE *)pvStructInfo + sizeof(BLOBHEADER)); rsaPubKey->magic = RSA1_MAGIC; - rsaPubKey->pubexp = decodedKey->pubexp; + rsaPubKey->pubexp = 0; + assert(decodedKey->pubexp.cbData <= sizeof(rsaPubKey->pubexp)); + for (i = 0; i < decodedKey->pubexp.cbData; ++i) + rsaPubKey->pubexp |= decodedKey->pubexp.pbData[i] << (i * 8); + rsaPubKey->bitlen = decodedKey->modulus.cbData * 8; memcpy((BYTE *)pvStructInfo + sizeof(BLOBHEADER) + sizeof(RSAPUBKEY), decodedKey->modulus.pbData, diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 3c37f41d504..565afb4c9e0 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2315,10 +2315,10 @@ static const BYTE modulus1[] = { 0,0,0,1,1,1,1,1 }; static const BYTE modulus2[] = { 1,1,1,1,1,0,0,0 }; static const BYTE modulus3[] = { 0x80,1,1,1,1,0,0,0 }; static const BYTE modulus4[] = { 1,1,1,1,1,0,0,0x80 }; -static const BYTE mod1_encoded[] = { 0x30,0x0f,0x02,0x08,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x02,0x03,0x01,0x00,0x01 }; -static const BYTE mod2_encoded[] = { 0x30,0x0c,0x02,0x05,0x01,0x01,0x01,0x01,0x01,0x02,0x03,0x01,0x00,0x01 }; -static const BYTE mod3_encoded[] = { 0x30,0x0c,0x02,0x05,0x01,0x01,0x01,0x01,0x80,0x02,0x03,0x01,0x00,0x01 }; -static const BYTE mod4_encoded[] = { 0x30,0x10,0x02,0x09,0x00,0x80,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x02,0x03,0x01,0x00,0x01 }; +static const BYTE mod1_encoded[] = { 0x30,0x0f,0x02,0x08,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x02,0x03,0x02,0x00,0x01 }; +static const BYTE mod2_encoded[] = { 0x30,0x0c,0x02,0x05,0x01,0x01,0x01,0x01,0x01,0x02,0x03,0x02,0x00,0x01 }; +static const BYTE mod3_encoded[] = { 0x30,0x0c,0x02,0x05,0x01,0x01,0x01,0x01,0x80,0x02,0x03,0x02,0x00,0x01 }; +static const BYTE mod4_encoded[] = { 0x30,0x10,0x02,0x09,0x00,0x80,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x02,0x03,0x02,0x00,0x01 }; struct EncodedRSAPubKey { @@ -2351,7 +2351,7 @@ static void test_encodeRsaPublicKey(DWORD dwEncoding) hdr->aiKeyAlg = CALG_RSA_KEYX; rsaPubKey->magic = 0x31415352; rsaPubKey->bitlen = sizeof(modulus1) * 8; - rsaPubKey->pubexp = 65537; + rsaPubKey->pubexp = 131073; memcpy(toEncode + sizeof(BLOBHEADER) + sizeof(RSAPUBKEY), modulus1, sizeof(modulus1)); @@ -2480,7 +2480,7 @@ static void test_decodeRsaPublicKey(DWORD dwEncoding) "Expected magic RSA1, got %08lx\n", rsaPubKey->magic); ok(rsaPubKey->bitlen == rsaPubKeys[i].decodedModulusLen * 8, "Wrong bit len %ld\n", rsaPubKey->bitlen); - ok(rsaPubKey->pubexp == 65537, "Expected pubexp 65537, got %ld\n", + ok(rsaPubKey->pubexp == 131073, "Expected pubexp 131073, got %ld\n", rsaPubKey->pubexp); ok(!memcmp(buf + sizeof(BLOBHEADER) + sizeof(RSAPUBKEY), rsaPubKeys[i].modulus, rsaPubKeys[i].decodedModulusLen), @@ -2497,7 +2497,7 @@ static void test_encodeRsaPublicKey_Bcrypt(DWORD dwEncoding) BOOL ret; BYTE *buf = NULL; DWORD bufSize = 0, i; - BYTE pubexp[] = {0x01,0x00,0x01,0x00}; /* 65537 */ + BYTE pubexp[] = {0x01,0x00,0x02,0x00}; /* 131073 */ /* Verify that the Magic value doesn't matter */ hdr->Magic = 1; @@ -2568,7 +2568,7 @@ static void test_decodeRsaPublicKey_Bcrypt(DWORD dwEncoding) if (ret) { BCRYPT_RSAKEY_BLOB *hdr = (BCRYPT_RSAKEY_BLOB *)buf; - BYTE pubexp[] = {0xff,0xff,0xff,0xff}, pubexp_expected[] = {0x01,0x00,0x01}; + BYTE pubexp[] = {0xff,0xff,0xff,0xcc}, pubexp_expected[] = {0x01,0x00,0x02}; /* CNG_RSA_PUBLIC_KEY_BLOB stores the exponent * in big-endian format, so we need to convert it to little-endian */ @@ -2584,13 +2584,13 @@ static void test_decodeRsaPublicKey_Bcrypt(DWORD dwEncoding) /* Windows decodes the exponent to 3 bytes, since it will fit. * Our implementation currently unconditionally decodes to a DWORD (4 bytes) */ - todo_wine ok(hdr->cbPublicExp == 3, "Expected cbPublicExp 3, got %ld\n", hdr->cbPublicExp); + ok(hdr->cbPublicExp == 3, "Expected cbPublicExp 3, got %ld\n", hdr->cbPublicExp); ok(hdr->cbModulus == rsaPubKeys[i].decodedModulusLen, "Wrong modulus len %ld\n", hdr->cbModulus); ok(hdr->cbPrime1 == 0,"Wrong cbPrime1 %ld\n", hdr->cbPrime1); ok(hdr->cbPrime2 == 0,"Wrong cbPrime2 %ld\n", hdr->cbPrime2); ok(!memcmp(pubexp, pubexp_expected, sizeof(pubexp_expected)), "Wrong exponent\n"); - todo_wine ok(pubexp[3] == 0xff, "Got %02x\n", pubexp[3]); + ok(pubexp[3] == 0xcc, "Got %02x\n", pubexp[3]); leModulus = malloc(hdr->cbModulus); /*

1 0