April 2023 - Wine-Commits - list.winehq.org

Alexandros Frantzis : winex11.drv: Extract function to check devmode equality.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 22ce57c418deb5d674cc57b6c45a1c41e1377a3a URL: https://gitlab.winehq.org/wine/wine/-/commit/22ce57c418deb5d674cc57b6c45a1c… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Apr 4 19:03:58 2023 +0300 winex11.drv: Extract function to check devmode equality. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winex11.drv/display.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index e675194b9fd..5fb027da680 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -278,6 +278,15 @@ BOOL is_detached_mode(const DEVMODEW *mode) mode->dmPelsHeight == 0; } +static BOOL is_same_devmode( const DEVMODEW *a, const DEVMODEW *b ) +{ + return a->dmDisplayOrientation == b->dmDisplayOrientation && + a->dmBitsPerPel == b->dmBitsPerPel && + a->dmPelsWidth == b->dmPelsWidth && + a->dmPelsHeight == b->dmPelsHeight && + a->dmDisplayFrequency == b->dmDisplayFrequency; +} + /* Get the full display mode with all the necessary fields set. * Return NULL on failure. Caller should call free_full_mode() to free the returned mode. */ static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode) @@ -294,19 +303,7 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode) for (mode_idx = 0; mode_idx < mode_count; ++mode_idx) { found_mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*modes) + modes[0].dmDriverExtra) * mode_idx); - - if (found_mode->dmBitsPerPel != dev_mode->dmBitsPerPel) - continue; - if (found_mode->dmPelsWidth != dev_mode->dmPelsWidth) - continue; - if (found_mode->dmPelsHeight != dev_mode->dmPelsHeight) - continue; - if (found_mode->dmDisplayFrequency != dev_mode->dmDisplayFrequency) - continue; - if (found_mode->dmDisplayOrientation != dev_mode->dmDisplayOrientation) - continue; - - break; + if (is_same_devmode( found_mode, dev_mode )) break; } if (!found_mode || mode_idx == mode_count)

1 0

Alexandros Frantzis : win32u: Support setting the current mode using gdi_device_manager.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: df8b7e0473d23a9ce8460b0eaa58e7db399159a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/df8b7e0473d23a9ce8460b0eaa58e7… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Apr 3 11:46:48 2023 +0300 win32u: Support setting the current mode using gdi_device_manager. Update the gdi_device_manager API to enable drivers to set the current mode (along with the registry mode if not already set) in UpdateDisplayDevices. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/win32u/sysparams.c | 32 ++++++++++++++++++++++++++++---- dlls/wineandroid.drv/init.c | 2 +- dlls/winemac.drv/display.c | 2 +- dlls/winewayland.drv/display.c | 2 +- dlls/winex11.drv/display.c | 2 +- include/wine/gdi_driver.h | 2 +- 6 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 60b12321953..32b20682d24 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1482,9 +1482,10 @@ static void add_monitor( const struct gdi_monitor *monitor, void *param ) if (hkey) NtClose( hkey ); } -static void add_mode( const DEVMODEW *mode, void *param ) +static void add_mode( const DEVMODEW *mode, BOOL current, void *param ) { struct device_manager_ctx *ctx = param; + DEVMODEW nopos_mode; if (!ctx->adapter_count) { @@ -1496,10 +1497,21 @@ static void add_mode( const DEVMODEW *mode, void *param ) add_adapter( &default_adapter, ctx ); } - if (write_adapter_mode( ctx->adapter_key, ctx->mode_count, mode )) + nopos_mode = *mode; + nopos_mode.dmPosition.x = 0; + nopos_mode.dmPosition.y = 0; + nopos_mode.dmFields &= ~DM_POSITION; + + if (write_adapter_mode( ctx->adapter_key, ctx->mode_count, &nopos_mode )) { ctx->mode_count++; set_reg_value( ctx->adapter_key, mode_countW, REG_DWORD, &ctx->mode_count, sizeof(ctx->mode_count) ); + if (current) + { + if (!read_adapter_mode( ctx->adapter_key, ENUM_REGISTRY_SETTINGS, &nopos_mode )) + write_adapter_mode( ctx->adapter_key, ENUM_REGISTRY_SETTINGS, mode ); + write_adapter_mode( ctx->adapter_key, ENUM_CURRENT_SETTINGS, mode ); + } } } @@ -1626,6 +1638,15 @@ static BOOL update_display_cache_from_registry(void) return ret; } +static BOOL is_same_devmode( const DEVMODEW *a, const DEVMODEW *b ) +{ + return a->dmDisplayOrientation == b->dmDisplayOrientation && + a->dmBitsPerPel == b->dmBitsPerPel && + a->dmPelsWidth == b->dmPelsWidth && + a->dmPelsHeight == b->dmPelsHeight && + a->dmDisplayFrequency == b->dmDisplayFrequency; +} + static BOOL update_display_cache( BOOL force ) { HWINSTA winstation = NtUserGetProcessWindowStation(); @@ -1682,7 +1703,6 @@ static BOOL update_display_cache( BOOL force ) { mode = modes[2]; mode.dmFields |= DM_POSITION; - write_adapter_mode( ctx.adapter_key, ENUM_CURRENT_SETTINGS, &mode ); } monitor.rc_monitor.right = mode.dmPelsWidth; monitor.rc_monitor.bottom = mode.dmPelsHeight; @@ -1690,7 +1710,11 @@ static BOOL update_display_cache( BOOL force ) monitor.rc_work.bottom = mode.dmPelsHeight; add_monitor( &monitor, &ctx ); - for (i = 0; i < ARRAY_SIZE(modes); ++i) add_mode( modes + i, &ctx ); + for (i = 0; i < ARRAY_SIZE(modes); ++i) + { + if (is_same_devmode( modes + i, &mode )) add_mode( &mode, TRUE, &ctx ); + else add_mode( modes + i, FALSE, &ctx ); + } } release_display_manager_ctx( &ctx ); diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 074aa6c6257..0ba8a0b3ebb 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -295,7 +295,7 @@ BOOL ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manag device_manager->add_gpu( &gpu, param ); device_manager->add_adapter( &adapter, param ); device_manager->add_monitor( &gdi_monitor, param ); - device_manager->add_mode( &mode, param ); + device_manager->add_mode( &mode, FALSE, param ); force_display_devices_refresh = FALSE; } diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 6a798994e47..438e2bb5390 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1205,7 +1205,7 @@ BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage (int)mode->dmBitsPerPel, (int)mode->dmDisplayFrequency, mode->dmDisplayFixedOutput == DMDFO_STRETCH ? "" : "un", mode->dmDisplayFlags & DM_INTERLACED ? "" : "non-"); - device_manager->add_mode( mode, param ); + device_manager->add_mode( mode, FALSE, param ); } free(modes); diff --git a/dlls/winewayland.drv/display.c b/dlls/winewayland.drv/display.c index e72b26a9da0..1d86b2fd4e3 100644 --- a/dlls/winewayland.drv/display.c +++ b/dlls/winewayland.drv/display.c @@ -126,7 +126,7 @@ static void wayland_add_device_modes(const struct gdi_device_manager *device_man { DEVMODEW mode; populate_devmode(output_mode, &mode); - device_manager->add_mode(&mode, param); + device_manager->add_mode(&mode, FALSE, param); } } diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 78de6a6f88b..e675194b9fd 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -599,7 +599,7 @@ BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage for (mode = modes; mode_count; mode_count--) { TRACE( "mode: %p\n", mode ); - device_manager->add_mode( mode, param ); + device_manager->add_mode( mode, FALSE, param ); mode = (DEVMODEW *)((char *)mode + sizeof(*modes) + modes[0].dmDriverExtra); } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index c492252d4ab..0eb24fd4424 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -266,7 +266,7 @@ struct gdi_device_manager void (*add_gpu)( const struct gdi_gpu *gpu, void *param ); void (*add_adapter)( const struct gdi_adapter *adapter, void *param ); void (*add_monitor)( const struct gdi_monitor *monitor, void *param ); - void (*add_mode)( const DEVMODEW *mode, void *param ); + void (*add_mode)( const DEVMODEW *mode, BOOL current, void *param ); }; #define WINE_DM_UNSUPPORTED 0x80000000

1 0

Henri Verbeet : tests/shader_runner: Return from run_shader_tests_d3d12() if we're unable to create a test context.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: vkd3d Branch: master Commit: a0a3fb0e5f2f4b0f16357a62150201d20a5d994d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a0a3fb0e5f2f4b0f16357a6215020… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 4 14:49:04 2023 +0200 tests/shader_runner: Return from run_shader_tests_d3d12() if we're unable to create a test context. A test environment may legitimately be unable to support running d3d12 tests. --- tests/shader_runner_d3d12.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index d4a75d94..87e5d130 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -524,7 +524,8 @@ void run_shader_tests_d3d12(void) enable_d3d12_debug_layer(); init_adapter_info(); - init_test_context(&runner.test_context, &desc); + if (!init_test_context(&runner.test_context, &desc)) + return; device = runner.test_context.device; runner.compute_queue = create_command_queue(device,

1 0

Henri Verbeet : vkd3d-shader: Align the start offset instead of the size in bytecode_put_bytes().
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: vkd3d Branch: master Commit: d6d9aab31c290d3dc7a67110ba2b0ac916377929 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d6d9aab31c290d3dc7a67110ba2b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 4 18:27:59 2023 +0200 vkd3d-shader: Align the start offset instead of the size in bytecode_put_bytes(). The practical effect this has is that we avoid potential trailing padding at the end of DXBC blobs. Unfortunately this also means we need to be more careful about using bytecode_get_size() to find the offset where subsequent data would get written, although in many cases this follows a put_u32() call. --- libs/vkd3d-shader/dxbc.c | 14 +++++++------- libs/vkd3d-shader/hlsl_sm1.c | 6 +++--- libs/vkd3d-shader/hlsl_sm4.c | 8 ++++---- libs/vkd3d-shader/vkd3d_shader_main.c | 9 ++++----- libs/vkd3d-shader/vkd3d_shader_private.h | 5 +++++ 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index d99ea2e3..6cc6b5d6 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -57,7 +57,7 @@ int vkd3d_shader_serialize_dxbc(size_t section_count, const struct vkd3d_shader_ put_u32(&buffer, TAG_DXBC); - checksum_position = bytecode_get_size(&buffer); + checksum_position = bytecode_get_next_offset(&buffer); for (i = 0; i < 4; ++i) put_u32(&buffer, 0); @@ -65,13 +65,13 @@ int vkd3d_shader_serialize_dxbc(size_t section_count, const struct vkd3d_shader_ size_position = put_u32(&buffer, 0); put_u32(&buffer, section_count); - offsets_position = bytecode_get_size(&buffer); + offsets_position = bytecode_get_next_offset(&buffer); for (i = 0; i < section_count; ++i) put_u32(&buffer, 0); for (i = 0; i < section_count; ++i) { - set_u32(&buffer, offsets_position + i * sizeof(uint32_t), bytecode_get_size(&buffer)); + set_u32(&buffer, offsets_position + i * sizeof(uint32_t), bytecode_get_next_offset(&buffer)); put_u32(&buffer, sections[i].tag); put_u32(&buffer, sections[i].data.size); bytecode_put_bytes(&buffer, sections[i].data.code, sections[i].data.size); @@ -2754,7 +2754,7 @@ struct root_signature_writer_context static size_t get_chunk_offset(struct root_signature_writer_context *context) { - return bytecode_get_size(&context->buffer) - context->chunk_position; + return bytecode_get_next_offset(&context->buffer) - context->chunk_position; } static void shader_write_root_signature_header(struct root_signature_writer_context *context) @@ -2770,10 +2770,10 @@ static void shader_write_root_signature_header(struct root_signature_writer_cont put_u32(buffer, 1); context->total_size_position = put_u32(buffer, 0xffffffff); put_u32(buffer, 1); /* chunk count */ - put_u32(buffer, bytecode_get_size(buffer) + sizeof(uint32_t)); /* chunk offset */ + put_u32(buffer, bytecode_get_next_offset(buffer) + sizeof(uint32_t)); /* chunk offset */ put_u32(buffer, TAG_RTS0); put_u32(buffer, 0xffffffff); - context->chunk_position = bytecode_get_size(buffer); + context->chunk_position = bytecode_get_next_offset(buffer); } static void shader_write_descriptor_ranges(struct vkd3d_bytecode_buffer *buffer, @@ -2862,7 +2862,7 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co size_t parameters_position; unsigned int i; - parameters_position = bytecode_get_size(buffer); + parameters_position = bytecode_get_next_offset(buffer); for (i = 0; i < parameter_count; ++i) { put_u32(buffer, versioned_root_signature_get_parameter_type(desc, i)); diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index bbb3b164..be32c8db 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -261,7 +261,7 @@ static void write_sm1_type(struct vkd3d_bytecode_buffer *buffer, struct hlsl_typ write_sm1_type(buffer, field->type, ctab_start); } - fields_offset = bytecode_get_size(buffer) - ctab_start; + fields_offset = bytecode_get_next_offset(buffer) - ctab_start; for (i = 0; i < field_count; ++i) { @@ -351,7 +351,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe put_u32(buffer, 0); /* FIXME: flags */ put_u32(buffer, 0); /* FIXME: target string */ - vars_start = bytecode_get_size(buffer); + vars_start = bytecode_get_next_offset(buffer); LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { @@ -402,7 +402,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe offset = put_string(buffer, vkd3d_shader_get_version(NULL, NULL)); set_u32(buffer, creator_offset, offset - ctab_start); - ctab_end = bytecode_get_size(buffer); + ctab_end = bytecode_get_next_offset(buffer); set_u32(buffer, size_offset, vkd3d_make_u32(D3DSIO_COMMENT, (ctab_end - ctab_offset) / sizeof(uint32_t))); } diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 6dd76d67..8551cfd8 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -387,7 +387,7 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b write_sm4_type(ctx, buffer, field->type); } - fields_offset = bytecode_get_size(buffer); + fields_offset = bytecode_get_next_offset(buffer); for (i = 0; i < field_count; ++i) { @@ -583,7 +583,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) /* Bound resources. */ - resources_offset = bytecode_get_size(&buffer); + resources_offset = bytecode_get_next_offset(&buffer); set_u32(&buffer, resource_position, resources_offset); for (i = 0; i < extern_resources_count; ++i) @@ -656,7 +656,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) /* Buffers. */ - cbuffers_offset = bytecode_get_size(&buffer); + cbuffers_offset = bytecode_get_next_offset(&buffer); set_u32(&buffer, cbuffer_position, cbuffers_offset); LIST_FOR_EACH_ENTRY(cbuffer, &ctx->buffers, struct hlsl_buffer, entry) { @@ -692,7 +692,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) i = 0; LIST_FOR_EACH_ENTRY(cbuffer, &ctx->buffers, struct hlsl_buffer, entry) { - size_t vars_start = bytecode_get_size(&buffer); + size_t vars_start = bytecode_get_next_offset(&buffer); if (!cbuffer->reg.allocated) continue; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 1b41fa34..732d1cdc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -342,20 +342,19 @@ void vkd3d_shader_error(struct vkd3d_shader_message_context *context, const stru size_t bytecode_put_bytes(struct vkd3d_bytecode_buffer *buffer, const void *bytes, size_t size) { - size_t aligned_size = align(size, 4); - size_t offset = buffer->size; + size_t offset = bytecode_get_next_offset(buffer); if (buffer->status) return offset; - if (!vkd3d_array_reserve((void **)&buffer->data, &buffer->capacity, offset + aligned_size, 1)) + if (!vkd3d_array_reserve((void **)&buffer->data, &buffer->capacity, offset + size, 1)) { buffer->status = VKD3D_ERROR_OUT_OF_MEMORY; return offset; } + memset(buffer->data + buffer->size, 0xab, offset - buffer->size); memcpy(buffer->data + offset, bytes, size); - memset(buffer->data + offset + size, 0xab, aligned_size - size); - buffer->size = offset + aligned_size; + buffer->size = offset + size; return offset; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index d1a4aa1d..e2891de2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1094,6 +1094,11 @@ static inline size_t bytecode_get_size(struct vkd3d_bytecode_buffer *buffer) return buffer->size; } +static inline size_t bytecode_get_next_offset(struct vkd3d_bytecode_buffer *buffer) +{ + return align(buffer->size, 4); +} + uint32_t vkd3d_parse_integer(const char *s); struct vkd3d_shader_message_context

1 0

Zebediah Figura : include: Make test context information nestable.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: vkd3d Branch: master Commit: dfa4bfdd038babe88f6032d473b2b23876ccb6b0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dfa4bfdd038babe88f6032d473b2b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 23 16:20:40 2023 -0600 include: Make test context information nestable. Based on Wine. --- include/private/vkd3d_test.h | 32 ++-- tests/d3d12.c | 344 +++++++++++++++++++++++++------------------ tests/hlsl_d3d12.c | 4 +- tests/shader_runner.c | 9 +- tests/vkd3d_shader_api.c | 4 +- 5 files changed, 232 insertions(+), 161 deletions(-)

1 0

Henri Verbeet : vkd3d-utils: Export D3D12CreateDevice() once again.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: vkd3d Branch: master Commit: 4e32adb8c1173a9a380ec3fd54d3c2b497a63f15 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4e32adb8c1173a9a380ec3fd54d3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 4 14:44:42 2023 +0200 vkd3d-utils: Export D3D12CreateDevice() once again. Commit d27fee64ab51c60078215f461a797edd32bc8871 inadvertently stopped exporting D3D12CreateDevice(). --- libs/vkd3d-utils/vkd3d_utils_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 3911c11b..aa1ac5fe 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -85,7 +85,7 @@ HRESULT WINAPI D3D12CreateDeviceVKD3D(IUnknown *adapter, D3D_FEATURE_LEVEL minim return vkd3d_create_device(&device_create_info, iid, device); } -HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, +VKD3D_UTILS_API HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { return D3D12CreateDeviceVKD3D(adapter, minimum_feature_level, iid, device, VKD3D_API_VERSION_1_0);

1 0

Zebediah Figura : tests: Factor out vkd3d_test_printf().
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: vkd3d Branch: master Commit: 1bf5050d3dcc5726d309dde06435e4637dc468a2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1bf5050d3dcc5726d309dde06435e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 23 15:42:18 2023 -0600 tests: Factor out vkd3d_test_printf(). --- include/private/vkd3d_test.h | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index 0cc7fe4f..76d4a329 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -134,6 +134,11 @@ broken(bool condition) return condition && vkd3d_test_platform_is_windows(); } +static void vkd3d_test_printf(unsigned int line, const char *msg) +{ + printf("%s:%u%s: %s", vkd3d_test_name, line, vkd3d_test_state.context, msg); +} + static void vkd3d_test_check_assert_that(unsigned int line, bool result, const char *fmt, va_list args) { @@ -141,12 +146,12 @@ vkd3d_test_check_assert_that(unsigned int line, bool result, const char *fmt, va { InterlockedIncrement(&vkd3d_test_state.success_count); if (vkd3d_test_state.debug_level > 1) - printf("%s:%d%s: Test succeeded.\n", vkd3d_test_name, line, vkd3d_test_state.context); + vkd3d_test_printf(line, "Test succeeded.\n"); } else { InterlockedIncrement(&vkd3d_test_state.failure_count); - printf("%s:%d%s: Test failed: ", vkd3d_test_name, line, vkd3d_test_state.context); + vkd3d_test_printf(line, "Test failed: "); vprintf(fmt, args); } } @@ -173,9 +178,9 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg if (is_todo) result = !result; if (result) - printf("%s:%d%s: Fixed bug: ", vkd3d_test_name, line, vkd3d_test_state.context); + vkd3d_test_printf(line, "Fixed bug: "); else - printf("%s:%d%s: Bug: ", vkd3d_test_name, line, vkd3d_test_state.context); + vkd3d_test_printf(line, "Bug: "); vprintf(fmt, args); } else if (is_todo) @@ -183,12 +188,12 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg if (result) { InterlockedIncrement(&vkd3d_test_state.todo_success_count); - printf("%s:%d%s: Todo succeeded: ", vkd3d_test_name, line, vkd3d_test_state.context); + vkd3d_test_printf(line, "Todo succeeded: "); } else { InterlockedIncrement(&vkd3d_test_state.todo_count); - printf("%s:%d%s: Todo: ", vkd3d_test_name, line, vkd3d_test_state.context); + vkd3d_test_printf(line, "Todo: "); } vprintf(fmt, args); } @@ -213,7 +218,7 @@ vkd3d_test_skip(unsigned int line, const char *fmt, ...) { va_list args; va_start(args, fmt); - printf("%s:%d%s: Test skipped: ", vkd3d_test_name, line, vkd3d_test_state.context); + vkd3d_test_printf(line, "Test skipped: "); vprintf(fmt, args); va_end(args); InterlockedIncrement(&vkd3d_test_state.skip_count); @@ -224,7 +229,7 @@ vkd3d_test_trace(unsigned int line, const char *fmt, ...) { va_list args; va_start(args, fmt); - printf("%s:%d%s: ", vkd3d_test_name, line, vkd3d_test_state.context); + vkd3d_test_printf(line, ""); vprintf(fmt, args); va_end(args); }

1 0

Eric Pouech : kernel32/debugger: Fix a failing test (on Wine).
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: b7225671fdf1a28d02c3c7887bae4417fc0c7ac6 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7225671fdf1a28d02c3c7887bae44… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Apr 4 18:59:20 2023 +0200 kernel32/debugger: Fix a failing test (on Wine). The failing test was garbled by remaining debug events from previous test. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 64662709e2a..b0c69052936 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1189,7 +1189,6 @@ static void test_debug_loop_wow64(void) default: ok(0, "Unexpected event: %lu\n", ev.dwDebugEventCode); /* fall through */ - case EXIT_PROCESS_DEBUG_EVENT: case EXIT_THREAD_DEBUG_EVENT: ret = ContinueDebugEvent( ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE ); ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError()); @@ -1205,7 +1204,23 @@ static void test_debug_loop_wow64(void) ok(ret, "GetExitCodeProcess failed: %lu\n", GetLastError()); ok(ec != STILL_ACTIVE, "GetExitCodeProcess still active\n"); } + for (;;) + { + DEBUG_EVENT ev; + ret = WaitForDebugEvent( &ev, 2000 ); + if (!ret || ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT) break; + switch (ev.dwDebugEventCode) + { + default: + ok(0, "Unexpected event: %lu\n", ev.dwDebugEventCode); + /* fall through */ + case EXIT_THREAD_DEBUG_EVENT: + ret = ContinueDebugEvent( ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE ); + ok(ret, "ContinueDebugEvent failed, last error %#lx.\n", GetLastError()); + break; + } + } ret = CloseHandle( pi.hThread ); ok(ret, "CloseHandle failed, last error %#lx.\n", GetLastError()); ret = CloseHandle( pi.hProcess );

1 0

Zhiyi Zhang : winex11.drv: Fix a typo.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: 3cbba43ddb4b7b6403c9b67482303cd18316d365 URL: https://gitlab.winehq.org/wine/wine/-/commit/3cbba43ddb4b7b6403c9b67482303c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 4 18:06:43 2023 +0800 winex11.drv: Fix a typo. --- dlls/winex11.drv/xinerama.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 2691f9e9c5e..a508141d8c4 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -186,7 +186,7 @@ BOOL xinerama_get_fullscreen_monitors( const RECT *rect, long *indices ) done: pthread_mutex_unlock( &xinerama_mutex ); if (ret) - TRACE( "fullsceen monitors: %ld,%ld,%ld,%ld.\n", indices[0], indices[1], indices[2], indices[3] ); + TRACE( "fullscreen monitors: %ld,%ld,%ld,%ld.\n", indices[0], indices[1], indices[2], indices[3] ); return ret; }

1 0

Rémi Bernon : ws2_32/tests: Adjust test results without host IPv6 support.
by Alexandre Julliard April 4, 2023

April 4, 2023

Module: wine Branch: master Commit: e3453ed81472de873ea989e3640fcbd79bbd5c68 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3453ed81472de873ea989e3640fcb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 4 09:16:03 2023 +0200 ws2_32/tests: Adjust test results without host IPv6 support. --- dlls/ws2_32/tests/afd.c | 7 +++++++ dlls/ws2_32/tests/protocol.c | 10 ++++++++-- dlls/ws2_32/tests/sock.c | 19 ++++++++++++++++--- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index b07fb40fe3f..d0191ba8dbf 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -2281,6 +2281,12 @@ static void test_bind(void) todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); ret = WaitForSingleObject(event, 0); ok(!ret, "got %#x\n", ret); + if (io.Status == STATUS_INVALID_ADDRESS_COMPONENT) + { + skip("IPv6 not supported\n"); + closesocket(s); + goto cleanup; + } ok(!io.Status, "got %#lx\n", io.Status); ok(io.Information == sizeof(addr6), "got %#Ix\n", io.Information); ok(addr6.sin6_family == AF_INET6, "got family %u\n", addr6.sin6_family); @@ -2315,6 +2321,7 @@ static void test_bind(void) closesocket(s2); closesocket(s); +cleanup: CloseHandle(event); free(params); } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 34c0dbb0858..b0259cfe47d 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2176,6 +2176,7 @@ static void test_getaddrinfo(void) SOCKADDR_IN *sockaddr; CHAR name[256], *ip; DWORD size = sizeof(name); + BOOL has_ipv6_getaddrinfo = TRUE; BOOL has_ipv6_addr; memset(&hint, 0, sizeof(ADDRINFOA)); @@ -2376,8 +2377,10 @@ static void test_getaddrinfo(void) } else { + todo_wine ok(ret == WSAHOST_NOT_FOUND, "getaddrinfo failed with %d\n", ret); - win_skip("getaddrinfo does not support IPV6\n"); + skip("getaddrinfo does not support IPV6\n"); + has_ipv6_getaddrinfo = FALSE; } hint.ai_flags = 0; @@ -2468,7 +2471,10 @@ static void test_getaddrinfo(void) ret = getaddrinfo("www.kernel.org", NULL, NULL, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); if (!has_ipv6_addr) - todo_wine ok(!ipv6_found(result), "IPv6 address is returned.\n"); + { + todo_wine_if(has_ipv6_getaddrinfo) + ok(!ipv6_found(result), "IPv6 address is returned.\n"); + } freeaddrinfo(result); for (i = 0; i < ARRAY_SIZE(hinttests); i++) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 17298ca4136..1125d4519d3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2187,7 +2187,14 @@ static void test_reuseaddr(void) ok(s1 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); rc = bind(s1, tests[i].addr_loopback, tests[i].addrlen); - ok(!rc, "got error %d.\n", WSAGetLastError()); + ok(!rc || (tests[i].domain == AF_INET6 && WSAGetLastError() == WSAEADDRNOTAVAIL), "got error %d.\n", WSAGetLastError()); + if (tests[i].domain == AF_INET6 && WSAGetLastError() == WSAEADDRNOTAVAIL) + { + skip("IPv6 not supported, skipping test\n"); + closesocket(s1); + winetest_pop_context(); + continue; + } s2 = socket(tests[i].domain, SOCK_STREAM, 0); ok(s2 != INVALID_SOCKET, "got error %d.\n", WSAGetLastError()); @@ -2392,7 +2399,7 @@ static void test_reuseaddr(void) } } rc = bind(s[0], tests_exclusive[i].s[0].addr, tests_exclusive[i].s[0].addrlen); - ok(!rc, "got error %d.\n", WSAGetLastError()); + ok(!rc || (tests_exclusive[i].s[0].domain == AF_INET6 && WSAGetLastError() == WSAEADDRNOTAVAIL), "got error %d.\n", WSAGetLastError()); rc = bind(s[1], tests_exclusive[i].s[1].addr, tests_exclusive[i].s[1].addrlen); @@ -2746,7 +2753,12 @@ static void test_ipv6_cmsg(void) ok(server != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); rc = bind(server, (SOCKADDR *)&localhost, sizeof(localhost)); - ok(rc != SOCKET_ERROR, "bind failed, error %u\n", WSAGetLastError()); + ok(rc != SOCKET_ERROR || WSAGetLastError() == WSAEADDRNOTAVAIL, "bind failed, error %u\n", WSAGetLastError()); + if (WSAGetLastError() == WSAEADDRNOTAVAIL) + { + skip("IPv6 not supported, skipping test\n"); + goto cleanup; + } rc = connect(client, (SOCKADDR *)&localhost, sizeof(localhost)); ok(rc != SOCKET_ERROR, "connect failed, error %u\n", WSAGetLastError()); @@ -2820,6 +2832,7 @@ static void test_ipv6_cmsg(void) rc = setsockopt(server, IPPROTO_IPV6, IPV6_RECVTCLASS, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_RECVTCLASS, error %u\n", WSAGetLastError()); +cleanup: closesocket(server); closesocket(client); }

1 0