wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_descriptor().
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: vkd3d Branch: master Commit: 7cf0d84ec9ce7c9650c68291446c6953154243ca URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7cf0d84ec9ce7c9650c6829… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 18:59:09 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_descriptor(). 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> --- libs/vkd3d-shader/dxbc.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 4fb26b8..d8c9f44 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3049,20 +3049,11 @@ static void shader_write_root_constants(struct vkd3d_bytecode_buffer *buffer, put_u32(buffer, constants->value_count); } -static int shader_write_root_descriptor(struct root_signature_writer_context *context, +static void shader_write_root_descriptor(struct vkd3d_bytecode_buffer *buffer, const struct vkd3d_shader_root_descriptor *descriptor) { - if (!write_dword(context, descriptor->shader_register)) - goto fail; - if (!write_dword(context, descriptor->register_space)) - goto fail; - - return VKD3D_OK; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature root descriptor."); - return VKD3D_ERROR_OUT_OF_MEMORY; + put_u32(buffer, descriptor->shader_register); + put_u32(buffer, descriptor->register_space); } static int shader_write_root_descriptor1(struct root_signature_writer_context *context, @@ -3124,7 +3115,7 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co case VKD3D_SHADER_ROOT_PARAMETER_TYPE_SRV: case VKD3D_SHADER_ROOT_PARAMETER_TYPE_UAV: if (desc->version == VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0) - ret = shader_write_root_descriptor(context, &desc->u.v_1_0.parameters[i].u.descriptor); + shader_write_root_descriptor(buffer, &desc->u.v_1_0.parameters[i].u.descriptor); else ret = shader_write_root_descriptor1(context, &desc->u.v_1_1.parameters[i].u.descriptor); break;

1 0

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_constants().
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: vkd3d Branch: master Commit: c95d028ee2254417ca7008ba438167714506ff82 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c95d028ee2254417ca7008b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 18:59:08 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_constants(). 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> --- libs/vkd3d-shader/dxbc.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 0bb2287..4fb26b8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -3041,22 +3041,12 @@ static void shader_write_descriptor_table1(struct root_signature_writer_context shader_write_descriptor_ranges1(buffer, table); } -static int shader_write_root_constants(struct root_signature_writer_context *context, +static void shader_write_root_constants(struct vkd3d_bytecode_buffer *buffer, const struct vkd3d_shader_root_constants *constants) { - if (!write_dword(context, constants->shader_register)) - goto fail; - if (!write_dword(context, constants->register_space)) - goto fail; - if (!write_dword(context, constants->value_count)) - goto fail; - - return VKD3D_OK; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature root constants."); - return VKD3D_ERROR_OUT_OF_MEMORY; + put_u32(buffer, constants->shader_register); + put_u32(buffer, constants->register_space); + put_u32(buffer, constants->value_count); } static int shader_write_root_descriptor(struct root_signature_writer_context *context, @@ -3128,7 +3118,7 @@ static int shader_write_root_parameters(struct root_signature_writer_context *co shader_write_descriptor_table1(context, &desc->u.v_1_1.parameters[i].u.descriptor_table); break; case VKD3D_SHADER_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: - ret = shader_write_root_constants(context, versioned_root_signature_get_root_constants(desc, i)); + shader_write_root_constants(buffer, versioned_root_signature_get_root_constants(desc, i)); break; case VKD3D_SHADER_ROOT_PARAMETER_TYPE_CBV: case VKD3D_SHADER_ROOT_PARAMETER_TYPE_SRV:

1 0

Conor McCarthy : vkd3d-shader: Create descriptor array symbols for samplers.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: vkd3d Branch: master Commit: 8422a3a82abf6de4deced934ac53ed84441f7b5a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8422a3a82abf6de4deced93… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jul 28 23:59:44 2021 +1000 vkd3d-shader: Create descriptor array symbols for samplers. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d299e6e..0abc2d6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5567,8 +5567,9 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com const SpvStorageClass storage_class = SpvStorageClassUniformConstant; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_register *reg = &sampler->src.reg; - uint32_t type_id, ptr_type_id, var_id; + const struct vkd3d_symbol *array_symbol; struct vkd3d_symbol reg_symbol; + uint32_t type_id, var_id; vkd3d_symbol_make_sampler(&reg_symbol, reg); reg_symbol.info.sampler.range = sampler->range; @@ -5578,18 +5579,13 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com return; type_id = vkd3d_spirv_get_op_type_sampler(builder); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); - var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, - ptr_type_id, storage_class, 0); - - vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, - &sampler->range, VKD3D_SHADER_RESOURCE_NONE, false); - - vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); + var_id = vkd3d_dxbc_compiler_build_descriptor_variable(compiler, storage_class, type_id, reg, + &sampler->range, VKD3D_SHADER_RESOURCE_NONE, &array_symbol); vkd3d_symbol_make_register(&reg_symbol, reg); vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3DSP_WRITEMASK_ALL); + reg_symbol.descriptor_array = array_symbol; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } @@ -7907,10 +7903,24 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil if (sampled) { + struct vkd3d_shader_register_info register_info; + assert(image->image_id); assert(sampler_reg); - sampler_var_id = vkd3d_dxbc_compiler_get_register_id(compiler, sampler_reg); + if (!vkd3d_dxbc_compiler_get_register_info(compiler, sampler_reg, &register_info)) + ERR("Failed to get sampler register info.\n"); + sampler_var_id = register_info.id; + if (register_info.descriptor_array) + { + const struct vkd3d_symbol_descriptor_array_data *array_data + = &register_info.descriptor_array->info.descriptor_array; + uint32_t ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, + register_info.storage_class, array_data->contained_type_id); + uint32_t array_idx = vkd3d_dxbc_compiler_get_descriptor_index(compiler, + sampler_reg, array_data->binding_base_idx, VKD3D_SHADER_RESOURCE_NONE); + sampler_var_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, register_info.id, &array_idx, 1); + } sampler_id = vkd3d_spirv_build_op_load(builder, vkd3d_spirv_get_op_type_sampler(builder), sampler_var_id, SpvMemoryAccessMaskNone);

1 0

Conor McCarthy : vkd3d-shader: Handle descriptor array dynamic indexing.
by Alexandre Julliard 29 Jul '21

29 Jul '21

Module: vkd3d Branch: master Commit: be8f51666ec1686ac0be5c3b0531e6b59d868f9d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=be8f51666ec1686ac0be5c3… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jul 28 23:59:43 2021 +1000 vkd3d-shader: Handle descriptor array dynamic indexing. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 63 +++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 6cdbaf1..b0412d3 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -573,6 +573,7 @@ enum vkd3d_shader_spirv_extension { VKD3D_SHADER_SPIRV_EXTENSION_NONE, VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION, + VKD3D_SHADER_SPIRV_EXTENSION_EXT_DESCRIPTOR_INDEXING, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SPIRV_EXTENSION), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4c870fb..d299e6e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1822,6 +1822,13 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, vkd3d_spirv_build_op_extension(&stream, "SPV_KHR_shader_draw_parameters"); if (vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityDemoteToHelperInvocationEXT)) vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_demote_to_helper_invocation"); + if (vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityUniformBufferArrayDynamicIndexing) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityUniformTexelBufferArrayDynamicIndexingEXT) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilitySampledImageArrayDynamicIndexing) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageBufferArrayDynamicIndexing) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageTexelBufferArrayDynamicIndexingEXT) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageImageArrayDynamicIndexing)) + vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_descriptor_indexing"); if (builder->ext_instr_set_glsl_450) vkd3d_spirv_build_op_ext_inst_import(&stream, builder->ext_instr_set_glsl_450, "GLSL.std.450"); @@ -3126,18 +3133,59 @@ static bool register_is_descriptor(const struct vkd3d_shader_register *reg) } } +static bool vkd3d_dxbc_compiler_enable_descriptor_indexing(struct vkd3d_dxbc_compiler *compiler, + enum vkd3d_shader_register_type reg_type, enum vkd3d_shader_resource_type resource_type) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + if (!vkd3d_dxbc_compiler_is_target_extension_supported(compiler, + VKD3D_SHADER_SPIRV_EXTENSION_EXT_DESCRIPTOR_INDEXING)) + return false; + + switch (reg_type) + { + case VKD3DSPR_CONSTBUFFER: + vkd3d_spirv_enable_capability(builder, SpvCapabilityUniformBufferArrayDynamicIndexing); + break; + case VKD3DSPR_RESOURCE: + vkd3d_spirv_enable_capability(builder, resource_type == VKD3D_SHADER_RESOURCE_BUFFER + ? SpvCapabilityUniformTexelBufferArrayDynamicIndexingEXT + : SpvCapabilitySampledImageArrayDynamicIndexing); + break; + case VKD3DSPR_UAV: + if (resource_type == VKD3D_SHADER_RESOURCE_BUFFER) + vkd3d_spirv_enable_capability(builder, compiler->ssbo_uavs + ? SpvCapabilityStorageBufferArrayDynamicIndexing + : SpvCapabilityStorageTexelBufferArrayDynamicIndexingEXT); + else + vkd3d_spirv_enable_capability(builder, SpvCapabilityStorageImageArrayDynamicIndexing); + break; + case VKD3DSPR_SAMPLER: + break; + default: + ERR("Unhandled register type %#x.\n", reg_type); + break; + } + + return true; +} + static uint32_t vkd3d_dxbc_compiler_get_descriptor_index(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, unsigned int binding_base_idx) + const struct vkd3d_shader_register *reg, unsigned int binding_base_idx, + enum vkd3d_shader_resource_type resource_type) { struct vkd3d_shader_register_index index = reg->idx[1]; uint32_t index_id; if (index.rel_addr) { - FIXME("Descriptor dynamic indexing is not supported.\n"); - vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_IDX_UNSUPPORTED, - "Cannot dynamically index a descriptor array of type %#x, id %u. " - "Dynamic indexing is not supported.", reg->type, reg->idx[0].offset); + if (!vkd3d_dxbc_compiler_enable_descriptor_indexing(compiler, reg->type, resource_type)) + { + FIXME("The target environment does not support descriptor indexing.\n"); + vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_IDX_UNSUPPORTED, + "Cannot dynamically index a descriptor array of type %#x, id %u. " + "The target environment does not support descriptor indexing.", reg->type, reg->idx[0].offset); + } } index.offset -= binding_base_idx; @@ -3159,7 +3207,8 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp assert(!reg->idx[0].rel_addr); if (register_info->descriptor_array) indexes[index_count++] = vkd3d_dxbc_compiler_get_descriptor_index(compiler, reg, - register_info->descriptor_array->info.descriptor_array.binding_base_idx); + register_info->descriptor_array->info.descriptor_array.binding_base_idx, + VKD3D_SHADER_RESOURCE_BUFFER); indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[2]); } @@ -7821,7 +7870,7 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil uint32_t ptr_type_id, index_id; index_id = vkd3d_dxbc_compiler_get_descriptor_index(compiler, resource_reg, - array_data->binding_base_idx); + array_data->binding_base_idx, symbol->info.resource.resource_type_info->resource_type); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, array_data->storage_class, array_data->contained_type_id);

1 0

Zebediah Figura : ws2_32: Move the getsockopt(IPV6_MULTICAST_HOPS) implementation to ntdll.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 5dffe2263de41e76100ba0acd7c717267dc4c878 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dffe2263de41e76100ba0ac… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 10:17:09 2021 -0500 ws2_32: Move the getsockopt(IPV6_MULTICAST_HOPS) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 4 +++- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 2beb4f1778f..85763d032ed 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1864,6 +1864,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, in_buffer, in_size ); #endif + case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS: + return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, out_buffer, out_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index cd8bd63b88c..9c2d58827ba 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2412,8 +2412,10 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IPV6_DONTFRAG: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_DONTFRAG, optval, optlen ); - case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS, optval, optlen ); + + case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_LOOP: case WS_IPV6_UNICAST_HOPS: case WS_IPV6_V6ONLY: diff --git a/include/wine/afd.h b/include/wine/afd.h index ad12c55af12..0f04cc824a8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -211,6 +211,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IPV6_DONTFRAG WINE_AFD_IOC(266) #define IOCTL_AFD_WINE_SET_IPV6_DONTFRAG WINE_AFD_IOC(267) #define IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP WINE_AFD_IOC(268) +#define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(269) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IPV6_DROP_MEMBERSHIP) implementation to ntdll.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 6d2fb6f135a9a65818cf401a02d67794927620dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d2fb6f135a9a65818cf401a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 10:17:08 2021 -0500 ws2_32: Move the setsockopt(IPV6_DROP_MEMBERSHIP) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 5 +++++ dlls/ws2_32/socket.c | 4 ++-- include/wine/afd.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 6a9fcc168a6..2beb4f1778f 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1859,6 +1859,11 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc } #endif +#ifdef IPV6_DROP_MEMBERSHIP + case IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, in_buffer, in_size ); +#endif + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b436079d709..cd8bd63b88c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3622,9 +3622,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_DONTFRAG: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_DONTFRAG, optval, optlen ); -#ifdef IPV6_DROP_MEMBERSHIP case WS_IPV6_DROP_MEMBERSHIP: -#endif + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP, optval, optlen ); + case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: case WS_IPV6_MULTICAST_LOOP: diff --git a/include/wine/afd.h b/include/wine/afd.h index e1933184da0..ad12c55af12 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -210,6 +210,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP WINE_AFD_IOC(265) #define IOCTL_AFD_WINE_GET_IPV6_DONTFRAG WINE_AFD_IOC(266) #define IOCTL_AFD_WINE_SET_IPV6_DONTFRAG WINE_AFD_IOC(267) +#define IOCTL_AFD_WINE_SET_IPV6_DROP_MEMBERSHIP WINE_AFD_IOC(268) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IPV6_DONTFRAG) implementation to ntdll.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: e1a34ce063d5537e25a251a07c63aa3e733f7bee URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1a34ce063d5537e25a251a0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 10:17:07 2021 -0500 ws2_32: Move the setsockopt(IPV6_DONTFRAG) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 19 +++++++++++++++++ dlls/ws2_32/socket.c | 53 +++--------------------------------------------- include/wine/afd.h | 1 + 3 files changed, 23 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index fbfd873b3b9..6a9fcc168a6 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1840,6 +1840,25 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return STATUS_SUCCESS; } + case IOCTL_AFD_WINE_SET_IPV6_DONTFRAG: +#ifdef IPV6_DONTFRAG + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_DONTFRAG, in_buffer, in_size ); +#elif defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO) && defined(IPV6_PMTUDISC_DONT) + { + int value = *(DWORD *)in_buffer ? IPV6_PMTUDISC_DO : IPV6_PMTUDISC_DONT; + + return do_setsockopt( handle, io, IPPROTO_IP, IPV6_MTU_DISCOVER, &value, sizeof(value) ); + } +#else + { + static int once; + + if (!once++) + FIXME( "IPV6_DONTFRAGMENT is not supported on this platform\n" ); + return STATUS_SUCCESS; /* fake success */ + } +#endif + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 837e8021248..b436079d709 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -694,54 +694,6 @@ static inline void release_sock_fd( SOCKET s, int fd ) close( fd ); } -static BOOL set_dont_fragment(SOCKET s, int level, BOOL value) -{ - int fd, optname; - - if (level == IPPROTO_IP) - { -#ifdef IP_DONTFRAG - optname = IP_DONTFRAG; -#elif defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO) && defined(IP_PMTUDISC_DONT) - optname = IP_MTU_DISCOVER; - value = value ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; -#else - static int once; - if (!once++) - FIXME("IP_DONTFRAGMENT for IPv4 not supported in this platform\n"); - return TRUE; /* fake success */ -#endif - } - else - { -#ifdef IPV6_DONTFRAG - optname = IPV6_DONTFRAG; -#elif defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO) && defined(IPV6_PMTUDISC_DONT) - optname = IPV6_MTU_DISCOVER; - value = value ? IPV6_PMTUDISC_DO : IPV6_PMTUDISC_DONT; -#else - static int once; - if (!once++) - FIXME("IP_DONTFRAGMENT for IPv6 not supported in this platform\n"); - return TRUE; /* fake success */ -#endif - } - - fd = get_sock_fd(s, 0, NULL); - if (fd == -1) return FALSE; - - if (!setsockopt(fd, level, optname, &value, sizeof(value))) - value = TRUE; - else - { - WSASetLastError(wsaErrno()); - value = FALSE; - } - - release_sock_fd(s, fd); - return value; -} - struct per_thread_data *get_per_thread_data(void) { struct per_thread_data * ptb = NtCurrentTeb()->WinSockData; @@ -3667,6 +3619,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_ADD_MEMBERSHIP: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP, optval, optlen ); + case WS_IPV6_DONTFRAG: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_DONTFRAG, optval, optlen ); + #ifdef IPV6_DROP_MEMBERSHIP case WS_IPV6_DROP_MEMBERSHIP: #endif @@ -3679,8 +3634,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, #endif convert_sockopt(&level, &optname); break; - case WS_IPV6_DONTFRAG: - return set_dont_fragment(s, IPPROTO_IPV6, *(BOOL *)optval) ? 0 : SOCKET_ERROR; case WS_IPV6_PROTECTION_LEVEL: FIXME("IPV6_PROTECTION_LEVEL is ignored!\n"); return 0; diff --git a/include/wine/afd.h b/include/wine/afd.h index bb8fd68f059..e1933184da0 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -209,6 +209,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_UNICAST_IF WINE_AFD_IOC(264) #define IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP WINE_AFD_IOC(265) #define IOCTL_AFD_WINE_GET_IPV6_DONTFRAG WINE_AFD_IOC(266) +#define IOCTL_AFD_WINE_SET_IPV6_DONTFRAG WINE_AFD_IOC(267) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the getsockopt(IPV6_DONTFRAG) implementation to ntdll.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: a615e67792bd5edcf0577f6e176f7095253c558f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a615e67792bd5edcf0577f6e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 10:17:06 2021 -0500 ws2_32: Move the getsockopt(IPV6_DONTFRAG) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 33 +++++++++++++++++++++++++++ dlls/ws2_32/socket.c | 59 +++--------------------------------------------- include/wine/afd.h | 1 + 3 files changed, 37 insertions(+), 56 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f0dc00a9651..fbfd873b3b9 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1807,6 +1807,39 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, in_buffer, in_size ); #endif + case IOCTL_AFD_WINE_GET_IPV6_DONTFRAG: + { + socklen_t len = out_size; + int ret; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + +#ifdef IPV6_DONTFRAG + ret = getsockopt( fd, IPPROTO_IPV6, IPV6_DONTFRAG, out_buffer, &len ); +#elif defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DONT) + { + int value; + + len = sizeof(value); + ret = getsockopt( fd, IPPROTO_IPV6, IPV6_MTU_DISCOVER, &value, &len ); + if (!ret) *(DWORD *)out_buffer = (value != IPV6_PMTUDISC_DONT); + } +#else + { + static int once; + + if (!once++) + FIXME( "IPV6_DONTFRAGMENT is not supported on this platform\n" ); + ret = 0; /* fake success */ + } +#endif + if (needs_close) close( fd ); + if (ret) return sock_errno_to_status( errno ); + io->Information = len; + return STATUS_SUCCESS; + } + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f02d668ece4..837e8021248 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -742,60 +742,6 @@ static BOOL set_dont_fragment(SOCKET s, int level, BOOL value) return value; } -static BOOL get_dont_fragment(SOCKET s, int level, BOOL *out) -{ - int fd, optname, value, not_expected; - socklen_t optlen = sizeof(value); - - if (level == IPPROTO_IP) - { -#ifdef IP_DONTFRAG - optname = IP_DONTFRAG; - not_expected = 0; -#elif defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT) - optname = IP_MTU_DISCOVER; - not_expected = IP_PMTUDISC_DONT; -#else - static int once; - if (!once++) - FIXME("IP_DONTFRAGMENT for IPv4 not supported in this platform\n"); - return TRUE; /* fake success */ -#endif - } - else - { -#ifdef IPV6_DONTFRAG - optname = IPV6_DONTFRAG; - not_expected = 0; -#elif defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DONT) - optname = IPV6_MTU_DISCOVER; - not_expected = IPV6_PMTUDISC_DONT; -#else - static int once; - if (!once++) - FIXME("IP_DONTFRAGMENT for IPv6 not supported in this platform\n"); - return TRUE; /* fake success */ -#endif - } - - fd = get_sock_fd(s, 0, NULL); - if (fd == -1) return FALSE; - - if (!getsockopt(fd, level, optname, &value, &optlen)) - { - *out = value != not_expected; - value = TRUE; - } - else - { - WSASetLastError(wsaErrno()); - value = FALSE; - } - - release_sock_fd(s, fd); - return value; -} - struct per_thread_data *get_per_thread_data(void) { struct per_thread_data * ptb = NtCurrentTeb()->WinSockData; @@ -2511,6 +2457,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IPPROTO_IPV6: switch(optname) { + case WS_IPV6_DONTFRAG: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_DONTFRAG, optval, optlen ); + case WS_IPV6_MULTICAST_IF: case WS_IPV6_MULTICAST_HOPS: case WS_IPV6_MULTICAST_LOOP: @@ -2529,8 +2478,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } release_sock_fd( s, fd ); return ret; - case WS_IPV6_DONTFRAG: - return get_dont_fragment(s, IPPROTO_IPV6, (BOOL *)optval) ? 0 : SOCKET_ERROR; default: FIXME( "unrecognized IPv6 option %u\n", optname ); diff --git a/include/wine/afd.h b/include/wine/afd.h index dda07695f75..bb8fd68f059 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -208,6 +208,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IP_UNICAST_IF WINE_AFD_IOC(263) #define IOCTL_AFD_WINE_SET_IP_UNICAST_IF WINE_AFD_IOC(264) #define IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP WINE_AFD_IOC(265) +#define IOCTL_AFD_WINE_GET_IPV6_DONTFRAG WINE_AFD_IOC(266) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IPV6_ADD_MEMBERSHIP) implementation to ntdll.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: ef54a8c318a26d08f593bbe5cfdd9c41b3318031 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef54a8c318a26d08f593bbe5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 10:17:05 2021 -0500 ws2_32: Move the setsockopt(IPV6_ADD_MEMBERSHIP) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 5 +++++ dlls/ws2_32/socket.c | 4 ++-- include/wine/afd.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f33fc014f3b..f0dc00a9651 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1802,6 +1802,11 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, IPPROTO_IP, IP_UNICAST_IF, in_buffer, in_size ); #endif +#ifdef IPV6_ADD_MEMBERSHIP + case IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, in_buffer, in_size ); +#endif + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d5de709e991..f02d668ece4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3717,9 +3717,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPPROTO_IPV6: switch(optname) { -#ifdef IPV6_ADD_MEMBERSHIP case WS_IPV6_ADD_MEMBERSHIP: -#endif + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP, optval, optlen ); + #ifdef IPV6_DROP_MEMBERSHIP case WS_IPV6_DROP_MEMBERSHIP: #endif diff --git a/include/wine/afd.h b/include/wine/afd.h index c150e2ce474..dda07695f75 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -207,6 +207,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE WINE_AFD_IOC(262) #define IOCTL_AFD_WINE_GET_IP_UNICAST_IF WINE_AFD_IOC(263) #define IOCTL_AFD_WINE_SET_IP_UNICAST_IF WINE_AFD_IOC(264) +#define IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP WINE_AFD_IOC(265) struct afd_create_params {

1 0

Martin Storsjo : msvcrt: Convert double (numerically) to UINT64 via INT64, fixing pow() on arm.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 37b896db48fb049f8d0c7afe2a4ab98786787658 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37b896db48fb049f8d0c7afe… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Jul 27 01:28:01 2021 +0300 msvcrt: Convert double (numerically) to UINT64 via INT64, fixing pow() on arm. If converting a negative double to an UINT64, on arm it's clipped to zero instead of converted to its two's complement form (contrary to x86). This fixes cases like pow(2.0, -2.0) on arm/aarch64. Add similar casts to expf() too which seems to have a similar pattern, even if it's not known if that case can cause issues or not. In the original musl source, the converttoint() function returns a signed int32_t, doing the same double->signed->unsigned conversion, implicitly. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 69b807f722c..124cdf80098 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1204,7 +1204,7 @@ float CDECL expf( float x ) ideally ties-to-even rule is used, otherwise the magnitude of r can be bigger which gives larger approximation error. */ kd = __round(z); - ki = kd; + ki = (INT64)kd; r = z - kd; /* exp(x) = 2^(k/N) * 2^(r/N) ~= s * (C0*r^3 + C1*r^2 + C2*r + 1) */ @@ -1508,7 +1508,7 @@ static float powf_exp2(double xd, UINT32 sign_bias) /* N*x = k + r with r in [-1/2, 1/2] */ kd = __round(xd); /* k */ - ki = kd; + ki = (INT64)kd; r = xd - kd; /* exp2(x) = 2^(k/N) * 2^r ~= s * (C0*r^3 + C1*r^2 + C2*r + 1) */ @@ -3824,7 +3824,7 @@ static double pow_exp(double argx, double argy, double x, double xtail, UINT32 s /* x = ln2/N*k + r, with int k and r in [-ln2/2N, ln2/2N]. */ z = invln2N * x; kd = __round(z); - ki = kd; + ki = (INT64)kd; r = x + kd * negln2hiN + kd * negln2loN; /* The code assumes 2^-200 < |xtail| < 2^-8/N. */ r += xtail;

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2021