September 2022 - Wine-commits

Rémi Bernon : winegstreamer: Release callback and context in async_reader_close.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 8f482eba139b89805e34a2d2985109f17f625352 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f482eba139b89805e34a2d2985109… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 19:21:01 2022 +0200 winegstreamer: Release callback and context in async_reader_close. --- dlls/winegstreamer/wm_asyncreader.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index bd7e58713f4..2a2b7310293 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -263,24 +263,29 @@ static void async_reader_close(struct async_reader *reader) list_remove(&op->entry); free(op); } + + if (reader->callback) + IWMReaderCallback_Release(reader->callback); + reader->callback = NULL; + reader->context = NULL; } static HRESULT async_reader_open(struct async_reader *reader, IWMReaderCallback *callback, void *context) { + HRESULT hr = E_OUTOFMEMORY; + IWMReaderCallback_AddRef((reader->callback = callback)); reader->context = context; reader->running = true; if (!(reader->callback_thread = CreateThread(NULL, 0, async_reader_callback_thread, reader, 0, NULL))) - { - IWMReaderCallback_Release(reader->callback); - reader->running = false; - reader->callback = NULL; - reader->context = NULL; - return E_OUTOFMEMORY; - } + goto error; return S_OK; + +error: + async_reader_close(reader); + return hr; } static HRESULT async_reader_queue_op(struct async_reader *reader, enum async_op_type type, void *context) @@ -365,9 +370,6 @@ static HRESULT WINAPI WMReader_Close(IWMReader *iface) async_reader_close(reader); hr = wm_reader_close(&reader->reader); - if (reader->callback) - IWMReaderCallback_Release(reader->callback); - reader->callback = NULL; LeaveCriticalSection(&reader->reader.cs); @@ -1693,9 +1695,6 @@ static void async_reader_destroy(struct wm_reader *iface) wm_reader_close(&reader->reader); - if (reader->callback) - IWMReaderCallback_Release(reader->callback); - wm_reader_cleanup(&reader->reader); free(reader); }

1 0

Rémi Bernon : winegstreamer: Avoid waiting for callback thread on allocation failure.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 1b8590f47a7716a15bfc514b6597da7ea7ab89ad URL: https://gitlab.winehq.org/wine/wine/-/commit/1b8590f47a7716a15bfc514b6597da… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 26 10:21:23 2022 +0200 winegstreamer: Avoid waiting for callback thread on allocation failure. --- dlls/winegstreamer/wm_asyncreader.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 2a2b7310293..a5ab2167ab3 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -366,10 +366,11 @@ static HRESULT WINAPI WMReader_Close(IWMReader *iface) EnterCriticalSection(&reader->reader.cs); - async_reader_queue_op(reader, ASYNC_OP_CLOSE, NULL); - async_reader_close(reader); - - hr = wm_reader_close(&reader->reader); + if (SUCCEEDED(hr = async_reader_queue_op(reader, ASYNC_OP_CLOSE, NULL))) + { + async_reader_close(reader); + hr = wm_reader_close(&reader->reader); + } LeaveCriticalSection(&reader->reader.cs);

1 0

Rémi Bernon : winegstreamer: Query IWMReaderCallbackAdvanced interface in Open.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 04c5aeadafea5c9fa67b8d9fb6087eb0a5f24990 URL: https://gitlab.winehq.org/wine/wine/-/commit/04c5aeadafea5c9fa67b8d9fb6087e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 22 13:59:06 2022 +0200 winegstreamer: Query IWMReaderCallbackAdvanced interface in Open. And release it on Close. --- dlls/winegstreamer/wm_asyncreader.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index a5ab2167ab3..f3e2209881a 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -46,6 +46,7 @@ struct async_reader IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface; IReferenceClock IReferenceClock_iface; + IWMReaderCallbackAdvanced *callback_advanced; IWMReaderCallback *callback; void *context; @@ -70,8 +71,9 @@ static REFERENCE_TIME get_current_time(const struct async_reader *reader) return (time.QuadPart * 1000) / reader->clock_frequency.QuadPart * 10000; } -static void callback_thread_run(struct async_reader *reader, IWMReaderCallbackAdvanced *callback_advanced) +static void callback_thread_run(struct async_reader *reader) { + IWMReaderCallbackAdvanced *callback_advanced = reader->callback_advanced; IWMReaderCallback *callback = reader->callback; REFERENCE_TIME start_time; struct wm_stream *stream; @@ -173,17 +175,10 @@ static void callback_thread_run(struct async_reader *reader, IWMReaderCallbackAd static DWORD WINAPI async_reader_callback_thread(void *arg) { struct async_reader *reader = arg; - IWMReaderCallback *callback = reader->callback; - IWMReaderCallbackAdvanced *callback_advanced; static const DWORD zero; struct list *entry; HRESULT hr = S_OK; - if (FAILED(hr = IWMReaderCallback_QueryInterface(callback, - &IID_IWMReaderCallbackAdvanced, (void **)&callback_advanced))) - callback_advanced = NULL; - TRACE("Querying for IWMReaderCallbackAdvanced returned %#lx.\n", hr); - IWMReaderCallback_OnStatus(reader->callback, WMT_OPENED, S_OK, WMT_TYPE_DWORD, (BYTE *)&zero, reader->context); @@ -209,7 +204,7 @@ static DWORD WINAPI async_reader_callback_thread(void *arg) EnterCriticalSection(&reader->callback_cs); if (SUCCEEDED(hr)) - callback_thread_run(reader, callback_advanced); + callback_thread_run(reader); break; } @@ -238,9 +233,6 @@ static DWORD WINAPI async_reader_callback_thread(void *arg) SleepConditionVariableCS(&reader->callback_cv, &reader->callback_cs, INFINITE); } - if (callback_advanced) - IWMReaderCallbackAdvanced_Release(callback_advanced); - LeaveCriticalSection(&reader->callback_cs); TRACE("Reader is stopping; exiting.\n"); @@ -264,6 +256,10 @@ static void async_reader_close(struct async_reader *reader) free(op); } + if (reader->callback_advanced) + IWMReaderCallbackAdvanced_Release(reader->callback_advanced); + reader->callback_advanced = NULL; + if (reader->callback) IWMReaderCallback_Release(reader->callback); reader->callback = NULL; @@ -277,6 +273,13 @@ static HRESULT async_reader_open(struct async_reader *reader, IWMReaderCallback IWMReaderCallback_AddRef((reader->callback = callback)); reader->context = context; + if (FAILED(hr = IWMReaderCallback_QueryInterface(callback, &IID_IWMReaderCallbackAdvanced, + (void **)&reader->callback_advanced))) + { + WARN("Failed to retrieve IWMReaderCallbackAdvanced interface, hr %#lx\n", hr); + reader->callback_advanced = NULL; + } + reader->running = true; if (!(reader->callback_thread = CreateThread(NULL, 0, async_reader_callback_thread, reader, 0, NULL))) goto error;

1 0

Stefan Dösinger : wined3d: Tell vkd3d_shader about dual source blending.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 64effe6df7975a4d7942ed30ccd99da026582097 URL: https://gitlab.winehq.org/wine/wine/-/commit/64effe6df7975a4d7942ed30ccd99d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 5 11:50:01 2022 +0300 wined3d: Tell vkd3d_shader about dual source blending. Dual source blending implies an additional shader output, which needs to be declared. This improves WoT on high graphics settings on MoltenVK. --- dlls/wined3d/context_vk.c | 8 +++++++- dlls/wined3d/shader_spirv.c | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index b738e97b6cf..db1840d29e2 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -3422,6 +3422,8 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; + const struct wined3d_blend_state *b = state->blend_state; + bool dual_source_blend = b && b->dual_source; struct wined3d_rendertarget_view *dsv; struct wined3d_rendertarget_view *rtv; struct wined3d_buffer_vk *buffer_vk; @@ -3433,8 +3435,12 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c bool invalidate_ds = false; if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)) - || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_FRAMEBUFFER)) + || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_FRAMEBUFFER) + || dual_source_blend != context_vk->c.last_was_dual_source_blend) + { context_vk->c.shader_update_mask |= (1u << WINED3D_SHADER_TYPE_PIXEL); + context_vk->c.last_was_dual_source_blend = dual_source_blend; + } if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX))) context_vk->c.shader_update_mask |= (1u << WINED3D_SHADER_TYPE_VERTEX); if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY))) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 1f89e3d3ef5..42be7541d67 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -57,6 +57,7 @@ struct shader_spirv_compile_arguments { uint32_t alpha_swizzle; unsigned int sample_count; + bool dual_source_blending; } fs; } u; }; @@ -147,6 +148,7 @@ static void shader_spirv_compile_arguments_init(struct shader_spirv_compile_argu args->u.fs.alpha_swizzle |= 1u << i; } args->u.fs.sample_count = sample_count; + args->u.fs.dual_source_blending = state->blend_state && state->blend_state->dual_source; break; default: @@ -177,6 +179,8 @@ static void shader_spirv_init_compile_args(struct wined3d_shader_spirv_compile_a shader_parameter->data_type = VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32; shader_parameter->u.immediate_constant.u.u32 = compile_args->u.fs.sample_count; + args->spirv_target.dual_source_blending = compile_args->u.fs.dual_source_blending; + args->spirv_target.parameter_count = 1; args->spirv_target.parameters = shader_parameter;

1 0

Stefan Dösinger : ddraw/tests: Avoid picking a large mode on Win10 in test_coop_level_mode_set_enum_cb.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: fc9f3bbfa5971ee5138e3067a6d5b7f952b4bdb1 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc9f3bbfa5971ee5138e3067a6d5b7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 6 19:20:35 2022 +0300 ddraw/tests: Avoid picking a large mode on Win10 in test_coop_level_mode_set_enum_cb. --- dlls/ddraw/tests/ddraw1.c | 15 +++++++++++++-- dlls/ddraw/tests/ddraw2.c | 15 +++++++++++++-- dlls/ddraw/tests/ddraw4.c | 15 +++++++++++++-- dlls/ddraw/tests/ddraw7.c | 15 +++++++++++++-- 4 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 94d41dbc34d..531b16520a1 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2874,8 +2874,19 @@ static HRESULT CALLBACK test_coop_level_mode_set_enum_cb(DDSURFACEDESC *surface_ if (surface_desc->dwWidth == param->ddraw_width && surface_desc->dwHeight == param->ddraw_height) return DDENUMRET_OK; - param->user32_width = surface_desc->dwWidth; - param->user32_height = surface_desc->dwHeight; + /* The docs say the DDENUMRET_CANCEL below cancels the enumeration, so the check should be + * redundant. However, since Windows 10 this no longer works and the enumeration continues + * until all supported modes are enumerated. Win8 and earlier do cancel. + * + * Unrelatedly, some testbot machines report high res modes like 1920x1080, but suffer from + * some problems when we actually try to set them (w10pro64 and its localization siblings). + * Try to stay below the registry mode if possible. */ + if (!param->user32_width || (surface_desc->dwWidth < registry_mode.dmPelsWidth + && surface_desc->dwHeight < registry_mode.dmPelsHeight)) + { + param->user32_width = surface_desc->dwWidth; + param->user32_height = surface_desc->dwHeight; + } return DDENUMRET_CANCEL; } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d5b72793526..4c20a774b05 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2971,8 +2971,19 @@ static HRESULT CALLBACK test_coop_level_mode_set_enum_cb(DDSURFACEDESC *surface_ if (surface_desc->dwWidth == param->ddraw_width && surface_desc->dwHeight == param->ddraw_height) return DDENUMRET_OK; - param->user32_width = surface_desc->dwWidth; - param->user32_height = surface_desc->dwHeight; + /* The docs say the DDENUMRET_CANCEL below cancels the enumeration, so the check should be + * redundant. However, since Windows 10 this no longer works and the enumeration continues + * until all supported modes are enumerated. Win8 and earlier do cancel. + * + * Unrelatedly, some testbot machines report high res modes like 1920x1080, but suffer from + * some problems when we actually try to set them (w10pro64 and its localization siblings). + * Try to stay below the registry mode if possible. */ + if (!param->user32_width || (surface_desc->dwWidth < registry_mode.dmPelsWidth + && surface_desc->dwHeight < registry_mode.dmPelsHeight)) + { + param->user32_width = surface_desc->dwWidth; + param->user32_height = surface_desc->dwHeight; + } return DDENUMRET_CANCEL; } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 471f6fc3f09..10cf8f88fd6 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3209,8 +3209,19 @@ static HRESULT CALLBACK test_coop_level_mode_set_enum_cb(DDSURFACEDESC2 *surface if (surface_desc->dwWidth == param->ddraw_width && surface_desc->dwHeight == param->ddraw_height) return DDENUMRET_OK; - param->user32_width = surface_desc->dwWidth; - param->user32_height = surface_desc->dwHeight; + /* The docs say the DDENUMRET_CANCEL below cancels the enumeration, so the check should be + * redundant. However, since Windows 10 this no longer works and the enumeration continues + * until all supported modes are enumerated. Win8 and earlier do cancel. + * + * Unrelatedly, some testbot machines report high res modes like 1920x1080, but suffer from + * some problems when we actually try to set them (w10pro64 and its localization siblings). + * Try to stay below the registry mode if possible. */ + if (!param->user32_width || (surface_desc->dwWidth < registry_mode.dmPelsWidth + && surface_desc->dwHeight < registry_mode.dmPelsHeight)) + { + param->user32_width = surface_desc->dwWidth; + param->user32_height = surface_desc->dwHeight; + } return DDENUMRET_CANCEL; } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 15ab548ebc6..062e8430a75 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2860,8 +2860,19 @@ static HRESULT CALLBACK test_coop_level_mode_set_enum_cb(DDSURFACEDESC2 *surface if (surface_desc->dwWidth == param->ddraw_width && surface_desc->dwHeight == param->ddraw_height) return DDENUMRET_OK; - param->user32_width = surface_desc->dwWidth; - param->user32_height = surface_desc->dwHeight; + /* The docs say the DDENUMRET_CANCEL below cancels the enumeration, so the check should be + * redundant. However, since Windows 10 this no longer works and the enumeration continues + * until all supported modes are enumerated. Win8 and earlier do cancel. + * + * Unrelatedly, some testbot machines report high res modes like 1920x1080, but suffer from + * some problems when we actually try to set them (w10pro64 and its localization siblings). + * Try to stay below the registry mode if possible. */ + if (!param->user32_width || (surface_desc->dwWidth < registry_mode.dmPelsWidth + && surface_desc->dwHeight < registry_mode.dmPelsHeight)) + { + param->user32_width = surface_desc->dwWidth; + param->user32_height = surface_desc->dwHeight; + } return DDENUMRET_CANCEL; }

1 0

Stefan Dösinger : ddraw/tests: Avoid picking a large mode on Win10 in find_different_mode_callback.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 1c5bfc120d157fd6486d243f4ce4cdce0e2dbde5 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c5bfc120d157fd6486d243f4ce4cd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 6 19:59:47 2022 +0300 ddraw/tests: Avoid picking a large mode on Win10 in find_different_mode_callback. --- dlls/ddraw/tests/ddraw1.c | 9 +++++++-- dlls/ddraw/tests/ddraw2.c | 13 +++++++++---- dlls/ddraw/tests/ddraw4.c | 13 +++++++++---- dlls/ddraw/tests/ddraw7.c | 13 +++++++++---- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 531b16520a1..7d2e93ece61 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -14224,8 +14224,13 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC *surface_desc if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height) { - param->new_width = surface_desc->dwWidth; - param->new_height = surface_desc->dwHeight; + /* See test_coop_level_mode_set_enum_cb() for why enumeration might accidentally continue. */ + if (!param->new_width || (param->new_width < registry_mode.dmPelsWidth + && param->new_height < registry_mode.dmPelsHeight)) + { + param->new_width = surface_desc->dwWidth; + param->new_height = surface_desc->dwHeight; + } return DDENUMRET_CANCEL; } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 4c20a774b05..bc370396640 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -15205,10 +15205,15 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC *surface_desc if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && (!compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1) || !param->old_frequency)) { - param->new_width = surface_desc->dwWidth; - param->new_height = surface_desc->dwHeight; - param->new_frequency = surface_desc->dwRefreshRate; - param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; + /* See test_coop_level_mode_set_enum_cb() for why enumeration might accidentally continue. */ + if (!param->new_width || (param->new_width < registry_mode.dmPelsWidth + && param->new_height < registry_mode.dmPelsHeight)) + { + param->new_width = surface_desc->dwWidth; + param->new_height = surface_desc->dwHeight; + param->new_frequency = surface_desc->dwRefreshRate; + param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; + } return DDENUMRET_CANCEL; } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 10cf8f88fd6..de438982703 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -18255,10 +18255,15 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && (!compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1) || !param->old_frequency)) { - param->new_width = surface_desc->dwWidth; - param->new_height = surface_desc->dwHeight; - param->new_frequency = surface_desc->dwRefreshRate; - param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; + /* See test_coop_level_mode_set_enum_cb() for why enumeration might accidentally continue. */ + if (!param->new_width || (param->new_width < registry_mode.dmPelsWidth + && param->new_height < registry_mode.dmPelsHeight)) + { + param->new_width = surface_desc->dwWidth; + param->new_height = surface_desc->dwHeight; + param->new_frequency = surface_desc->dwRefreshRate; + param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; + } return DDENUMRET_CANCEL; } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 062e8430a75..1d1ed1d15ac 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18522,10 +18522,15 @@ static HRESULT CALLBACK find_different_mode_callback(DDSURFACEDESC2 *surface_des if (surface_desc->dwWidth != param->old_width && surface_desc->dwHeight != param->old_height && (!compare_uint(surface_desc->dwRefreshRate, param->old_frequency, 1) || !param->old_frequency)) { - param->new_width = surface_desc->dwWidth; - param->new_height = surface_desc->dwHeight; - param->new_frequency = surface_desc->dwRefreshRate; - param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; + /* See test_coop_level_mode_set_enum_cb() for why enumeration might accidentally continue. */ + if (!param->new_width || (param->new_width < registry_mode.dmPelsWidth + && param->new_height < registry_mode.dmPelsHeight)) + { + param->new_width = surface_desc->dwWidth; + param->new_height = surface_desc->dwHeight; + param->new_frequency = surface_desc->dwRefreshRate; + param->new_bpp = surface_desc->ddpfPixelFormat.dwRGBBitCount; + } return DDENUMRET_CANCEL; }

1 0

Nikolay Sivov : crypt32/tests: Use CRT allocation functions.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: a63d7c06a9c6eb2530d585994d4def113b393370 URL: https://gitlab.winehq.org/wine/wine/-/commit/a63d7c06a9c6eb2530d585994d4def… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 7 08:28:26 2022 +0300 crypt32/tests: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/crypt32/tests/base64.c | 59 ++++++++++++++-------------- dlls/crypt32/tests/cert.c | 92 ++++++++++++++++++++++---------------------- dlls/crypt32/tests/encode.c | 41 ++++++++++---------- dlls/crypt32/tests/message.c | 16 ++++---- dlls/crypt32/tests/msg.c | 4 +- dlls/crypt32/tests/oid.c | 4 +- dlls/crypt32/tests/store.c | 32 +++++++-------- 7 files changed, 123 insertions(+), 125 deletions(-)

1 0

Stefan Dösinger : include/test.h: Don't use strcasecmp.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 802016d0ebb0d4de55ae61f9b80c3855f91399e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/802016d0ebb0d4de55ae61f9b80c38… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 6 14:12:30 2022 +0300 include/test.h: Don't use strcasecmp. Fixes building tests in Visual Studio with msvc's own crt headers. --- include/wine/test.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 505f0daaaf4..d1036f9dcd4 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -743,7 +743,7 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_COLOR", p, sizeof(p) )) { - BOOL automode = !strcasecmp(p, "auto"); + BOOL automode = !strcmp(p, "auto"); winetest_color = automode ? isatty( fileno( stdout ) ) : atoi(p); /* enable ANSI support for Windows console */ if (winetest_color)

1 0

Stefan Dösinger : include/test.h: Don't use \e.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: c7e57bc5142dc3c03e19edc4fcf1030f64290fe1 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7e57bc5142dc3c03e19edc4fcf103… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 6 14:32:10 2022 +0300 include/test.h: Don't use \e. Msvc does not support it. --- include/wine/test.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index d1036f9dcd4..605081607f1 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -300,14 +300,14 @@ const char *winetest_elapsed(void) return wine_dbg_sprintf( "%.3f", (now - winetest_start_time) / 1000.0); } -static const char color_reset[] = "\e[0m"; -static const char color_dark_red[] = "\e[31m"; -static const char color_dark_purple[] = "\e[35m"; -static const char color_green[] = "\e[32m"; -static const char color_yellow[] = "\e[33m"; -static const char color_blue[] = "\e[34m"; -static const char color_bright_red[] = "\e[1;91m"; -static const char color_bright_purple[] = "\e[1;95m"; +static const char color_reset[] = "\x1b[0m"; +static const char color_dark_red[] = "\x1b[31m"; +static const char color_dark_purple[] = "\x1b[35m"; +static const char color_green[] = "\x1b[32m"; +static const char color_yellow[] = "\x1b[33m"; +static const char color_blue[] = "\x1b[34m"; +static const char color_bright_red[] = "\x1b[1;91m"; +static const char color_bright_purple[] = "\x1b[1;95m"; static void winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); static void winetest_printf( const char *msg, ... )

1 0

Alexandre Julliard : user32/tests: Fix some assumption about absolute window positions.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 87653d26a24d51768cdcad4356f56cf961d8d433 URL: https://gitlab.winehq.org/wine/wine/-/commit/87653d26a24d51768cdcad4356f56c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 17:47:06 2022 +0200 user32/tests: Fix some assumption about absolute window positions. --- dlls/user32/tests/win.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 4c2af09d0c6..6daef2ffa44 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -10203,14 +10203,16 @@ static void window_from_point_proc(HWND parent) child_static = CreateWindowExA(0, "static", "static", WS_CHILD | WS_VISIBLE, 0, 0, 100, 100, parent, 0, NULL, NULL); ok(child_static != 0, "CreateWindowEx failed\n"); - pt.x = pt.y = 150; + pt.x = pt.y = 50; + ClientToScreen( child_static, &pt ); win = WindowFromPoint(pt); ok(win == parent, "WindowFromPoint returned %p, expected %p\n", win, parent); child_button = CreateWindowExA(0, "button", "button", WS_CHILD | WS_VISIBLE, 100, 0, 100, 100, parent, 0, NULL, NULL); ok(child_button != 0, "CreateWindowEx failed\n"); - pt.x = 250; + pt.x = pt.y = 50; + ClientToScreen( child_button, &pt ); win = WindowFromPoint(pt); ok(win == child_button, "WindowFromPoint returned %p, expected %p\n", win, child_button); @@ -10243,7 +10245,7 @@ static void window_from_point_proc(HWND parent) CloseHandle(end_event); } -static void test_window_from_point(const char *argv0) +static void test_window_from_point(HWND main_window, const char *argv0) { HWND hwnd, child, win; POINT pt; @@ -10253,12 +10255,15 @@ static void test_window_from_point(const char *argv0) HANDLE start_event, end_event; hwnd = CreateWindowExA(0, "MainWindowClass", NULL, WS_POPUP | WS_VISIBLE, - 100, 100, 200, 100, 0, 0, NULL, NULL); + 100, 100, 200, 100, main_window, 0, NULL, NULL); ok(hwnd != 0, "CreateWindowEx failed\n"); - pt.x = pt.y = 150; + pt.x = pt.y = 50; + ClientToScreen( hwnd, &pt ); win = WindowFromPoint(pt); - pt.x = 250; + pt.x = 150; + pt.y = 50; + ClientToScreen( hwnd, &pt ); if(win == hwnd) win = WindowFromPoint(pt); if(win != hwnd) { @@ -10270,7 +10275,8 @@ static void test_window_from_point(const char *argv0) child = CreateWindowExA(0, "static", "static", WS_CHILD | WS_VISIBLE, 0, 0, 100, 100, hwnd, 0, NULL, NULL); ok(child != 0, "CreateWindowEx failed\n"); - pt.x = pt.y = 150; + pt.x = pt.y = 50; + ClientToScreen( hwnd, &pt ); win = WindowFromPoint(pt); ok(win == hwnd, "WindowFromPoint returned %p, expected %p\n", win, hwnd); DestroyWindow(child); @@ -10298,11 +10304,13 @@ static void test_window_from_point(const char *argv0) win = WindowFromPoint(pt); ok(win == child, "WindowFromPoint returned %p, expected %p\n", win, child); - simulate_click(150, 150); + simulate_click(pt.x, pt.y); flush_events(TRUE); child = GetWindow(child, GW_HWNDNEXT); - pt.x = 250; + pt.x = 150; + pt.y = 50; + ClientToScreen( hwnd, &pt ); win = WindowFromPoint(pt); ok(win == child, "WindowFromPoint returned %p, expected %p\n", win, child); @@ -13084,7 +13092,7 @@ START_TEST(win) /* Add the tests below this line */ test_child_window_from_point(); - test_window_from_point(argv[0]); + test_window_from_point(hwndMain, argv[0]); test_thick_child_size(hwndMain); test_fullscreen(); test_hwnd_message();

1 0