January 2022 - Wine-Commits

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

Jan. 27, 2022

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: Make texture allocation and destruction into separate shader_runner ops.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

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: Rename shader_runner_d3d12 to shader_runner.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: vkd3d Branch: master Commit: 63622a92e84f3f8a93de8d1e604350bca686194e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=63622a92e84f3f8a93de8d1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 19:40:26 2022 -0600 tests: Rename shader_runner_d3d12 to shader_runner. 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 | 6 +++--- tests/{shader_runner_d3d12.c => shader_runner.c} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index db0a6f6..17fcae3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,7 +51,7 @@ vkd3d_cross_tests = \ tests/hlsl_d3d12 vkd3d_shader_runners = \ - tests/shader_runner_d3d12 + tests/shader_runner vkd3d_shader_tests = \ tests/abs.shader_test \ @@ -282,10 +282,10 @@ TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @VULKAN_LIBS@ tests_d3d12_invalid_usage_LDADD = $(LDADD) @VULKAN_LIBS@ tests_hlsl_d3d12_LDADD = $(LDADD) @VULKAN_LIBS@ -tests_shader_runner_d3d12_LDADD = $(LDADD) @VULKAN_LIBS@ +tests_shader_runner_LDADD = $(LDADD) @VULKAN_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la -SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 +SHADER_TEST_LOG_COMPILER = tests/shader_runner XFAIL_TESTS = \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner.c similarity index 99% rename from tests/shader_runner_d3d12.c rename to tests/shader_runner.c index 4a8d1f1..5db963f 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner.c @@ -643,7 +643,7 @@ static struct texture *get_texture(struct shader_context *context, unsigned int return NULL; } -START_TEST(shader_runner_d3d12) +START_TEST(shader_runner) { static const struct test_context_desc desc = {

1 0

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

Jan. 27, 2022

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: Move the drawing and readback implementation to the d3d12 shader runner.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: vkd3d Branch: master Commit: 09e3018b6d9d08bf4bfcd6e878c3e5eed26e3a99 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=09e3018b6d9d08bf4bfcd6e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 19:40:28 2022 -0600 tests: Move the drawing and readback implementation to the d3d12 shader runner. 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 | 3 +- tests/d3d12_test_utils.h | 5 +- tests/shader_runner.c | 285 +++++++------------------------------------- tests/shader_runner.h | 58 ++++++++- tests/shader_runner_d3d12.c | 200 +++++++++++++++++++++++++++++-- tests/utils.h | 58 +++++++++ 6 files changed, 351 insertions(+), 258 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=09e3018b6d9d08bf4bf…

1 0

Jeremy Newman : ignore hidden files created by mac finder
by Jeremy Newman Jan. 27, 2022

Jan. 27, 2022

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 Jan. 27, 2022

Jan. 27, 2022

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

Alistair Leslie-Hughes : msdasql: Add ITransactionJoin to session interface.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: 7bdef00a75e50e54975b155126e75dbffbc0d963 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bdef00a75e50e54975b1551… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 26 21:55:02 2022 +1100 msdasql: Add ITransactionJoin to session interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 58 +++++++++++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 5 ++-- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index f0e915ca710..e58d152a418 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -43,6 +43,7 @@ struct msdasql_session IOpenRowset IOpenRowset_iface; ISessionProperties ISessionProperties_iface; IDBCreateCommand IDBCreateCommand_iface; + ITransactionJoin ITransactionJoin_iface; LONG refs; IUnknown *datasource; @@ -75,6 +76,11 @@ static inline struct msdasql_session *impl_from_IDBCreateCommand( IDBCreateComma return CONTAINING_RECORD( iface, struct msdasql_session, IDBCreateCommand_iface ); } +static inline struct msdasql_session *impl_from_ITransactionJoin( ITransactionJoin *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_session, ITransactionJoin_iface ); +} + static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { struct msdasql_session *session = impl_from_IUnknown( iface ); @@ -107,6 +113,11 @@ static HRESULT WINAPI session_QueryInterface(IUnknown *iface, REFIID riid, void TRACE("(%p)->(IDBCreateCommand_iface %p)\n", iface, ppv); *ppv = &session->IDBCreateCommand_iface; } + else if(IsEqualGUID(&IID_ITransactionJoin, riid)) + { + TRACE("(%p)->(ITransactionJoin %p)\n", iface, ppv); + *ppv = &session->ITransactionJoin_iface; + } else if(IsEqualGUID(&IID_IBindResource, riid)) { TRACE("(%p)->(IID_IBindResource not support)\n", iface); @@ -1191,6 +1202,52 @@ static const IDBCreateCommandVtbl createcommandVtbl = createcommand_CreateCommand }; +static HRESULT WINAPI transjoin_QueryInterface(ITransactionJoin *iface, REFIID riid, void **out) +{ + struct msdasql_session *session = impl_from_ITransactionJoin( iface ); + return IUnknown_QueryInterface(&session->session_iface, riid, out); +} + +static ULONG WINAPI transjoin_AddRef(ITransactionJoin *iface) +{ + struct msdasql_session *session = impl_from_ITransactionJoin( iface ); + return IUnknown_AddRef(&session->session_iface); +} + +static ULONG WINAPI transjoin_Release(ITransactionJoin *iface) +{ + struct msdasql_session *session = impl_from_ITransactionJoin( iface ); + return IUnknown_Release(&session->session_iface); +} + +static HRESULT WINAPI transjoin_GetOptionsObject(ITransactionJoin *iface, ITransactionOptions **options) +{ + struct msdasql_session *session = impl_from_ITransactionJoin( iface ); + + FIXME("%p, %p\n", session, options); + + return E_NOTIMPL; +} + +static HRESULT WINAPI transjoin_JoinTransaction(ITransactionJoin *iface, IUnknown *unk, ISOLEVEL level, + ULONG flags, ITransactionOptions *options) +{ + struct msdasql_session *session = impl_from_ITransactionJoin( iface ); + + FIXME("%p, %p, %d, 0x%08x, %p\n", session, unk, level, flags, options); + + return E_NOTIMPL; +} + +static const ITransactionJoinVtbl transactionjoinVtbl = +{ + transjoin_QueryInterface, + transjoin_AddRef, + transjoin_Release, + transjoin_GetOptionsObject, + transjoin_JoinTransaction +}; + HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **unk) { struct msdasql_session *session; @@ -1205,6 +1262,7 @@ HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **u session->IOpenRowset_iface.lpVtbl = &openrowsetVtbl; session->ISessionProperties_iface.lpVtbl = &propertiesVtbl; session->IDBCreateCommand_iface.lpVtbl = &createcommandVtbl; + session->ITransactionJoin_iface.lpVtbl = &transactionjoinVtbl; IUnknown_QueryInterface(datasource, &IID_IUnknown, (void**)&session->datasource); session->refs = 1; session->hdbc = hdbc; diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index eefddbf6dcb..ee81ad1d311 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -494,9 +494,8 @@ static void test_sessions(void) ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); hr = IUnknown_QueryInterface(session, &IID_ITransactionJoin, (void**)&join); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if(hr == S_OK) - ITransactionJoin_Release(join); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITransactionJoin_Release(join); hr = IUnknown_QueryInterface(session, &IID_IBindResource, (void**)&unimplemented); ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr);

1 0

Daniel Lehman : msvcp140_atomic_wait: Add stub dll.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

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

Stefan Dösinger : ddraw/tests: Treat refresh rates with 1 hz difference as equal.
by Alexandre Julliard Jan. 26, 2022

Jan. 26, 2022

Module: wine Branch: master Commit: dc79534a6d2c6e1e73194ff4ab5f7f34a4363ff7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc79534a6d2c6e1e73194ff4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 26 11:52:25 2022 +0300 ddraw/tests: Treat refresh rates with 1 hz difference as equal. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 3 ++- dlls/ddraw/tests/ddraw4.c | 3 ++- dlls/ddraw/tests/ddraw7.c | 11 ++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 00c8f820edb..8a6c4b41ac1 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -15114,8 +15114,9 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC *surface_desc if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) return DDENUMRET_OK; + /* See comment in ddraw7 about the frequency. */ if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && - surface_desc->dwRefreshRate != param->old_frequency) + !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1)) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index a8b68b8a20b..c229ab66341 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -18151,8 +18151,9 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) return DDENUMRET_OK; + /* See comment in ddraw7 about the frequency. */ if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && - surface_desc->dwRefreshRate != param->old_frequency) + !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1)) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f4388296702..18ebf849391 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18417,8 +18417,17 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) return DDENUMRET_OK; + /* Windows will advertise 59hz (for 59.94) and 60hz (for proper 60hz) on monitors that support + * only one of the two (usually 59.94). If an application requests 60hz windows will apply 59.94. + * Thus if we think we found a different refresh rate, we get 59hz instead of the 60hz we + * requested. + * + * The same is true of other 1% slowed-down TV compatible refresh rates according to a Microsoft + * support document: 23.976 vs 24, 30, 48, 72 and 120 hz. It can be reproduced by attempting to + * set 60hz in the advanced display properties manually. Usually the restriction to one refresh + * rate applies to laptop panels. */ if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && - surface_desc->dwRefreshRate != param->old_frequency) + !compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1)) { param->new_width = surface_desc->dwWidth; param->new_height = surface_desc->dwHeight;

1 0