July 2021 - Wine-Commits - list.winehq.org

Conor McCarthy : vkd3d-shader: Create descriptor array symbols for samplers.
by Alexandre Julliard July 29, 2021

July 29, 2021

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

Chip Davis : tests: Do not use llabs(3) on an unsigned difference.
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: vkd3d Branch: master Commit: d44c8e9feb0ad75429874c316f5ca62c34de8468 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d44c8e9feb0ad75429874c3… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Jul 28 21:43:41 2021 -0500 tests: Do not use llabs(3) on an unsigned difference. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index b10f24b..a43a7f2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -63,7 +63,9 @@ static bool compare_uint16(uint16_t a, uint16_t b, unsigned int max_diff) static bool compare_uint64(uint64_t a, uint64_t b, unsigned int max_diff) { - return llabs(a - b) <= max_diff; + uint64_t diff = a > b ? a - b : b - a; + + return diff <= max_diff; } static ULONG get_refcount(void *iface)

1 0

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_signature().
by Alexandre Julliard July 29, 2021

July 29, 2021

Module: vkd3d Branch: master Commit: 26caa7136adb3e93512d8341b4df45d3cf9cce18 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=26caa7136adb3e93512d834… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 28 18:59:13 2021 -0500 vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_signature(). 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 | 43 ++++++------------------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index ed84e26..6e7c174 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2940,22 +2940,6 @@ struct root_signature_writer_context size_t chunk_position; }; -static bool write_dwords(struct root_signature_writer_context *context, - unsigned int count, DWORD d) -{ - unsigned int i; - - for (i = 0; i < count; ++i) - put_u32(&context->buffer, d); - - return !context->buffer.status; -} - -static bool write_dword(struct root_signature_writer_context *context, DWORD d) -{ - return write_dwords(context, 1, d); -} - static size_t get_chunk_offset(struct root_signature_writer_context *context) { return bytecode_get_size(&context->buffer) - context->chunk_position; @@ -3140,22 +3124,12 @@ static int shader_write_root_signature(struct root_signature_writer_context *con size_t samplers_offset_position; int ret; - if (!write_dword(context, desc->version)) - goto fail; - - if (!write_dword(context, versioned_root_signature_get_parameter_count(desc))) - goto fail; - if (!write_dword(context, get_chunk_offset(context) + 4 * sizeof(DWORD))) /* offset */ - goto fail; - - if (!write_dword(context, versioned_root_signature_get_static_sampler_count(desc))) - goto fail; - samplers_offset_position = bytecode_get_size(buffer); - if (!write_dword(context, 0xffffffff)) /* offset */ - goto fail; - - if (!write_dword(context, versioned_root_signature_get_flags(desc))) - goto fail; + put_u32(buffer, desc->version); + put_u32(buffer, versioned_root_signature_get_parameter_count(desc)); + put_u32(buffer, get_chunk_offset(context) + 4 * sizeof(uint32_t)); /* offset */ + put_u32(buffer, versioned_root_signature_get_static_sampler_count(desc)); + samplers_offset_position = put_u32(buffer, 0xffffffff); + put_u32(buffer, versioned_root_signature_get_flags(desc)); if ((ret = shader_write_root_parameters(context, desc)) < 0) return ret; @@ -3163,11 +3137,6 @@ static int shader_write_root_signature(struct root_signature_writer_context *con set_u32(buffer, samplers_offset_position, get_chunk_offset(context)); shader_write_static_samplers(buffer, desc); return 0; - -fail: - vkd3d_shader_error(&context->message_context, NULL, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY, - "Out of memory while writing root signature."); - return VKD3D_ERROR_OUT_OF_MEMORY; } static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descriptor_table *descriptor_table,

1 0

Zebediah Figura : vkd3d-shader: Use vkd3d_bytecode_buffer helpers directly in shader_write_root_descriptor().
by Alexandre Julliard July 29, 2021

July 29, 2021

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

Martin Storsjo : msvcrt: Make the tanhf function NAN preserving.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: e93e2467195c4cc363d567f1be2ab87b61988b26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e93e2467195c4cc363d567f1… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:42:03 2021 +0200 msvcrt: Make the tanhf function NAN preserving. 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 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 29912431bcd..a902d4f04b9 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1881,21 +1881,24 @@ float CDECL tanf( float x ) float CDECL tanhf( float x ) { UINT32 ui = *(UINT32*)&x; - int sign; + UINT32 sign = ui & 0x80000000; float t; /* x = |x| */ - sign = ui >> 31; ui &= 0x7fffffff; x = *(float*)&ui; if (ui > 0x3f0c9f54) { /* |x| > log(3)/2 ~= 0.5493 or nan */ if (ui > 0x41200000) { + if (ui > 0x7f800000) { + *(UINT32*)&x = ui | sign | 0x400000; #if _MSVCR_VER < 140 - if (isnan(x)) return math_error(_DOMAIN, "tanhf", x, 0, x); +#else + return x; #endif + } /* |x| > 10 */ fp_barrierf(x + 0x1p120f); t = 1 + 0 / x;

1 0

Martin Storsjo : msvcrt: Make the sinhf function NAN preserving.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: 4fd9daea4a79d0826c9e5ab6466291043e40d579 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fd9daea4a79d0826c9e5ab6… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:41:57 2021 +0200 msvcrt: Make the sinhf function NAN preserving. 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 92bf12b4d54..29912431bcd 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1699,7 +1699,10 @@ float CDECL sinhf( float x ) } /* |x| > logf(FLT_MAX) or nan */ - t = __expo2f(absx, 2 * h); + if (ui > 0x7f800000) + *(DWORD*)&t = *(DWORD*)&x | 0x400000; + else + t = __expo2f(absx, 2 * h); return t; }

1 0

Martin Storsjo : msvcrt: Make the sinh function NAN preserving.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: 11166aa01e7d17f8535977f648c0b5e098d43bd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11166aa01e7d17f8535977f6… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:42:14 2021 +0200 msvcrt: Make the sinh function NAN preserving. 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, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2bd4206359b..a2b03110cf0 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4046,6 +4046,7 @@ double CDECL sin( double x ) double CDECL sinh( double x ) { UINT64 ux = *(UINT64*)&x; + UINT64 sign = ux & 0x8000000000000000ULL; UINT32 w; double t, h, absx; @@ -4070,7 +4071,10 @@ double CDECL sinh( double x ) /* |x| > log(DBL_MAX) or nan */ /* note: the result is stored to handle overflow */ - t = __expo2(absx, 2 * h); + if (ux > 0x7ff0000000000000ULL) + *(UINT64*)&t = ux | sign | 0x0008000000000000ULL; + else + t = __expo2(absx, 2 * h); return t; }

1 0

Martin Storsjo : msvcrt: Add hyperbolic functions NAN tests.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: 868c9ee7c92a528461fc1d00d30e75dbb85958bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=868c9ee7c92a528461fc1d00… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:42:24 2021 +0200 msvcrt: Add hyperbolic functions NAN tests. 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/tests/misc.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index b38915596df..81c23dd23f2 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -491,8 +491,35 @@ static void test_qsort_s(void) ok(tab[i] == i, "data sorted incorrectly on position %d: %d\n", i, tab[i]); } +static int eq_nan(UINT64 ai, double b) +{ + UINT64 bi = *(UINT64*)&b; + UINT64 mask; + +#if defined(__i386__) + mask = 0xFFFFFFFF00000000ULL; +#else + mask = ~0; +#endif + + ok((ai & mask) == (bi & mask), "comparing %s and %s\n", + wine_dbgstr_longlong(ai), wine_dbgstr_longlong(bi)); + return (ai & mask) == (bi & mask); +} + +static int eq_nanf(DWORD ai, float b) +{ + DWORD bi = *(DWORD*)&b; + ok(ai == bi, "comparing %08x and %08x\n", ai, bi); + return ai == bi; +} + static void test_math_functions(void) { + static const UINT64 test_nan_i = 0xFFF0000123456780ULL; + static const DWORD test_nanf_i = 0xFF801234; + double test_nan = *(double*)&test_nan_i; + float test_nanf = *(float*)&test_nanf_i; double ret; errno = 0xdeadbeef; @@ -525,6 +552,13 @@ static void test_math_functions(void) errno = 0xdeadbeef; p_exp(INFINITY); ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + ok(eq_nan(test_nan_i | (1ULL << 51), cosh(test_nan)), "cosh not preserving nan\n"); + ok(eq_nan(test_nan_i | (1ULL << 51), sinh(test_nan)), "sinh not preserving nan\n"); + ok(eq_nan(test_nan_i | (1ULL << 51), tanh(test_nan)), "tanh not preserving nan\n"); + ok(eq_nanf(test_nanf_i | (1 << 22), coshf(test_nanf)), "coshf not preserving nan\n"); + ok(eq_nanf(test_nanf_i | (1 << 22), sinhf(test_nanf)), "sinhf not preserving nan\n"); + ok(eq_nanf(test_nanf_i | (1 << 22), tanhf(test_nanf)), "tanhf not preserving nan\n"); } static void __cdecl test_thread_func(void *end_thread_type)

1 0

Martin Storsjo : msvcrt: Fix strtof() error reporting for values out of float range.
by Alexandre Julliard July 28, 2021

July 28, 2021

Module: wine Branch: master Commit: 057ecd41cc98cc8c18b04058c0f4323495904e07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=057ecd41cc98cc8c18b04058… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 17:43:19 2021 +0300 msvcrt: Fix strtof() error reporting for values out of float range. If the values weren't out of range for the internal strtod() call, we still must mark them as out of range when returning as float. 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/string.c | 8 +++++++- dlls/msvcrt/wcs.c | 8 +++++++- dlls/ucrtbase/tests/string.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 27e3284326a..4d09405094d 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1065,7 +1065,13 @@ double CDECL strtod( const char *str, char **end ) */ float CDECL _strtof_l( const char *str, char **end, _locale_t locale ) { - return _strtod_l(str, end, locale); + double ret = _strtod_l(str, end, locale); + if (ret && isfinite(ret)) { + float f = ret; + if (!f || !isfinite(f)) + *_errno() = ERANGE; + } + return ret; } /********************************************************************* diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 615b4f36a33..aeab5527db4 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -798,7 +798,13 @@ double CDECL _wtof_l(const wchar_t *str, _locale_t locale) */ float CDECL _wcstof_l( const wchar_t *str, wchar_t **end, _locale_t locale ) { - return _wcstod_l(str, end, locale); + double ret = _wcstod_l(str, end, locale); + if (ret && isfinite(ret)) { + float f = ret; + if (!f || !isfinite(f)) + *_errno() = ERANGE; + } + return ret; } /********************************************************************* diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 9b1d21b801c..734dd68db76 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -152,6 +152,42 @@ static void test_strtod(void) test_strtod_str_errno("2.47e-324", 0, 9, ERANGE); } +static void test_strtof(void) +{ + static const struct { + const char *str; + int len; + float ret; + int err; + } tests[] = { + { "12.1", 4, 12.1f }, + { "-13.721", 7, -13.721f }, + { "1.e40", 5, INFINITY, ERANGE }, + { "-1.e40", 6, -INFINITY, ERANGE }, + { "0.0", 3, 0.0f }, + { "-0.0", 4, 0.0f }, + { "1.4e-45", 7, 1.4e-45f }, + { "-1.4e-45", 8, -1.4e-45f }, + { "1.e-60", 6, 0, ERANGE }, + { "-1.e-60", 7, 0, ERANGE }, + }; + + char *end; + float f; + int i; + + for (i=0; i<ARRAY_SIZE(tests); i++) + { + errno = 0xdeadbeef; + f = strtof(tests[i].str, &end); + ok(f == tests[i].ret, "%d) f = %.16e\n", i, f); + ok(end == tests[i].str + tests[i].len, "%d) len = %d\n", + i, (int)(end - tests[i].str)); + ok(errno == tests[i].err || (!tests[i].err && errno == 0xdeadbeef), + "%d) errno = %d\n", i, errno); + } +} + static void test__memicmp(void) { static const char *s1 = "abc"; @@ -558,6 +594,7 @@ START_TEST(string) "Invalid parameter handler was already set\n"); test_strtod(); + test_strtof(); test__memicmp(); test__memicmp_l(); test___strncnt();

1 0

Zebediah Figura : ws2_32: Move the getsockopt(IPV6_DONTFRAG) implementation to ntdll.
by Alexandre Julliard July 28, 2021

July 28, 2021

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