October 2018 - Wine-Devel - list.winehq.org

[PATCH vkd3d 2/7] vkd3d-shader: Use typed shader outputs directly.
by Józef Kucia Oct. 30, 2018

Oct. 30, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 56 +++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9419dc45c38c..234b7c82003e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2791,25 +2791,21 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_src(struct vkd3d_dxbc_compiler *co } static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) + const struct vkd3d_shader_register *reg, DWORD write_mask, + const struct vkd3d_shader_register_info *reg_info, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, ptr_type_id, chain_id, index[1]; - struct vkd3d_shader_register_info reg_info; unsigned int component_idx; assert(reg->type != VKD3DSPR_IMMCONST); - if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) - return; - vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); - - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); + type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info->storage_class, type_id); component_idx = vkd3d_write_mask_get_component_idx(write_mask); index[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); chain_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, - ptr_type_id, reg_info.id, index, ARRAY_SIZE(index)); + ptr_type_id, reg_info->id, index, ARRAY_SIZE(index)); vkd3d_spirv_build_op_store(builder, chain_id, val_id, SpvMemoryAccessMaskNone); } @@ -2818,35 +2814,39 @@ static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compi const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t reg_id, type_id, reg_val_id; + struct vkd3d_shader_register_info reg_info; + enum vkd3d_component_type component_type; + uint32_t type_id, reg_val_id; unsigned int component_count; assert(reg->type != VKD3DSPR_IMMCONST); assert(write_mask); component_count = vkd3d_write_mask_component_count(write_mask); + component_type = vkd3d_component_type_from_data_type(reg->data_type); + if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) + return; + vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); - if (reg->data_type != VKD3D_DATA_FLOAT) + if (component_type != reg_info.component_type) { - uint32_t type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, component_count); + type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, component_count); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); } if (component_count == 1) - return vkd3d_dxbc_compiler_emit_store_scalar(compiler, reg, write_mask, val_id); - - reg_id = vkd3d_dxbc_compiler_get_register_id(compiler, reg); + return vkd3d_dxbc_compiler_emit_store_scalar(compiler, reg, write_mask, &reg_info, val_id); if (component_count != VKD3D_VEC4_SIZE) { - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); - reg_val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_id, SpvMemoryAccessMaskNone); + type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, VKD3D_VEC4_SIZE); + reg_val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone); val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, - reg_val_id, val_id, write_mask, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); + reg_val_id, val_id, write_mask, reg_info.component_type, VKD3D_VEC4_SIZE); } - vkd3d_spirv_build_op_store(builder, reg_id, val_id, SpvMemoryAccessMaskNone); + vkd3d_spirv_build_op_store(builder, reg_info.id, val_id, SpvMemoryAccessMaskNone); } static uint32_t vkd3d_dxbc_compiler_emit_sat(struct vkd3d_dxbc_compiler *compiler, @@ -3275,6 +3275,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi for (i = 0; i < max(array_size, 1); ++i) { struct vkd3d_shader_register dst_reg = *reg; + dst_reg.data_type = VKD3D_DATA_FLOAT; val_id = input_id; if (array_size) @@ -3515,7 +3516,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler compiler->output_info[signature_idx].id = id; compiler->output_info[signature_idx].component_type = component_type; - use_private_variable = component_type != VKD3D_TYPE_FLOAT || component_count != VKD3D_VEC4_SIZE + use_private_variable = component_count != VKD3D_VEC4_SIZE || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE || (builtin && builtin->is_spirv_array); if (use_private_variable) @@ -3534,7 +3535,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { reg_symbol.id = var_id; reg_symbol.info.reg.storage_class = storage_class; - reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; + reg_symbol.info.reg.component_type = use_private_variable ? VKD3D_TYPE_FLOAT : component_type; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); @@ -4521,22 +4522,25 @@ static void vkd3d_dxbc_compiler_emit_ext_glsl_instruction(struct vkd3d_dxbc_comp static void vkd3d_dxbc_compiler_emit_mov(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + struct vkd3d_shader_register_info dst_reg_info, src_reg_info; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; uint32_t val_id, dst_val_id, type_id, dst_id, src_id; - struct vkd3d_shader_register_info reg_info; uint32_t components[VKD3D_VEC4_SIZE]; unsigned int i, component_count; component_count = vkd3d_write_mask_component_count(dst->write_mask); - memset(&reg_info, 0, sizeof(reg_info)); + vkd3d_dxbc_compiler_get_register_info(compiler, &dst->reg, &dst_reg_info); + memset(&src_reg_info, 0, sizeof(src_reg_info)); if (src->reg.type != VKD3DSPR_IMMCONST) - vkd3d_dxbc_compiler_get_register_info(compiler, &src->reg, &reg_info); + vkd3d_dxbc_compiler_get_register_info(compiler, &src->reg, &src_reg_info); if (component_count == 1 || component_count == VKD3D_VEC4_SIZE || dst->modifiers || src->modifiers || src->reg.type == VKD3DSPR_IMMCONST - || reg_info.component_type != VKD3D_TYPE_FLOAT || reg_info.write_mask != VKD3DSP_WRITEMASK_ALL) + || dst_reg_info.component_type != src_reg_info.component_type + || dst_reg_info.write_mask != VKD3DSP_WRITEMASK_ALL + || src_reg_info.write_mask != VKD3DSP_WRITEMASK_ALL) { val_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst->write_mask); vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); @@ -4545,7 +4549,7 @@ static void vkd3d_dxbc_compiler_emit_mov(struct vkd3d_dxbc_compiler *compiler, { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); + type_id = vkd3d_spirv_get_type_id(builder, dst_reg_info.component_type, VKD3D_VEC4_SIZE); dst_id = vkd3d_dxbc_compiler_get_register_id(compiler, &dst->reg); src_id = vkd3d_dxbc_compiler_get_register_id(compiler, &src->reg); -- 2.18.1

2 1

[PATCH vkd3d 1/7] vkd3d-shader: Rename "output setup" function to "shader epilogue".
by Józef Kucia Oct. 30, 2018

Oct. 30, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 09c6f9f799e4..9419dc45c38c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1883,7 +1883,7 @@ struct vkd3d_dxbc_compiler uint32_t array_element_mask; } *output_info; uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ - uint32_t output_setup_function_id; + uint32_t epilogue_function_id; uint32_t dummy_sampler_id; uint32_t binding_idx; @@ -3545,8 +3545,8 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { unsigned int idx = vkd3d_dxbc_compiler_get_output_variable_index(compiler, reg->idx[0].offset); compiler->private_output_variable[idx] = var_id; - if (!compiler->output_setup_function_id) - compiler->output_setup_function_id = vkd3d_spirv_alloc_id(builder); + if (!compiler->epilogue_function_id) + compiler->epilogue_function_id = vkd3d_spirv_alloc_id(builder); } } @@ -4981,13 +4981,13 @@ static uint32_t vkd3d_dxbc_compiler_emit_conditional_branch(struct vkd3d_dxbc_co return merge_block_id; } -static void vkd3d_dxbc_compiler_emit_output_setup_invocation(struct vkd3d_dxbc_compiler *compiler) +static void vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(struct vkd3d_dxbc_compiler *compiler) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t void_id, function_id, arguments[MAX_REG_OUTPUT]; unsigned int i, count; - if ((function_id = compiler->output_setup_function_id)) + if ((function_id = compiler->epilogue_function_id)) { void_id = vkd3d_spirv_get_op_type_void(builder); for (i = 0, count = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) @@ -5006,7 +5006,7 @@ static void vkd3d_dxbc_compiler_emit_return(struct vkd3d_dxbc_compiler *compiler struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; if (compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY) - vkd3d_dxbc_compiler_emit_output_setup_invocation(compiler); + vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(compiler); vkd3d_spirv_build_op_return(builder); } @@ -6455,7 +6455,7 @@ static void vkd3d_dxbc_compiler_emit_emit_stream(struct vkd3d_dxbc_compiler *com return; } - vkd3d_dxbc_compiler_emit_output_setup_invocation(compiler); + vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(compiler); vkd3d_spirv_build_op_emit_vertex(builder); } @@ -6857,7 +6857,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi } } -static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_compiler *compiler) +static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_compiler *compiler) { uint32_t param_type_id[MAX_REG_OUTPUT + 1], param_id[MAX_REG_OUTPUT + 1] = {}; const struct vkd3d_shader_signature *signature = compiler->output_signature; @@ -6866,7 +6866,7 @@ static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_com unsigned int i, count; DWORD variable_idx; - function_id = compiler->output_setup_function_id; + function_id = compiler->epilogue_function_id; assert(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_id)); assert(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_type_id)); @@ -6883,7 +6883,7 @@ static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_com vkd3d_spirv_build_op_function(builder, void_id, function_id, SpvFunctionControlMaskNone, function_type_id); - vkd3d_spirv_build_op_name(builder, function_id, "setup_output"); + vkd3d_spirv_build_op_name(builder, function_id, "epilogue"); for (i = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) { @@ -6922,8 +6922,8 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, vkd3d_spirv_build_op_function_end(builder); - if (compiler->output_setup_function_id) - vkd3d_dxbc_compiler_emit_output_setup_function(compiler); + if (compiler->epilogue_function_id) + vkd3d_dxbc_compiler_emit_shader_epilogue_function(compiler); if (compiler->options & VKD3D_SHADER_STRIP_DEBUG) vkd3d_spirv_stream_clear(&builder->debug_stream); -- 2.18.1

2 1

[PATCH 5/6] server: Introduce is_fd_synchronous helper.
by Jacek Caban Oct. 30, 2018

Oct. 30, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/fd.c | 10 ++++++++-- server/file.c | 7 +------ server/file.h | 1 + 3 files changed, 10 insertions(+), 8 deletions(-)

1 0

[PATCH 3/6] ntdll: Correctly return result of blocking NtFlushBuffersFile.
by Jacek Caban Oct. 30, 2018

Oct. 30, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 2 +- dlls/ntdll/file.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-)

1 0

[PATCH 2/6] kernel32: Wait on pipe handle in TransactNamedPipe if needed.
by Jacek Caban Oct. 30, 2018

Oct. 30, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/sync.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH 1/6] kernel32: Wait on pipe handle in ConnectNamedPipe if needed.
by Jacek Caban Oct. 30, 2018

Oct. 30, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/sync.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH 3/5] ntdll/tests: Add more I/O blocking and completion tests.
by Jacek Caban Oct. 30, 2018

Oct. 30, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 340 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 339 insertions(+), 1 deletion(-)

2 2

[v2 PATCH] msvcrt: Implement __strncnt().
by Nikolay Sivov Oct. 30, 2018

Oct. 30, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: removed unnecessary function pointer check in tests. .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr100/tests/msvcr100.c | 32 ++++++++++++++ dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr110/tests/msvcr110.c | 32 ++++++++++++++ dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 32 ++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 19 +++++++++ dlls/msvcrt/tests/string.c | 38 +++++++++++++++++ dlls/ucrtbase/tests/string.c | 42 +++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 15 files changed, 204 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index d045996756..bbc247c79c 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -3,7 +3,7 @@ @ cdecl __iscsymf(long) ucrtbase.__iscsymf @ stub __iswcsym @ stub __iswcsymf -@ stub __strncnt +@ cdecl __strncnt(str long) ucrtbase.__strncnt @ stub __wcsncnt @ cdecl _isalnum_l(long ptr) ucrtbase._isalnum_l @ cdecl _isalpha_l(long ptr) ucrtbase._isalpha_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1579415edc..482dcbbf03 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -656,7 +656,7 @@ @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 594ac28072..8ac8f4ea3b 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -235,6 +235,7 @@ static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t,_locale_t); static char* (__cdecl *p_setlocale)(int, const char*); +static size_t (__cdecl *p___strncnt)(const char*, size_t); /* make sure we use the correct errno */ #undef errno @@ -270,6 +271,7 @@ static BOOL init(void) SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); SET(p_setlocale, "setlocale"); + SET(p___strncnt, "__strncnt"); SET(p_Context_Id, "?Id(a)Context@Concurrency@@SAIXZ"); SET(p_CurrentScheduler_Detach, "?Detach(a)CurrentScheduler@Concurrency@@SAXXZ"); @@ -1075,6 +1077,35 @@ static void test_setlocale(void) ok(!ret, "got %p\n", ret); } +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { NULL, 0, 0 }, + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (0) /* crashes */ + ret = p___strncnt(NULL, 1); + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } +} + START_TEST(msvcr100) { if (!init()) @@ -1094,4 +1125,5 @@ START_TEST(msvcr100) test__memicmp(); test__memicmp_l(); test_setlocale(); + test___strncnt(); } diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 029620f72e..4ad61d4022 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1004,7 +1004,7 @@ @ cdecl __set_app_type(long) MSVCRT___set_app_type @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index dcee5c1ecc..09876131f0 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -32,6 +32,7 @@ #include <locale.h> static char* (CDECL *p_setlocale)(int category, const char* locale); +static size_t (CDECL *p___strncnt)(const char *str, size_t count); static unsigned int (CDECL *p_CurrentScheduler_GetNumberOfVirtualProcessors)(void); static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(void); @@ -50,6 +51,7 @@ static BOOL init(void) } p_setlocale = (void*)GetProcAddress(module, "setlocale"); + p___strncnt = (void*)GetProcAddress(module, "__strncnt"); p_CurrentScheduler_GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?GetNumberOfVirtualProcessors(a)CurrentScheduler@Concurrency@@SAIXZ"); p__CurrentScheduler__GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); p_CurrentScheduler_Id = (void*)GetProcAddress(module, "?Id(a)CurrentScheduler@Concurrency@@SAIXZ"); @@ -112,9 +114,39 @@ static void test_setlocale(void) p_setlocale(LC_ALL, "C"); } +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { NULL, 0, 0 }, + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (0) /* crashes */ + ret = p___strncnt(NULL, 1); + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } +} + START_TEST(msvcr110) { if (!init()) return; test_CurrentScheduler(); /* MUST be first (at least among Concurrency tests) */ test_setlocale(); + test___strncnt(); } diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 89002ed15b..47834e5d62 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -994,7 +994,7 @@ @ cdecl __set_app_type(long) MSVCRT___set_app_type @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index e926bbbf48..e5b26a4746 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -965,7 +965,7 @@ @ stub __report_gsfailure @ extern __setlc_active msvcr120.__setlc_active @ cdecl __setusermatherr(ptr) msvcr120.__setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) msvcr120.__strncnt @ varargs __swprintf_l(ptr wstr ptr) msvcr120.__swprintf_l @ cdecl __sys_errlist() msvcr120.__sys_errlist @ cdecl __sys_nerr() msvcr120.__sys_nerr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7aebe34f23..69355cc1f7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -305,7 +305,7 @@ @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index eb70ff9153..33ec4b2df7 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -289,7 +289,7 @@ @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 777d4fee97..0ba1f1a7b1 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -134,6 +134,7 @@ static int (__cdecl *p__fpieee_flt)(ULONG, EXCEPTION_POINTERS*, int (__cdecl *ha static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist); +static size_t (__cdecl *p___strncnt)(const char *str, size_t count); /* make sure we use the correct errno */ #undef errno @@ -403,6 +404,7 @@ static BOOL init(void) SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); SET(p__vsnwprintf, "_vsnwprintf"); + SET(p___strncnt, "__strncnt"); if (sizeof(void *) == 8) { @@ -1894,6 +1896,35 @@ static void test__vsnwprintf(void) ok(p_set_invalid_parameter_handler(old_handler) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); } +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { NULL, 0, 0 }, + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (0) + ret = p___strncnt(NULL, 1); + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } +} + START_TEST(msvcr90) { if(!init()) @@ -1931,4 +1962,5 @@ START_TEST(msvcr90) #ifdef __i386__ test__fpieee_flt(); #endif + test___strncnt(); } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d963f7cbd9..7faecb261e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -281,7 +281,7 @@ @ cdecl __set_app_type(long) MSVCRT___set_app_type @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -# stub __strncnt(str long) +@ cdecl __strncnt(str long) MSVCRT___strncnt @ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __toascii(long) MSVCRT___toascii diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index cbbb65b249..fc827d8093 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2060,3 +2060,22 @@ char* __cdecl MSVCRT_strpbrk(const char *str, const char *accept) { return strpbrk(str, accept); } + +/********************************************************************* + * __strncnt (MSVCRT.@) + */ +MSVCRT_size_t __cdecl MSVCRT___strncnt(const char *str, MSVCRT_size_t size) +{ + MSVCRT_size_t ret = 0; + +#if _MSVCR_VER >= 140 + while (*str++ && size--) +#else + while (size-- && *str++) +#endif + { + ret++; + } + + return ret; +} diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 670c7cf91f..d0988bf86c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -100,6 +100,7 @@ static size_t (__cdecl *p__mbsnlen)(const unsigned char*, size_t); static int (__cdecl *p__mbccpy_s)(unsigned char*, size_t, int*, const unsigned char*); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); +static size_t (__cdecl *p___strncnt)(const char*, size_t); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -3568,6 +3569,41 @@ static void test__tcsnicoll(void) } } +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { NULL, 0, 0 }, + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (!p___strncnt) + { + win_skip("__strncnt() is not available.\n"); + return; + } + + if (0) /* crashes */ + ret = p___strncnt(NULL, 1); + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } +} + START_TEST(string) { char mem[100]; @@ -3626,6 +3662,7 @@ START_TEST(string) p__mbccpy_s = (void*)GetProcAddress(hMsvcrt, "_mbccpy_s"); p__memicmp = (void*)GetProcAddress(hMsvcrt, "_memicmp"); p__memicmp_l = (void*)GetProcAddress(hMsvcrt, "_memicmp_l"); + p___strncnt = (void*)GetProcAddress(hMsvcrt, "__strncnt"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -3693,4 +3730,5 @@ START_TEST(string) test__strupr(); test__tcsncoll(); test__tcsnicoll(); + test___strncnt(); } diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index ab86f46810..34f5a78b07 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -89,6 +89,7 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, static double (__cdecl *p_strtod)(const char*, char** end); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t,_locale_t); +static size_t (__cdecl *p___strncnt)(const char*, size_t); static BOOL init(void) { @@ -105,6 +106,7 @@ static BOOL init(void) p_strtod = (void*)GetProcAddress(module, "strtod"); p__memicmp = (void*)GetProcAddress(module, "_memicmp"); p__memicmp_l = (void*)GetProcAddress(module, "_memicmp_l"); + p___strncnt = (void*)GetProcAddress(module, "__strncnt"); return TRUE; } @@ -244,10 +246,50 @@ static void test__memicmp_l(void) ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); } + + +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } + + ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + + if (0) /* crashes */ + { + ret = p___strncnt(NULL, 0); + ret = p___strncnt(NULL, 1); + } + + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); +} + START_TEST(string) { if (!init()) return; test_strtod(); test__memicmp(); test__memicmp_l(); + test___strncnt(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 404da75f9a..142ac86913 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -164,7 +164,7 @@ @ cdecl __stdio_common_vswprintf_p(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s @ cdecl __stdio_common_vswscanf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswscanf -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread -- 2.19.1

2 1

[PATCH] testbot: Specify which test units to rerun with the 'test' mission option.
by Francois Gouget Oct. 30, 2018

Oct. 30, 2018

If set to 'all', then any non-test patch will cause a full WineTest run. If set to 'module', then only the patched module's tests will be run. If set to 'test' or unset, then the current behavior is preserved so that only patched test units are run. If set to 'build', then only verify that the patch builds. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/WineReconfig.pl | 8 +++-- testbot/bin/build/WineTest.pl | 43 ++++++++++++++++++++------- testbot/lib/WineTestBot/Missions.pm | 6 +++- testbot/lib/WineTestBot/PatchUtils.pm | 25 +++++++++++----- testbot/web/admin/VMDetails.pl | 1 + 5 files changed, 62 insertions(+), 21 deletions(-) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index f46408b469..53ce319032 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -104,13 +104,15 @@ sub UpdateWinePrefixes($) # Set up brand new WinePrefixes ready for use for testing. # This way we do it once instead of doing it for every test, thus saving # time. Note that this requires using a different wineprefix for each build. - foreach my $Build ("win32", "wow64", "wow32") + foreach my $Mission (@{$TaskMissions->{Missions}}) { - next if (!$TaskMissions->{Builds}->{$Build}); + next if ($Mission->{test} eq "build"); + + SetupWineEnvironment($Build); + InfoMsg "\nRecreating the $Mission->{Build} wineprefix\n"; # Wait for the wineprefix creation to complete so it is really done # before the snapshot gets updated. - SetupWineEnvironment($Build); my $ErrMessage = CreateWinePrefix($Build, "wait"); if (defined $ErrMessage) { diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index c74d1f6562..893a74dd59 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -122,25 +122,48 @@ sub TestPatch($$) { my ($Mission, $Impacts) = @_; + return 1 if ($Mission->{test} eq "build"); + my @TestList; - foreach my $Module (sort keys %{$Impacts->{Tests}}) + if ($Mission->{test} eq "all" and + ($Impacts->{PatchedRoot} or $Impacts->{PatchedModules})) { - my $TestInfo = $Impacts->{Tests}->{$Module}; - if ($TestInfo->{All}) - { - push @TestList, $Module; - } - else + push @TestList, "-m", "do.not.submit"; + } + else + { + foreach my $Module (sort keys %{$Impacts->{Tests}}) { - foreach my $Unit (sort keys %{$TestInfo->{Units}}) + my $TestInfo = $Impacts->{Tests}->{$Module}; + if ($TestInfo->{All} or + ($Mission->{test} eq "module" and $TestInfo->{PatchedModule})) { - push @TestList, "$Module:$Unit"; + # When given a module name WineTest runs all its tests. + # But make sure the module actually has tests first! + push @TestList, $Module if (%{$TestInfo->{Units}}); + } + else + { + foreach my $Unit (sort keys %{$TestInfo->{Units}}) + { + push @TestList, "$Module:$Unit"; + } } } + return 1 if (!@TestList); } - return 1 if (!@TestList); SetupTest("the tests", $Mission); + if (!-d $ENV{WINEPREFIX}) + { + # FIXME Wait for the wineserver as a workaround for bug 41713. + my $ErrMessage = CreateWinePrefix($Mission, "wait"); + if (defined $ErrMessage) + { + LogMsg "Could not create the $Mission->{Build} wineprefix: $ErrMessage\n"; + return 0; + } + } # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 58b33403fb..80c1d97227 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -64,7 +64,11 @@ sub ParseMissionStatement($) } $Build = $1; # untaint $TaskMissions->{Builds}->{$Build} = 1; - my $Mission = { Build => $Build, Statement => $Statement }; + my $Mission = { + Build => $Build, + Statement => $Statement, + test => "test", # Set the default value + }; push @{$TaskMissions->{Missions}}, $Mission; foreach my $Option (@Options) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index fb4f88650f..0e17a70002 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -492,15 +492,26 @@ sub GetTestTimeout($$) { my ($Impacts, $TaskMissions) = @_; - my $Timeout = $SuiteTimeout; - if ($Impacts) + my $Timeout = 0; + foreach my $Mission (@{$TaskMissions->{Missions}}) { - my $UnitCount = $Impacts->{TestUnitCount}; - my $TestsTimeout = min(2, $UnitCount) * $SingleTimeout + - max(0, $UnitCount - 2) * $SingleAvgTime; - $Timeout = min($SuiteTimeout, $TestsTimeout); + if (!$Impacts or ($Mission->{test} eq "all" and + ($Impacts->{PatchedRoot} or $Impacts->{PatchedModules}))) + { + $Timeout += $SuiteTimeout; + } + elsif ($Mission->{test} ne "build") + { + # Note: If only test units have been patched then + # ModuleUnitCount == TestUnitCount. + my $UnitCount = $Mission->{test} eq "test" ? $Impacts->{TestUnitCount} : + $Impacts->{ModuleUnitCount}; + my $TestsTimeout = min(2, $UnitCount) * $SingleTimeout + + max(0, $UnitCount - 2) * $SingleAvgTime; + $Timeout += min($SuiteTimeout, $TestsTimeout); + } } - return @{$TaskMissions->{Missions}} * $Timeout; + return $Timeout; } 1; diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 5f49c684d8..4b7799a8cf 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -78,6 +78,7 @@ sub GenerateFooter($) print "Each mission is composed of a build and options separated by commas: build,option1=value,option2,.... The value can be omitted for boolean options and defaults to true. \n"; print "The supported builds are build for build VMs; exe32 and exe64 for Windows VMs; win32, wow32 and wow64 for Wine VMs.\n"; print "On Wine VMs: \n"; + print "The test option can be set to build to only test building, test to only rerun patched tests, module to rerun all of a patched dll or program's tests, or all to always rerun all the tests. \n"; print "If set, the nosubmit option specifies that the WineTest results should not be published online.\n"; print "</td></tr></tbody>\n"; print "</table></div>\n"; -- 2.19.1

1 0

[PATCH] msvcrt: Implement __strncnt().
by Nikolay Sivov Oct. 30, 2018

Oct. 30, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr100/tests/msvcr100.c | 38 +++++++++++++++ dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr110/tests/msvcr110.c | 32 +++++++++++++ dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 32 +++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 19 ++++++++ dlls/msvcrt/tests/string.c | 38 +++++++++++++++ dlls/ucrtbase/tests/string.c | 48 +++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 15 files changed, 216 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index d045996756..bbc247c79c 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -3,7 +3,7 @@ @ cdecl __iscsymf(long) ucrtbase.__iscsymf @ stub __iswcsym @ stub __iswcsymf -@ stub __strncnt +@ cdecl __strncnt(str long) ucrtbase.__strncnt @ stub __wcsncnt @ cdecl _isalnum_l(long ptr) ucrtbase._isalnum_l @ cdecl _isalpha_l(long ptr) ucrtbase._isalpha_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1579415edc..482dcbbf03 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -656,7 +656,7 @@ @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 594ac28072..9181cb88b6 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -235,6 +235,7 @@ static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t,_locale_t); static char* (__cdecl *p_setlocale)(int, const char*); +static size_t (__cdecl *p___strncnt)(const char*, size_t); /* make sure we use the correct errno */ #undef errno @@ -270,6 +271,7 @@ static BOOL init(void) SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); SET(p_setlocale, "setlocale"); + SET(p___strncnt, "__strncnt"); SET(p_Context_Id, "?Id(a)Context@Concurrency@@SAIXZ"); SET(p_CurrentScheduler_Detach, "?Detach(a)CurrentScheduler@Concurrency@@SAXXZ"); @@ -1075,6 +1077,41 @@ static void test_setlocale(void) ok(!ret, "got %p\n", ret); } +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { NULL, 0, 0 }, + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (!p___strncnt) + { + win_skip("__strncnt() is not available.\n"); + return; + } + + if (0) /* crashes */ + ret = p___strncnt(NULL, 1); + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } +} + START_TEST(msvcr100) { if (!init()) @@ -1094,4 +1131,5 @@ START_TEST(msvcr100) test__memicmp(); test__memicmp_l(); test_setlocale(); + test___strncnt(); } diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 029620f72e..4ad61d4022 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1004,7 +1004,7 @@ @ cdecl __set_app_type(long) MSVCRT___set_app_type @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index dcee5c1ecc..09876131f0 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -32,6 +32,7 @@ #include <locale.h> static char* (CDECL *p_setlocale)(int category, const char* locale); +static size_t (CDECL *p___strncnt)(const char *str, size_t count); static unsigned int (CDECL *p_CurrentScheduler_GetNumberOfVirtualProcessors)(void); static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(void); @@ -50,6 +51,7 @@ static BOOL init(void) } p_setlocale = (void*)GetProcAddress(module, "setlocale"); + p___strncnt = (void*)GetProcAddress(module, "__strncnt"); p_CurrentScheduler_GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?GetNumberOfVirtualProcessors(a)CurrentScheduler@Concurrency@@SAIXZ"); p__CurrentScheduler__GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); p_CurrentScheduler_Id = (void*)GetProcAddress(module, "?Id(a)CurrentScheduler@Concurrency@@SAIXZ"); @@ -112,9 +114,39 @@ static void test_setlocale(void) p_setlocale(LC_ALL, "C"); } +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { NULL, 0, 0 }, + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (0) /* crashes */ + ret = p___strncnt(NULL, 1); + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } +} + START_TEST(msvcr110) { if (!init()) return; test_CurrentScheduler(); /* MUST be first (at least among Concurrency tests) */ test_setlocale(); + test___strncnt(); } diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 89002ed15b..47834e5d62 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -994,7 +994,7 @@ @ cdecl __set_app_type(long) MSVCRT___set_app_type @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index e926bbbf48..e5b26a4746 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -965,7 +965,7 @@ @ stub __report_gsfailure @ extern __setlc_active msvcr120.__setlc_active @ cdecl __setusermatherr(ptr) msvcr120.__setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) msvcr120.__strncnt @ varargs __swprintf_l(ptr wstr ptr) msvcr120.__swprintf_l @ cdecl __sys_errlist() msvcr120.__sys_errlist @ cdecl __sys_nerr() msvcr120.__sys_nerr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7aebe34f23..69355cc1f7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -305,7 +305,7 @@ @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index eb70ff9153..33ec4b2df7 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -289,7 +289,7 @@ @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 777d4fee97..0ba1f1a7b1 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -134,6 +134,7 @@ static int (__cdecl *p__fpieee_flt)(ULONG, EXCEPTION_POINTERS*, int (__cdecl *ha static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist); +static size_t (__cdecl *p___strncnt)(const char *str, size_t count); /* make sure we use the correct errno */ #undef errno @@ -403,6 +404,7 @@ static BOOL init(void) SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); SET(p__vsnwprintf, "_vsnwprintf"); + SET(p___strncnt, "__strncnt"); if (sizeof(void *) == 8) { @@ -1894,6 +1896,35 @@ static void test__vsnwprintf(void) ok(p_set_invalid_parameter_handler(old_handler) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); } +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { NULL, 0, 0 }, + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (0) + ret = p___strncnt(NULL, 1); + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } +} + START_TEST(msvcr90) { if(!init()) @@ -1931,4 +1962,5 @@ START_TEST(msvcr90) #ifdef __i386__ test__fpieee_flt(); #endif + test___strncnt(); } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d963f7cbd9..7faecb261e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -281,7 +281,7 @@ @ cdecl __set_app_type(long) MSVCRT___set_app_type @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -# stub __strncnt(str long) +@ cdecl __strncnt(str long) MSVCRT___strncnt @ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __toascii(long) MSVCRT___toascii diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index cbbb65b249..fc827d8093 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2060,3 +2060,22 @@ char* __cdecl MSVCRT_strpbrk(const char *str, const char *accept) { return strpbrk(str, accept); } + +/********************************************************************* + * __strncnt (MSVCRT.@) + */ +MSVCRT_size_t __cdecl MSVCRT___strncnt(const char *str, MSVCRT_size_t size) +{ + MSVCRT_size_t ret = 0; + +#if _MSVCR_VER >= 140 + while (*str++ && size--) +#else + while (size-- && *str++) +#endif + { + ret++; + } + + return ret; +} diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 670c7cf91f..d0988bf86c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -100,6 +100,7 @@ static size_t (__cdecl *p__mbsnlen)(const unsigned char*, size_t); static int (__cdecl *p__mbccpy_s)(unsigned char*, size_t, int*, const unsigned char*); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); +static size_t (__cdecl *p___strncnt)(const char*, size_t); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -3568,6 +3569,41 @@ static void test__tcsnicoll(void) } } +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { NULL, 0, 0 }, + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (!p___strncnt) + { + win_skip("__strncnt() is not available.\n"); + return; + } + + if (0) /* crashes */ + ret = p___strncnt(NULL, 1); + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } +} + START_TEST(string) { char mem[100]; @@ -3626,6 +3662,7 @@ START_TEST(string) p__mbccpy_s = (void*)GetProcAddress(hMsvcrt, "_mbccpy_s"); p__memicmp = (void*)GetProcAddress(hMsvcrt, "_memicmp"); p__memicmp_l = (void*)GetProcAddress(hMsvcrt, "_memicmp_l"); + p___strncnt = (void*)GetProcAddress(hMsvcrt, "__strncnt"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -3693,4 +3730,5 @@ START_TEST(string) test__strupr(); test__tcsncoll(); test__tcsnicoll(); + test___strncnt(); } diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index ab86f46810..b86ebd9acc 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -89,6 +89,7 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, static double (__cdecl *p_strtod)(const char*, char** end); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t,_locale_t); +static size_t (__cdecl *p___strncnt)(const char*, size_t); static BOOL init(void) { @@ -105,6 +106,7 @@ static BOOL init(void) p_strtod = (void*)GetProcAddress(module, "strtod"); p__memicmp = (void*)GetProcAddress(module, "_memicmp"); p__memicmp_l = (void*)GetProcAddress(module, "_memicmp_l"); + p___strncnt = (void*)GetProcAddress(module, "__strncnt"); return TRUE; } @@ -244,10 +246,56 @@ static void test__memicmp_l(void) ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); } + + +static void test___strncnt(void) +{ + static const struct + { + const char *str; + size_t size; + size_t ret; + } + strncnt_tests[] = + { + { "a", 0, 0 }, + { "a", 1, 1 }, + { "a", 10, 1 }, + { "abc", 1, 1 }, + }; + unsigned int i; + size_t ret; + + if (!p___strncnt) + { + win_skip("__strncnt() is not available.\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(strncnt_tests); ++i) + { + ret = p___strncnt(strncnt_tests[i].str, strncnt_tests[i].size); + ok(ret == strncnt_tests[i].ret, "%u: unexpected return value %u.\n", i, (int)ret); + } + + ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + + if (0) /* crashes */ + { + ret = p___strncnt(NULL, 0); + ret = p___strncnt(NULL, 1); + } + + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); +} + START_TEST(string) { if (!init()) return; test_strtod(); test__memicmp(); test__memicmp_l(); + test___strncnt(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 404da75f9a..142ac86913 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -164,7 +164,7 @@ @ cdecl __stdio_common_vswprintf_p(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s @ cdecl __stdio_common_vswscanf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswscanf -@ stub __strncnt +@ cdecl __strncnt(str long) MSVCRT___strncnt @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread -- 2.19.1

2 2