January 2022 - Wine-commits

Zebediah Figura : tests: Make texture allocation and destruction into separate shader_runner ops.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: vkd3d Branch: master Commit: c417d3f830d4a2a06043909e7272a3372e7db2c0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c417d3f830d4a2a06043909… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 19:40:29 2022 -0600 tests: Make texture allocation and destruction into separate shader_runner ops. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 60 +++++++++++++++++++---------------------- tests/shader_runner.h | 11 ++++++-- tests/shader_runner_d3d12.c | 65 ++++++++++++++++++++++++++------------------- 3 files changed, 75 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c417d3f830d4a2a0604…

1 0

Zebediah Figura : tests: Move d3d12-specific members of struct texture to a new d3d12_texture structure.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: vkd3d Branch: master Commit: 33c845ece52ef6bd7c6ae9ee3825d7583710617b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=33c845ece52ef6bd7c6ae9e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 19:40:30 2022 -0600 tests: Move d3d12-specific members of struct texture to a new d3d12_texture structure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.h | 5 ----- tests/shader_runner_d3d12.c | 31 ++++++++++++++++++++++++------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/tests/shader_runner.h b/tests/shader_runner.h index c541b56..2e6d360 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -60,11 +60,6 @@ struct texture_params struct texture { unsigned int slot; - - D3D12_DESCRIPTOR_RANGE descriptor_range; - ID3D12DescriptorHeap *heap; - ID3D12Resource *resource; - unsigned int root_index; }; struct shader_context diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 94399ae..f79c53b 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -24,6 +24,21 @@ #include "d3d12_crosstest.h" #include "shader_runner.h" +struct d3d12_texture +{ + struct texture t; + + D3D12_DESCRIPTOR_RANGE descriptor_range; + ID3D12DescriptorHeap *heap; + ID3D12Resource *resource; + unsigned int root_index; +}; + +static struct d3d12_texture *d3d12_texture(struct texture *t) +{ + return CONTAINING_RECORD(t, struct d3d12_texture, t); +} + struct d3d12_shader_context { struct shader_context c; @@ -68,11 +83,11 @@ static struct texture *d3d12_runner_create_texture(struct shader_context *c, con struct test_context *test_context = &context->test_context; ID3D12Device *device = test_context->device; D3D12_SUBRESOURCE_DATA resource_data; - struct texture *texture; + struct d3d12_texture *texture; texture = calloc(1, sizeof(*texture)); - texture->slot = params->slot; + texture->t.slot = params->slot; texture->heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); texture->resource = create_default_texture(device, params->width, params->height, @@ -86,11 +101,13 @@ static struct texture *d3d12_runner_create_texture(struct shader_context *c, con ID3D12Device_CreateShaderResourceView(device, texture->resource, NULL, get_cpu_descriptor_handle(test_context, texture->heap, 0)); - return texture; + return &texture->t; } -static void d3d12_runner_destroy_texture(struct shader_context *c, struct texture *texture) +static void d3d12_runner_destroy_texture(struct shader_context *c, struct texture *t) { + struct d3d12_texture *texture = d3d12_texture(t); + ID3D12DescriptorHeap_Release(texture->heap); ID3D12Resource_Release(texture->resource); free(texture); @@ -133,7 +150,7 @@ static void d3d12_runner_draw_quad(struct shader_context *c) for (i = 0; i < context->c.texture_count; ++i) { - struct texture *texture = context->c.textures[i]; + struct d3d12_texture *texture = d3d12_texture(context->c.textures[i]); D3D12_DESCRIPTOR_RANGE *range; range = &texture->descriptor_range; @@ -147,7 +164,7 @@ static void d3d12_runner_draw_quad(struct shader_context *c) range->RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; range->NumDescriptors = 1; - range->BaseShaderRegister = texture->slot; + range->BaseShaderRegister = texture->t.slot; range->RegisterSpace = 0; range->OffsetInDescriptorsFromTableStart = 0; } @@ -188,7 +205,7 @@ static void d3d12_runner_draw_quad(struct shader_context *c) context->c.uniform_count, context->c.uniforms, 0); for (i = 0; i < context->c.texture_count; ++i) { - struct texture *texture = context->c.textures[i]; + struct d3d12_texture *texture = d3d12_texture(context->c.textures[i]); ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, texture->root_index, get_gpu_descriptor_handle(test_context, texture->heap, 0));

1 0

Zebediah Figura : tests: Pass HLSL source to the draw_quad() function.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: vkd3d Branch: master Commit: 3994cec7b1b8eecb19bb812b2196b53ea569f2cd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3994cec7b1b8eecb19bb812… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 19:40:31 2022 -0600 tests: Pass HLSL source to the draw_quad() function. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 14 +++++--------- tests/shader_runner.h | 3 +-- tests/shader_runner_d3d12.c | 14 +++++++++----- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index aabae5a..12fdad3 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -495,10 +495,11 @@ void run_shader_tests(struct shader_context *context, int argc, char **argv, con break; case STATE_SHADER_PIXEL: - if (!(context->ps_code = context->ops->compile_shader(context, - shader_source, context->minimum_shader_model))) - return; + free(context->ps_source); + context->ps_source = shader_source; + shader_source = NULL; shader_source_len = 0; + shader_source_size = 0; break; case STATE_SHADER_INVALID_PIXEL: @@ -590,10 +591,6 @@ void run_shader_tests(struct shader_context *context, int argc, char **argv, con else if (!strcmp(line, "[pixel shader]\n")) { state = STATE_SHADER_PIXEL; - - if (context->ps_code) - ID3D10Blob_Release(context->ps_code); - context->ps_code = NULL; } else if (!strcmp(line, "[pixel shader fail]\n")) { @@ -686,8 +683,7 @@ void run_shader_tests(struct shader_context *context, int argc, char **argv, con } } - if (context->ps_code) - ID3D10Blob_Release(context->ps_code); + free(context->ps_source); for (i = 0; i < context->texture_count; ++i) { if (context->textures[i]) diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 2e6d360..6865d4d 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -66,7 +66,7 @@ struct shader_context { const struct shader_runner_ops *ops; - ID3D10Blob *ps_code; + char *ps_source; enum shader_model minimum_shader_model; uint32_t *uniforms; @@ -81,7 +81,6 @@ struct shader_context struct shader_runner_ops { - ID3D10Blob *(*compile_shader)(struct shader_context *context, const char *source, enum shader_model minimum_shader_model); struct texture *(*create_texture)(struct shader_context *context, const struct texture_params *params); void (*destroy_texture)(struct shader_context *context, struct texture *texture); void (*draw_quad)(struct shader_context *context); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index f79c53b..3b415ec 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -51,8 +51,7 @@ static struct d3d12_shader_context *d3d12_shader_context(struct shader_context * return CONTAINING_RECORD(c, struct d3d12_shader_context, c); } -static ID3D10Blob *d3d12_runner_compile_shader(struct shader_context *c, - const char *source, enum shader_model shader_model) +static ID3D10Blob *compile_shader(const char *source, enum shader_model shader_model) { ID3D10Blob *blob = NULL, *errors = NULL; HRESULT hr; @@ -118,8 +117,6 @@ static void d3d12_runner_draw_quad(struct shader_context *c) struct d3d12_shader_context *context = d3d12_shader_context(c); struct test_context *test_context = &context->test_context; - D3D12_SHADER_BYTECODE ps - = {ID3D10Blob_GetBufferPointer(context->c.ps_code), ID3D10Blob_GetBufferSize(context->c.ps_code)}; ID3D12GraphicsCommandList *command_list = test_context->list; D3D12_ROOT_SIGNATURE_DESC root_signature_desc = {0}; D3D12_ROOT_PARAMETER root_params[3], *root_param; @@ -128,10 +125,15 @@ static void d3d12_runner_draw_quad(struct shader_context *c) ID3D12Device *device = test_context->device; static const float clear_color[4]; unsigned int uniform_index; + D3D12_SHADER_BYTECODE ps; ID3D12PipelineState *pso; + ID3D10Blob *ps_code; HRESULT hr; size_t i; + if (!(ps_code = compile_shader(context->c.ps_source, context->c.minimum_shader_model))) + return; + root_signature_desc.NumParameters = 0; root_signature_desc.pParameters = root_params; root_signature_desc.NumStaticSamplers = 0; @@ -191,8 +193,11 @@ static void d3d12_runner_draw_quad(struct shader_context *c) hr = create_root_signature(device, &root_signature_desc, &test_context->root_signature); ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + ps.pShaderBytecode = ID3D10Blob_GetBufferPointer(ps_code); + ps.BytecodeLength = ID3D10Blob_GetBufferSize(ps_code); pso = create_pipeline_state(device, test_context->root_signature, test_context->render_target_desc.Format, NULL, &ps, NULL); + ID3D10Blob_Release(ps_code); if (!pso) return; vkd3d_array_reserve((void **)&test_context->pso, &test_context->pso_capacity, @@ -245,7 +250,6 @@ static void d3d12_runner_probe_vec4(struct shader_context *c, static const struct shader_runner_ops d3d12_runner_ops = { - .compile_shader = d3d12_runner_compile_shader, .create_texture = d3d12_runner_create_texture, .destroy_texture = d3d12_runner_destroy_texture, .draw_quad = d3d12_runner_draw_quad,

1 0

Zebediah Figura : tests: Add a helper to set uniforms.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: vkd3d Branch: master Commit: ecbdd8f994cfb1b4cc125e64ae328b24942de520 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ecbdd8f994cfb1b4cc125e6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 19:40:32 2022 -0600 tests: Add a helper to set uniforms. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 36 ++++++++++++------------------------ tests/shader_runner.h | 2 +- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 12fdad3..ae5daa7 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -276,6 +276,14 @@ static void parse_texture_directive(struct texture_params *texture, const char * } } +static void set_uniforms(struct shader_context *context, size_t offset, size_t count, const void *uniforms) +{ + context->uniform_count = max(context->uniform_count, offset + count); + vkd3d_array_reserve((void **)&context->uniforms, &context->uniform_capacity, + context->uniform_count, sizeof(*context->uniforms)); + memcpy(context->uniforms + offset, uniforms, count * sizeof(*context->uniforms)); +} + static void parse_test_directive(struct shader_context *context, const char *line) { if (match_string(line, "draw quad", &line)) @@ -350,12 +358,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin if (sscanf(line, "%f %f %f %f", &v.x, &v.y, &v.z, &v.w) < 4) fatal_error("Malformed float4 constant '%s'.\n", line); - if (offset + 4 > context->uniform_count) - { - context->uniform_count = offset + 4; - context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); - } - memcpy(context->uniforms + offset, &v, sizeof(v)); + set_uniforms(context, offset, 4, &v); } else if (match_string(line, "float", &line)) { @@ -363,12 +366,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin if (sscanf(line, "%f", &f) < 1) fatal_error("Malformed float constant '%s'.\n", line); - if (offset + 1 > context->uniform_count) - { - context->uniform_count = offset + 1; - context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); - } - memcpy(context->uniforms + offset, &f, sizeof(f)); + set_uniforms(context, offset, 1, &f); } else if (match_string(line, "int", &line)) { @@ -376,12 +374,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin if (sscanf(line, "%i", &i) < 1) fatal_error("Malformed int constant '%s'.\n", line); - if (offset + 1 > context->uniform_count) - { - context->uniform_count = offset + 1; - context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); - } - memcpy(context->uniforms + offset, &i, sizeof(i)); + set_uniforms(context, offset, 1, &i); } else if (match_string(line, "uint", &line)) { @@ -389,12 +382,7 @@ static void parse_test_directive(struct shader_context *context, const char *lin if (sscanf(line, "%u", &u) < 1) fatal_error("Malformed uint constant '%s'.\n", line); - if (offset + 1 > context->uniform_count) - { - context->uniform_count = offset + 1; - context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); - } - memcpy(context->uniforms + offset, &u, sizeof(u)); + set_uniforms(context, offset, 1, &u); } } else diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 6865d4d..9a687ed 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -70,7 +70,7 @@ struct shader_context enum shader_model minimum_shader_model; uint32_t *uniforms; - size_t uniform_count; + size_t uniform_count, uniform_capacity; struct texture **textures; size_t texture_count;

1 0

Zebediah Figura : tests: Add a D3D11 shader runner backend.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: vkd3d Branch: master Commit: 22e6581ffca3aeeddd047fb0f0321c509ed29ead URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=22e6581ffca3aeeddd047fb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 19:40:33 2022 -0600 tests: Add a D3D11 shader runner backend. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + tests/d3d12.c | 5 - tests/d3d12_test_utils.h | 33 --- tests/shader_runner.c | 7 +- tests/shader_runner.h | 4 + tests/shader_runner_d3d11.c | 639 ++++++++++++++++++++++++++++++++++++++++++++ tests/utils.h | 39 +++ 7 files changed, 689 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=22e6581ffca3aeeddd0…

1 0

Jeremy Newman : ignore hidden files created by mac finder
by Jeremy Newman 27 Jan '22

27 Jan '22

Module: website Branch: master Commit: 7a676ea9d0545f365238e52336454af5c8138624 URL: https://source.winehq.org/git/website.git/?a=commit;h=7a676ea9d0545f365238e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 27 10:32:56 2022 -0600 ignore hidden files created by mac finder --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 3e820fc4..f2646f99 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ site templates/en/docs templates/en/winapi_stats.template .htaccess +*.DS_Store +*._.DS_Store +*._*

1 0

Jeremy Newman : test using CDATA for sections
by Jeremy Newman 27 Jan '22

27 Jan '22

Module: website Branch: master Commit: 40f8f7719696b3c043cfc45746dae1bf778c2bb6 URL: https://source.winehq.org/git/website.git/?a=commit;h=40f8f7719696b3c043cfc… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 27 10:28:34 2022 -0600 test using CDATA for sections --- wwn/en/wn20211210_409.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wwn/en/wn20211210_409.xml b/wwn/en/wn20211210_409.xml index c24f3d68..76364256 100755 --- a/wwn/en/wn20211210_409.xml +++ b/wwn/en/wn20211210_409.xml @@ -2,13 +2,13 @@ <title>Wine Traffic</title> <author contact="mailto:wwn(a)winehq.org">Cressida Silver</author> <issue num="NNN" date="12/10/2021"/> - <intro> + <intro><![CDATA[ <p> This is the 409th issue of the World Wine News publication. Its main goal is to inform you of what's going on around Wine. Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a> </p> - </intro> + ]]></intro> - <section title="Wine 6.23" subject="" archive="" posts=""> + <section title="Wine 6.23" subject="" archive="" posts=""><![CDATA[ <p> Wine 6.23 was released last Friday, and it contains more work on <a href="https://www.winehq.org/wwn/408">PE conversion.</a> For more details, see <a href="https://www.winehq.org/announce/6.23">here</a> for the full release notes. </p> @@ -19,5 +19,5 @@ <p> Happy Holidays to you and yours! </p> - </section> + ]]></section> </kc>

1 0

Daniel Lehman : msvcp140_atomic_wait: Add stub dll.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: d04e7f25c31e87bf62b95a57bd4df4db51b9dd3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d04e7f25c31e87bf62b95a57… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 21 15:48:35 2022 -0800 msvcp140_atomic_wait: Add stub dll. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/msvcp140_atomic_wait/Makefile.in | 1 + .../msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 32 ++++++++++++++++++++++ 4 files changed, 36 insertions(+) diff --git a/configure b/configure index b6d22f896ea..ce3ecb0fee4 100755 --- a/configure +++ b/configure @@ -1517,6 +1517,7 @@ enable_msvcp120 enable_msvcp120_app enable_msvcp140 enable_msvcp140_1 +enable_msvcp140_atomic_wait enable_msvcp60 enable_msvcp70 enable_msvcp71 @@ -22130,6 +22131,7 @@ wine_fn_config_makefile dlls/msvcp140 enable_msvcp140 wine_fn_config_makefile dlls/msvcp140/tests enable_tests wine_fn_config_makefile dlls/msvcp140_1 enable_msvcp140_1 wine_fn_config_makefile dlls/msvcp140_1/tests enable_tests +wine_fn_config_makefile dlls/msvcp140_atomic_wait enable_msvcp140_atomic_wait wine_fn_config_makefile dlls/msvcp60 enable_msvcp60 wine_fn_config_makefile dlls/msvcp60/tests enable_tests wine_fn_config_makefile dlls/msvcp70 enable_msvcp70 diff --git a/configure.ac b/configure.ac index 0b1a53f3ff9..bf590be0072 100644 --- a/configure.ac +++ b/configure.ac @@ -3055,6 +3055,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcp140) WINE_CONFIG_MAKEFILE(dlls/msvcp140/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp140_1) WINE_CONFIG_MAKEFILE(dlls/msvcp140_1/tests) +WINE_CONFIG_MAKEFILE(dlls/msvcp140_atomic_wait) WINE_CONFIG_MAKEFILE(dlls/msvcp60) WINE_CONFIG_MAKEFILE(dlls/msvcp60/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp70) diff --git a/dlls/msvcp140_atomic_wait/Makefile.in b/dlls/msvcp140_atomic_wait/Makefile.in new file mode 100644 index 00000000000..0d1aac64b53 --- /dev/null +++ b/dlls/msvcp140_atomic_wait/Makefile.in @@ -0,0 +1 @@ +MODULE = msvcp140_atomic_wait.dll diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec new file mode 100644 index 00000000000..34ca996f2f5 --- /dev/null +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -0,0 +1,32 @@ +@ stub __std_acquire_shared_mutex_for_instance +@ stub __std_atomic_compare_exchange_128 +@ stub __std_atomic_get_mutex +@ stub __std_atomic_has_cmpxchg16b +@ stub __std_atomic_notify_all_direct +@ stub __std_atomic_notify_all_indirect +@ stub __std_atomic_notify_one_direct +@ stub __std_atomic_notify_one_indirect +@ stub __std_atomic_set_api_level +@ stub __std_atomic_wait_direct +@ stub __std_atomic_wait_get_deadline +@ stub __std_atomic_wait_get_remaining_timeout +@ stub __std_atomic_wait_indirect +@ stub __std_bulk_submit_threadpool_work +@ stub __std_calloc_crt +@ stub __std_close_threadpool_work +@ stub __std_create_threadpool_work +@ stub __std_execution_wait_on_uchar +@ stub __std_execution_wake_by_address_all +@ stub __std_free_crt +@ stub __std_parallel_algorithms_hw_threads +@ stub __std_release_shared_mutex_for_instance +@ stub __std_submit_threadpool_work +@ stub __std_tzdb_delete_current_zone +@ stub __std_tzdb_delete_leap_seconds +@ stub __std_tzdb_delete_sys_info +@ stub __std_tzdb_delete_time_zones +@ stub __std_tzdb_get_current_zone +@ stub __std_tzdb_get_leap_seconds +@ stub __std_tzdb_get_sys_info +@ stub __std_tzdb_get_time_zones +@ stub __std_wait_for_threadpool_work_callbacks

1 0

Daniel Lehman : msvcp140_atomic_wait: Implement __std_parallel_algorithms_hw_threads.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 2e88169d7be6ccfed9a79344bec59d92e82e4da4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e88169d7be6ccfed9a79344… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jan 26 17:24:35 2022 +0100 msvcp140_atomic_wait: Implement __std_parallel_algorithms_hw_threads. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msvcp140_atomic_wait/Makefile.in | 4 ++ dlls/msvcp140_atomic_wait/main.c | 32 ++++++++++++ .../msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/Makefile.in | 4 ++ .../tests/msvcp140_atomic_wait.c | 60 ++++++++++++++++++++++ 7 files changed, 103 insertions(+), 1 deletion(-) diff --git a/configure b/configure index ce3ecb0fee4..7760e43b8e9 100755 --- a/configure +++ b/configure @@ -22132,6 +22132,7 @@ wine_fn_config_makefile dlls/msvcp140/tests enable_tests wine_fn_config_makefile dlls/msvcp140_1 enable_msvcp140_1 wine_fn_config_makefile dlls/msvcp140_1/tests enable_tests wine_fn_config_makefile dlls/msvcp140_atomic_wait enable_msvcp140_atomic_wait +wine_fn_config_makefile dlls/msvcp140_atomic_wait/tests enable_tests wine_fn_config_makefile dlls/msvcp60 enable_msvcp60 wine_fn_config_makefile dlls/msvcp60/tests enable_tests wine_fn_config_makefile dlls/msvcp70 enable_msvcp70 diff --git a/configure.ac b/configure.ac index bf590be0072..181047ef0d8 100644 --- a/configure.ac +++ b/configure.ac @@ -3056,6 +3056,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcp140/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp140_1) WINE_CONFIG_MAKEFILE(dlls/msvcp140_1/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp140_atomic_wait) +WINE_CONFIG_MAKEFILE(dlls/msvcp140_atomic_wait/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp60) WINE_CONFIG_MAKEFILE(dlls/msvcp60/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp70) diff --git a/dlls/msvcp140_atomic_wait/Makefile.in b/dlls/msvcp140_atomic_wait/Makefile.in index 0d1aac64b53..42f8d7157b1 100644 --- a/dlls/msvcp140_atomic_wait/Makefile.in +++ b/dlls/msvcp140_atomic_wait/Makefile.in @@ -1 +1,5 @@ MODULE = msvcp140_atomic_wait.dll +IMPORTS = msvcp140 + +C_SRCS = \ + main.c diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c new file mode 100644 index 00000000000..5c430ffd959 --- /dev/null +++ b/dlls/msvcp140_atomic_wait/main.c @@ -0,0 +1,32 @@ +/* + * Copyright 2022 Daniel Lehman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); + +extern unsigned int __cdecl _Thrd_hardware_concurrency(void); + +unsigned int __stdcall __std_parallel_algorithms_hw_threads(void) +{ + TRACE("()\n"); + return _Thrd_hardware_concurrency(); +} diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index 34ca996f2f5..1e5d1a5128b 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -18,7 +18,7 @@ @ stub __std_execution_wait_on_uchar @ stub __std_execution_wake_by_address_all @ stub __std_free_crt -@ stub __std_parallel_algorithms_hw_threads +@ stdcall __std_parallel_algorithms_hw_threads() @ stub __std_release_shared_mutex_for_instance @ stub __std_submit_threadpool_work @ stub __std_tzdb_delete_current_zone diff --git a/dlls/msvcp140_atomic_wait/tests/Makefile.in b/dlls/msvcp140_atomic_wait/tests/Makefile.in new file mode 100644 index 00000000000..7f58d06d8f3 --- /dev/null +++ b/dlls/msvcp140_atomic_wait/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = msvcp140_atomic_wait.dll + +C_SRCS = \ + msvcp140_atomic_wait.c diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c new file mode 100644 index 00000000000..aee852afd98 --- /dev/null +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -0,0 +1,60 @@ +/* + * Copyright 2022 Daniel Lehman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/test.h" + +static unsigned int (__stdcall *p___std_parallel_algorithms_hw_threads)(void); + +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) +#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) +static HMODULE init(void) +{ + HMODULE msvcp; + + if (!(msvcp = LoadLibraryA("msvcp140_atomic_wait.dll"))) + return NULL; + + SET(p___std_parallel_algorithms_hw_threads, "__std_parallel_algorithms_hw_threads"); + return msvcp; +} + +static void test___std_parallel_algorithms_hw_threads(void) +{ + SYSTEM_INFO si; + unsigned int nthr; + + GetSystemInfo(&si); + nthr = p___std_parallel_algorithms_hw_threads(); + ok(nthr == si.dwNumberOfProcessors, "expected %u, got %u\n", si.dwNumberOfProcessors, nthr); +} + +START_TEST(msvcp140_atomic_wait) +{ + HMODULE msvcp; + if (!(msvcp = init())) + { + win_skip("msvcp140_atomic_wait.dll not installed\n"); + return; + } + test___std_parallel_algorithms_hw_threads(); + FreeLibrary(msvcp); +}

1 0

Nikolay Sivov : shell32: Ignore KF_FLAG_NOT_PARENT_RELATIVE in SHGetKnownFolderPath().
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 1f5b3b9e84d91bf92365ece5eec66e8bb7a0de8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f5b3b9e84d91bf92365ece5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 26 18:44:30 2022 +0300 shell32: Ignore KF_FLAG_NOT_PARENT_RELATIVE in SHGetKnownFolderPath(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 15 ++++++++++++++- dlls/shell32/tests/shellpath.c | 13 +++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 7bfa504a62f..2f1573f8221 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3529,11 +3529,24 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t return HRESULT_FROM_WIN32( ERROR_FILE_NOT_FOUND ); if (flags & ~(KF_FLAG_CREATE|KF_FLAG_SIMPLE_IDLIST|KF_FLAG_DONT_UNEXPAND| - KF_FLAG_DONT_VERIFY|KF_FLAG_NO_ALIAS|KF_FLAG_INIT|KF_FLAG_DEFAULT_PATH)) + KF_FLAG_DONT_VERIFY|KF_FLAG_NO_ALIAS|KF_FLAG_INIT|KF_FLAG_DEFAULT_PATH|KF_FLAG_NOT_PARENT_RELATIVE)) { FIXME("flags 0x%08x not supported\n", flags); return E_INVALIDARG; } + + if ((flags & (KF_FLAG_DEFAULT_PATH | KF_FLAG_NOT_PARENT_RELATIVE)) == KF_FLAG_NOT_PARENT_RELATIVE) + { + WARN("Invalid flags mask %#x.\n", flags); + return E_INVALIDARG; + } + + if (flags & KF_FLAG_NOT_PARENT_RELATIVE) + { + FIXME("Ignoring KF_FLAG_NOT_PARENT_RELATIVE.\n"); + flags &= ~KF_FLAG_NOT_PARENT_RELATIVE; + } + folder |= flags & CSIDL_FLAG_MASK; shgfp_flags = flags & KF_FLAG_DEFAULT_PATH ? SHGFP_TYPE_DEFAULT : SHGFP_TYPE_CURRENT; diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 0ba3734c518..7d0f725158a 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1910,6 +1910,19 @@ if (0) { /* crashes */ ok(!lstrcmpiW(path, path2), "expected equal paths: %s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(path2)); CoTaskMemFree(path2); + hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_DEFAULT_PATH, NULL, &path2); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path2 != NULL, "expected path != NULL\n"); + CoTaskMemFree(path2); + + hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_NOT_PARENT_RELATIVE, NULL, &path2); + ok(hr == E_INVALIDARG, "expected S_OK, got 0x%08x\n", hr); + + hr = pSHGetKnownFolderPath(folder_id, KF_FLAG_DEFAULT_PATH | KF_FLAG_NOT_PARENT_RELATIVE, NULL, &path2); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path2 != NULL, "expected path != NULL\n"); + CoTaskMemFree(path2); + CoTaskMemFree(path); }

1 0