November 2023 - Wine-commits

Nikolay Sivov : oleaut32: Fully initialize VarMod() return value for Empty % x case.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: bda6decd473f0dd5a32ed6fe4a6cc55ab7a14bad URL: https://gitlab.winehq.org/wine/wine/-/commit/bda6decd473f0dd5a32ed6fe4a6cc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 26 23:29:32 2023 +0100 oleaut32: Fully initialize VarMod() return value for Empty % x case. --- dlls/oleaut32/tests/vartest.c | 3 ++- dlls/oleaut32/variant.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index cf93e4cd5fc..c2b5b4113d7 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3513,7 +3513,8 @@ static void test_Mod( int line, VARIANT *left, VARIANT *right, VARIANT *expected VARIANT result; HRESULT hres; - memset( &result, 0, sizeof(result) ); + V_VT(&result) = 15; + V_I4(&result) = 0x12345; hres = pVarMod( left, right, &result ); ok_(__FILE__,line)( hres == expres, "wrong result %lx/%lx\n", hres, expres ); if (hres == S_OK) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b3c96b18c2b..9e1fefe9705 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5499,6 +5499,7 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) if(V_VT(left) == VT_EMPTY) { V_VT(result) = VT_I4; + V_I4(result) = 0; rc = S_OK; goto end; }

1 0

Zebediah Figura : ntdll: Check for some more IP socket options at compile time.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: 77a21c6eef894a0c83d4ae2f779778e80522b1e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/77a21c6eef894a0c83d4ae2f779778… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 29 19:45:17 2022 -0500 ntdll: Check for some more IP socket options at compile time. NetBSD doesn't provide these. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51843 --- dlls/ntdll/unix/socket.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index c1eba723307..4e6781df607 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1998,11 +1998,15 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP: return do_setsockopt( handle, io, IPPROTO_IP, IP_ADD_MEMBERSHIP, in_buffer, in_size ); +#ifdef IP_ADD_SOURCE_MEMBERSHIP case IOCTL_AFD_WINE_SET_IP_ADD_SOURCE_MEMBERSHIP: return do_setsockopt( handle, io, IPPROTO_IP, IP_ADD_SOURCE_MEMBERSHIP, in_buffer, in_size ); +#endif +#ifdef IP_BLOCK_SOURCE case IOCTL_AFD_WINE_SET_IP_BLOCK_SOURCE: return do_setsockopt( handle, io, IPPROTO_IP, IP_BLOCK_SOURCE, in_buffer, in_size ); +#endif case IOCTL_AFD_WINE_GET_IP_DONTFRAGMENT: { @@ -2066,8 +2070,10 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IP_DROP_MEMBERSHIP: return do_setsockopt( handle, io, IPPROTO_IP, IP_DROP_MEMBERSHIP, in_buffer, in_size ); +#ifdef IP_ADD_SOURCE_MEMBERSHIP case IOCTL_AFD_WINE_SET_IP_DROP_SOURCE_MEMBERSHIP: return do_setsockopt( handle, io, IPPROTO_IP, IP_DROP_SOURCE_MEMBERSHIP, in_buffer, in_size ); +#endif #ifdef IP_HDRINCL case IOCTL_AFD_WINE_GET_IP_HDRINCL: @@ -2201,8 +2207,10 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IP_TTL: return do_setsockopt( handle, io, IPPROTO_IP, IP_TTL, in_buffer, in_size ); +#ifdef IP_UNBLOCK_SOURCE case IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE: return do_setsockopt( handle, io, IPPROTO_IP, IP_UNBLOCK_SOURCE, in_buffer, in_size ); +#endif #ifdef IP_UNICAST_IF case IOCTL_AFD_WINE_GET_IP_UNICAST_IF:

1 0

Zebediah Figura : ws2_32: Check for AI_ALL at compile time.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: wine Branch: master Commit: 09f7b203bbb27eaad4e6a8318d03bb3a61e238c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/09f7b203bbb27eaad4e6a8318d03bb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 29 19:58:04 2022 -0500 ws2_32: Check for AI_ALL at compile time. NetBSD does not provide it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51843 --- dlls/ws2_32/unixlib.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 88845e43ad2..e0e1263e025 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -122,7 +122,9 @@ static const int addrinfo_flag_map[][2] = #ifdef AI_V4MAPPED MAP( AI_V4MAPPED ), #endif +#ifdef AI_ALL MAP( AI_ALL ), +#endif MAP( AI_ADDRCONFIG ), };

1 0

Alistair Leslie-Hughes : include: D3D12_RT_FORMAT_ARRAY remove typedef to make header compatible with windows.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: vkd3d Branch: master Commit: 5c134d44d6cd9145b810c216cb6fca7af16b0af4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5c134d44d6cd9145b810c216cb6fc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 24 19:06:32 2023 +1100 include: D3D12_RT_FORMAT_ARRAY remove typedef to make header compatible with windows. windows d3d12.idl doesn't have this as a typedef. --- include/vkd3d_d3d12.idl | 4 ++-- libs/vkd3d/state.c | 2 +- libs/vkd3d/vkd3d_private.h | 2 +- tests/d3d12.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index cdd3acec..9b1b494c 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2129,11 +2129,11 @@ typedef struct D3D12_PIPELINE_STATE_STREAM_DESC void *pPipelineStateSubobjectStream; } D3D12_PIPELINE_STATE_STREAM_DESC; -typedef struct D3D12_RT_FORMAT_ARRAY +struct D3D12_RT_FORMAT_ARRAY { DXGI_FORMAT RTFormats[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; UINT NumRenderTargets; -} D3D12_RT_FORMAT_ARRAY; +}; typedef enum D3D12_PIPELINE_STATE_SUBOBJECT_TYPE { diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index de0e04ea..6665a1fd 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1839,7 +1839,7 @@ static HRESULT pipeline_state_desc_from_d3d12_stream_desc(struct d3d12_pipeline_ [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_INPUT_LAYOUT] = DCL_SUBOBJECT_INFO(D3D12_INPUT_LAYOUT_DESC, input_layout), [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_IB_STRIP_CUT_VALUE] = DCL_SUBOBJECT_INFO(D3D12_INDEX_BUFFER_STRIP_CUT_VALUE, strip_cut_value), [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PRIMITIVE_TOPOLOGY] = DCL_SUBOBJECT_INFO(D3D12_PRIMITIVE_TOPOLOGY_TYPE, primitive_topology_type), - [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS] = DCL_SUBOBJECT_INFO(D3D12_RT_FORMAT_ARRAY, rtv_formats), + [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS] = DCL_SUBOBJECT_INFO(struct D3D12_RT_FORMAT_ARRAY, rtv_formats), [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL_FORMAT] = DCL_SUBOBJECT_INFO(DXGI_FORMAT, dsv_format), [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_DESC] = DCL_SUBOBJECT_INFO(DXGI_SAMPLE_DESC, sample_desc), [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK] = DCL_SUBOBJECT_INFO(UINT, node_mask), diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 04ba3498..e0eb9f3d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1334,7 +1334,7 @@ struct d3d12_pipeline_state_desc D3D12_INPUT_LAYOUT_DESC input_layout; D3D12_INDEX_BUFFER_STRIP_CUT_VALUE strip_cut_value; D3D12_PRIMITIVE_TOPOLOGY_TYPE primitive_topology_type; - D3D12_RT_FORMAT_ARRAY rtv_formats; + struct D3D12_RT_FORMAT_ARRAY rtv_formats; DXGI_FORMAT dsv_format; DXGI_SAMPLE_DESC sample_desc; D3D12_VIEW_INSTANCING_DESC view_instancing_desc; diff --git a/tests/d3d12.c b/tests/d3d12.c index 8727fd9e..91e91608 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3265,7 +3265,7 @@ static void test_create_pipeline_state(void) struct d3d12_render_target_formats_subobject { DECLSPEC_ALIGN(sizeof(void *)) D3D12_PIPELINE_STATE_SUBOBJECT_TYPE type; - D3D12_RT_FORMAT_ARRAY render_target_formats; + struct D3D12_RT_FORMAT_ARRAY render_target_formats; }; struct d3d12_depth_stencil_format_subobject

1 0

Jacek Caban : vkd3d: Use VkPipelineStageFlags type for VkSubmitInfo.pWaitDstStageMask flags.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: vkd3d Branch: master Commit: 72bb5e8b020edbfd962aad000c2e21d037efc12d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/72bb5e8b020edbfd962aad000c2e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 14:00:29 2023 +0100 vkd3d: Use VkPipelineStageFlags type for VkSubmitInfo.pWaitDstStageMask flags. --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 77d0f275..15c8317b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6852,7 +6852,7 @@ fail: static HRESULT d3d12_command_queue_wait_binary_semaphore_locked(struct d3d12_command_queue *command_queue, struct d3d12_fence *fence, uint64_t value) { - static const VkPipelineStageFlagBits wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; + static const VkPipelineStageFlags wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; const struct vkd3d_vk_device_procs *vk_procs; struct vkd3d_signaled_semaphore *semaphore; uint64_t completed_value = 0; @@ -6948,7 +6948,7 @@ fail: static HRESULT d3d12_command_queue_wait_locked(struct d3d12_command_queue *command_queue, struct d3d12_fence *fence, uint64_t value) { - static const VkPipelineStageFlagBits wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; + static const VkPipelineStageFlags wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; VkTimelineSemaphoreSubmitInfoKHR timeline_submit_info; const struct vkd3d_vk_device_procs *vk_procs; struct vkd3d_queue *queue;

1 0

Jacek Caban : vkd3d-shader: Use unsigned int type for tags passed to sm6_metadata_get_uint_value.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: vkd3d Branch: master Commit: 1edbc057450d4b9bbb32b8e254fcb19beebbb7b3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1edbc057450d4b9bbb32b8e254fcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 14:01:35 2023 +0100 vkd3d-shader: Use unsigned int type for tags passed to sm6_metadata_get_uint_value. --- libs/vkd3d-shader/dxil.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 1709212f..c03948ae 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -4895,8 +4895,7 @@ static enum vkd3d_result sm6_parser_resources_init(struct sm6_parser *sm6) static void signature_element_read_additional_element_values(struct signature_element *e, const struct sm6_metadata_node *node, struct sm6_parser *sm6) { - unsigned int i, operand_count, value; - enum dxil_element_additional_tag tag; + unsigned int i, operand_count, value, tag; if (node->operand_count < 11 || !node->operands[10]) return; @@ -5254,8 +5253,7 @@ static enum vkd3d_result sm6_parser_entry_point_init(struct sm6_parser *sm6) { const struct sm6_metadata_value *m = sm6_parser_find_named_metadata(sm6, "dx.entryPoints"); const struct sm6_metadata_node *node, *entry_node = m ? m->u.node : NULL; - enum dxil_shader_properties_tag tag; - unsigned int i, operand_count; + unsigned int i, operand_count, tag; const struct sm6_value *value; enum vkd3d_result ret;

1 0

Jacek Caban : vkd3d-shader: Avoid implicit enum pointer casts in allocate_semantic_register.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: vkd3d Branch: master Commit: 85f21f197c9cbd9df8fa3d292b0e3de388fdbf65 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/85f21f197c9cbd9df8fa3d292b0e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 24 14:03:25 2023 +0100 vkd3d-shader: Avoid implicit enum pointer casts in allocate_semantic_register. --- libs/vkd3d-shader/hlsl_codegen.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 5a70878b..294a8156 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -4089,7 +4089,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var [VKD3D_SHADER_TYPE_COMPUTE] = "Compute", }; - unsigned int type; + enum vkd3d_shader_register_type type; uint32_t reg; bool builtin; @@ -4097,6 +4097,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var if (ctx->profile->major_version < 4) { + D3DSHADER_PARAM_REGISTER_TYPE sm1_type; D3DDECLUSAGE usage; uint32_t usage_idx; @@ -4104,7 +4105,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var if (ctx->profile->major_version == 1 && output && ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL) return; - builtin = hlsl_sm1_register_from_semantic(ctx, &var->semantic, output, &type, &reg); + builtin = hlsl_sm1_register_from_semantic(ctx, &var->semantic, output, &sm1_type, &reg); if (!builtin && !hlsl_sm1_usage_from_semantic(&var->semantic, &usage, &usage_idx)) { hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, @@ -4114,6 +4115,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var if ((!output && !var->last_read) || (output && !var->first_write)) return; + type = (enum vkd3d_shader_register_type)sm1_type; } else {

1 0

Jacek Caban : gitlab: Remove no longer needed -Wno-enum-conversion from build-mac.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: vkd3d Branch: master Commit: b47ac10b5c07caf4d0f4b4aa97d900e9ee98a165 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b47ac10b5c07caf4d0f4b4aa97d90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 27 15:37:14 2023 +0100 gitlab: Remove no longer needed -Wno-enum-conversion from build-mac. --- gitlab/build-mac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/build-mac b/gitlab/build-mac index 27c70d31..17a8c7a0 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -11,7 +11,7 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -if ../configure CFLAGS="-g -O2 -Wno-implicit-fallthrough -Wno-enum-conversion -Werror" && \ +if ../configure CFLAGS="-g -O2 -Wno-implicit-fallthrough -Werror" && \ make -j$(sysctl -n hw.ncpu) ; then make -j$(sysctl -n hw.ncpu) check || \ touch ../tests_failed

1 0

Jacek Caban : configure: Enable -Wenum-conversion warnings.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: vkd3d Branch: master Commit: d7b20d7c01b2de5d2bf7f894e9d623412917c61c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d7b20d7c01b2de5d2bf7f894e9d62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 27 16:01:19 2023 +0100 configure: Enable -Wenum-conversion warnings. --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 35617c4f..6cd9d9b7 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,7 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) VKD3D_CHECK_CFLAGS([-Wvla]) VKD3D_CHECK_CFLAGS([-Wpointer-arith]) + VKD3D_CHECK_CFLAGS([-Wenum-conversion]) VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])]) dnl Check for cross compilers

1 0

Zebediah Figura : tests/shader_runner: Remove an unnecessary local variable declaration.
by Alexandre Julliard 27 Nov '23

27 Nov '23

Module: vkd3d Branch: master Commit: d1ce069ea6e4a0dfd98e58009716653583eacae4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d1ce069ea6e4a0dfd98e580097166… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Apr 30 17:39:15 2023 -0500 tests/shader_runner: Remove an unnecessary local variable declaration. Found with -Wshadow. --- tests/shader_runner.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 2b875440..0e6104ce 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -618,7 +618,6 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) D3D_PRIMITIVE_TOPOLOGY topology; struct resource_params params; unsigned int vertex_count; - char *rest; if (!shader_runner_get_resource(runner, RESOURCE_TYPE_RENDER_TARGET, 0)) {

1 0