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

Henri Verbeet : vkd3d-shader: Rename the vkd3d_comparison_func enumeration to vkd3d_shader_comparison_func.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: vkd3d Branch: master Commit: a029687d5f36b81baf0e01eb100564d56d9710a5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a029687d5f36b81baf0e01e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 17 14:32:21 2020 +0430 vkd3d-shader: Rename the vkd3d_comparison_func enumeration to vkd3d_shader_comparison_func. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 20f9678..d6f4aea 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -378,18 +378,18 @@ enum vkd3d_shader_texture_address_mode VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TEXTURE_ADDRESS_MODE), }; -enum vkd3d_comparison_func +enum vkd3d_shader_comparison_func { - VKD3D_COMPARISON_FUNC_NEVER = 1, - VKD3D_COMPARISON_FUNC_LESS = 2, - VKD3D_COMPARISON_FUNC_EQUAL = 3, - VKD3D_COMPARISON_FUNC_LESS_EQUAL = 4, - VKD3D_COMPARISON_FUNC_GREATER = 5, - VKD3D_COMPARISON_FUNC_NOT_EQUAL = 6, - VKD3D_COMPARISON_FUNC_GREATER_EQUAL = 7, - VKD3D_COMPARISON_FUNC_ALWAYS = 8, + VKD3D_SHADER_COMPARISON_FUNC_NEVER = 0x1, + VKD3D_SHADER_COMPARISON_FUNC_LESS = 0x2, + VKD3D_SHADER_COMPARISON_FUNC_EQUAL = 0x3, + VKD3D_SHADER_COMPARISON_FUNC_LESS_EQUAL = 0x4, + VKD3D_SHADER_COMPARISON_FUNC_GREATER = 0x5, + VKD3D_SHADER_COMPARISON_FUNC_NOT_EQUAL = 0x6, + VKD3D_SHADER_COMPARISON_FUNC_GREATER_EQUAL = 0x7, + VKD3D_SHADER_COMPARISON_FUNC_ALWAYS = 0x8, - VKD3D_FORCE_32_BIT_ENUM(VKD3D_COMPARISON_FUNC), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPARISON_FUNC), }; enum vkd3d_static_border_color @@ -409,7 +409,7 @@ struct vkd3d_static_sampler_desc enum vkd3d_shader_texture_address_mode address_w; float mip_lod_bias; unsigned int max_anisotropy; - enum vkd3d_comparison_func comparison_func; + enum vkd3d_shader_comparison_func comparison_func; enum vkd3d_static_border_color border_color; float min_lod; float max_lod;

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_parameter structure to vkd3d_shader_root_parameter.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: vkd3d Branch: master Commit: 4bea4b82e9a0fdabf7c11ee35b094230d29eff42 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4bea4b82e9a0fdabf7c11ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 17 14:32:25 2020 +0430 vkd3d-shader: Rename the vkd3d_root_parameter structure to vkd3d_shader_root_parameter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 18 +++++++++--------- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d55a18d..631cbf5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -467,7 +467,7 @@ enum vkd3d_shader_root_parameter_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_ROOT_PARAMETER_TYPE), }; -struct vkd3d_root_parameter +struct vkd3d_shader_root_parameter { enum vkd3d_shader_root_parameter_type parameter_type; union @@ -496,7 +496,7 @@ enum vkd3d_root_signature_flags struct vkd3d_root_signature_desc { unsigned int parameter_count; - const struct vkd3d_root_parameter *parameters; + const struct vkd3d_shader_root_parameter *parameters; unsigned int static_sampler_count; const struct vkd3d_static_sampler_desc *static_samplers; enum vkd3d_root_signature_flags flags; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index e424aa6..303bedd 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2432,7 +2432,7 @@ static int shader_parse_root_descriptor1(struct root_signature_parser_context *c } static int shader_parse_root_parameters(struct root_signature_parser_context *context, - unsigned int offset, unsigned int count, struct vkd3d_root_parameter *parameters) + unsigned int offset, unsigned int count, struct vkd3d_shader_root_parameter *parameters) { const char *ptr; unsigned int i; @@ -2596,7 +2596,7 @@ static int shader_parse_root_signature(const char *data, unsigned int data_size, v_1_0->parameter_count = count; if (v_1_0->parameter_count) { - struct vkd3d_root_parameter *parameters; + struct vkd3d_shader_root_parameter *parameters; if (!(parameters = vkd3d_calloc(v_1_0->parameter_count, sizeof(*parameters)))) return VKD3D_ERROR_OUT_OF_MEMORY; v_1_0->parameters = parameters; @@ -3181,7 +3181,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_versioned_root_sign return VKD3D_OK; } -static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters, unsigned int count) +static void free_descriptor_ranges(const struct vkd3d_shader_root_parameter *parameters, unsigned int count) { unsigned int i; @@ -3190,14 +3190,14 @@ static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters for (i = 0; i < count; ++i) { - const struct vkd3d_root_parameter *p = &parameters[i]; + const struct vkd3d_shader_root_parameter *p = &parameters[i]; if (p->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges); } } -static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, +static int convert_root_parameters_to_v_1_0(struct vkd3d_shader_root_parameter *dst, const struct vkd3d_root_parameter1 *src, unsigned int count) { const struct vkd3d_shader_descriptor_range1 *ranges1; @@ -3208,7 +3208,7 @@ static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, for (i = 0; i < count; ++i) { const struct vkd3d_root_parameter1 *p1 = &src[i]; - struct vkd3d_root_parameter *p = &dst[i]; + struct vkd3d_shader_root_parameter *p = &dst[i]; p->parameter_type = p1->parameter_type; switch (p->parameter_type) @@ -3264,8 +3264,8 @@ static int convert_root_signature_to_v1_0(struct vkd3d_versioned_root_signature_ { const struct vkd3d_root_signature_desc1 *src_desc = &src->u.v_1_1; struct vkd3d_root_signature_desc *dst_desc = &dst->u.v_1_0; + struct vkd3d_shader_root_parameter *parameters = NULL; struct vkd3d_static_sampler_desc *samplers = NULL; - struct vkd3d_root_parameter *parameters = NULL; int ret; if ((dst_desc->parameter_count = src_desc->parameter_count)) @@ -3317,7 +3317,7 @@ static void free_descriptor_ranges1(const struct vkd3d_root_parameter1 *paramete } static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, - const struct vkd3d_root_parameter *src, unsigned int count) + const struct vkd3d_shader_root_parameter *src, unsigned int count) { const struct vkd3d_shader_descriptor_range *ranges; struct vkd3d_shader_descriptor_range1 *ranges1; @@ -3326,7 +3326,7 @@ static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, for (i = 0; i < count; ++i) { - const struct vkd3d_root_parameter *p = &src[i]; + const struct vkd3d_shader_root_parameter *p = &src[i]; struct vkd3d_root_parameter1 *p1 = &dst[i]; p1->parameter_type = p->parameter_type; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index f7489f6..8dbd17e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -484,7 +484,7 @@ static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_d for (i = 0; i < root_signature->parameter_count; ++i) { - const struct vkd3d_root_parameter *parameter = &root_signature->parameters[i]; + const struct vkd3d_shader_root_parameter *parameter = &root_signature->parameters[i]; if (parameter->parameter_type == VKD3D_SHADER_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) vkd3d_free((void *)parameter->u.descriptor_table.descriptor_ranges);

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_descriptor1 structure to vkd3d_shader_root_descriptor1.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: vkd3d Branch: master Commit: f5e39842fa4fa8e5951aaa62f4a72f26b7e6d14d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f5e39842fa4fa8e5951aaa6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 17 14:32:24 2020 +0430 vkd3d-shader: Rename the vkd3d_root_descriptor1 structure to vkd3d_shader_root_descriptor1. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 83def2d..d55a18d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -540,7 +540,7 @@ struct vkd3d_shader_root_descriptor_table1 const struct vkd3d_shader_descriptor_range1 *descriptor_ranges; }; -struct vkd3d_root_descriptor1 +struct vkd3d_shader_root_descriptor1 { unsigned int shader_register; unsigned int register_space; @@ -554,7 +554,7 @@ struct vkd3d_root_parameter1 { struct vkd3d_shader_root_descriptor_table1 descriptor_table; struct vkd3d_shader_root_constants constants; - struct vkd3d_root_descriptor1 descriptor; + struct vkd3d_shader_root_descriptor1 descriptor; } u; enum vkd3d_shader_visibility shader_visibility; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 5df551b..e424aa6 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2396,7 +2396,7 @@ static int shader_parse_root_descriptor(struct root_signature_parser_context *co return VKD3D_OK; } -static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 *descriptor) +static void shader_validate_root_descriptor1(const struct vkd3d_shader_root_descriptor1 *descriptor) { unsigned int unknown_flags = descriptor->flags & ~(VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_NONE | VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE @@ -2408,7 +2408,7 @@ static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 } static int shader_parse_root_descriptor1(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_descriptor1 *descriptor) + unsigned int offset, struct vkd3d_shader_root_descriptor1 *descriptor) { const char *ptr; @@ -2901,7 +2901,7 @@ static int shader_write_root_descriptor(struct root_signature_writer_context *co } static int shader_write_root_descriptor1(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor1 *descriptor) + const struct vkd3d_shader_root_descriptor1 *descriptor) { if (!write_dword(context, descriptor->shader_register)) return VKD3D_ERROR_OUT_OF_MEMORY;

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_descriptor_table1 structure to vkd3d_shader_root_descriptor_table1.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: vkd3d Branch: master Commit: cb9bf177e9e0b2a5abcc6f8e2ab4cc99a2624415 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cb9bf177e9e0b2a5abcc6f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 17 14:32:23 2020 +0430 vkd3d-shader: Rename the vkd3d_root_descriptor_table1 structure to vkd3d_shader_root_descriptor_table1. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index cbc4562..83def2d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -534,7 +534,7 @@ struct vkd3d_shader_descriptor_range1 unsigned int descriptor_table_offset; }; -struct vkd3d_root_descriptor_table1 +struct vkd3d_shader_root_descriptor_table1 { unsigned int descriptor_range_count; const struct vkd3d_shader_descriptor_range1 *descriptor_ranges; @@ -552,7 +552,7 @@ struct vkd3d_root_parameter1 enum vkd3d_shader_root_parameter_type parameter_type; union { - struct vkd3d_root_descriptor_table1 descriptor_table; + struct vkd3d_shader_root_descriptor_table1 descriptor_table; struct vkd3d_shader_root_constants constants; struct vkd3d_root_descriptor1 descriptor; } u; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 4f19b85..5df551b 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2327,7 +2327,7 @@ static int shader_parse_descriptor_table(struct root_signature_parser_context *c } static int shader_parse_descriptor_table1(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_descriptor_table1 *table) + unsigned int offset, struct vkd3d_shader_root_descriptor_table1 *table) { struct vkd3d_shader_descriptor_range1 *ranges; unsigned int count; @@ -2830,7 +2830,7 @@ static int shader_write_descriptor_ranges(struct root_signature_writer_context * } static int shader_write_descriptor_ranges1(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table1 *table) + const struct vkd3d_shader_root_descriptor_table1 *table) { const struct vkd3d_shader_descriptor_range1 *ranges = table->descriptor_ranges; unsigned int i; @@ -2866,7 +2866,7 @@ static int shader_write_descriptor_table(struct root_signature_writer_context *c } static int shader_write_descriptor_table1(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table1 *table) + const struct vkd3d_shader_root_descriptor_table1 *table) { if (!write_dword(context, table->descriptor_range_count)) return VKD3D_ERROR_OUT_OF_MEMORY; @@ -3072,7 +3072,7 @@ static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descri return VKD3D_OK; } -static int validate_descriptor_table_v_1_1(const struct vkd3d_root_descriptor_table1 *descriptor_table) +static int validate_descriptor_table_v_1_1(const struct vkd3d_shader_root_descriptor_table1 *descriptor_table) { bool have_srv_uav_cbv = false; bool have_sampler = false;

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_static_border_color enumeration to vkd3d_shader_static_border_colour.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: vkd3d Branch: master Commit: 0e9f91419773b4ca3721e67293326b21d3663a9e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0e9f91419773b4ca3721e67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 17 14:32:22 2020 +0430 vkd3d-shader: Rename the vkd3d_static_border_color enumeration to vkd3d_shader_static_border_colour. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 12 ++++++------ libs/vkd3d-shader/dxbc.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d6f4aea..cbc4562 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -392,13 +392,13 @@ enum vkd3d_shader_comparison_func VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPARISON_FUNC), }; -enum vkd3d_static_border_color +enum vkd3d_shader_static_border_colour { - VKD3D_STATIC_BORDER_COLOR_TRANSPARENT_BLACK = 0, - VKD3D_STATIC_BORDER_COLOR_OPAQUE_BLACK = 1, - VKD3D_STATIC_BORDER_COLOR_OPAQUE_WHITE = 2, + VKD3D_SHADER_STATIC_BORDER_COLOUR_TRANSPARENT_BLACK = 0x0, + VKD3D_SHADER_STATIC_BORDER_COLOUR_OPAQUE_BLACK = 0x1, + VKD3D_SHADER_STATIC_BORDER_COLOUR_OPAQUE_WHITE = 0x2, - VKD3D_FORCE_32_BIT_ENUM(VKD3D_STATIC_BORDER_COLOR), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STATIC_BORDER_COLOUR), }; struct vkd3d_static_sampler_desc @@ -410,7 +410,7 @@ struct vkd3d_static_sampler_desc float mip_lod_bias; unsigned int max_anisotropy; enum vkd3d_shader_comparison_func comparison_func; - enum vkd3d_static_border_color border_color; + enum vkd3d_shader_static_border_colour border_colour; float min_lod; float max_lod; unsigned int shader_register; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1fb8dc8..4f19b85 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2549,7 +2549,7 @@ static int shader_parse_static_samplers(struct root_signature_parser_context *co read_float(&ptr, &sampler_descs[i].mip_lod_bias); read_dword(&ptr, &sampler_descs[i].max_anisotropy); read_dword(&ptr, &sampler_descs[i].comparison_func); - read_dword(&ptr, &sampler_descs[i].border_color); + read_dword(&ptr, &sampler_descs[i].border_colour); read_float(&ptr, &sampler_descs[i].min_lod); read_float(&ptr, &sampler_descs[i].max_lod); read_dword(&ptr, &sampler_descs[i].shader_register); @@ -2989,7 +2989,7 @@ static int shader_write_static_samplers(struct root_signature_writer_context *co return VKD3D_ERROR_OUT_OF_MEMORY; if (!write_dword(context, samplers[i].comparison_func)) return VKD3D_ERROR_OUT_OF_MEMORY; - if (!write_dword(context, samplers[i].border_color)) + if (!write_dword(context, samplers[i].border_colour)) return VKD3D_ERROR_OUT_OF_MEMORY; if (!write_float(context, samplers[i].min_lod)) return VKD3D_ERROR_OUT_OF_MEMORY;

1 0

Piotr Caban : msvcrt: Add _ismbcspace_l implementation.
by Alexandre Julliard July 16, 2020

July 16, 2020

Module: wine Branch: master Commit: 4bca5b9f51886279c650b724e61bd5dd4d71f71b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bca5b9f51886279c650b724… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 15:33:25 2020 +0200 msvcrt: Add _ismbcspace_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 11 +++++++++-- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 10 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 1034c20970..3ab70829ca 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -53,7 +53,7 @@ @ cdecl _ismbcpunct(long) ucrtbase._ismbcpunct @ stub _ismbcpunct_l @ cdecl _ismbcspace(long) ucrtbase._ismbcspace -@ stub _ismbcspace_l +@ cdecl _ismbcspace_l(long ptr) ucrtbase._ismbcspace_l @ cdecl _ismbcsymbol(long) ucrtbase._ismbcsymbol @ stub _ismbcsymbol_l @ cdecl _ismbcupper(long) ucrtbase._ismbcupper diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 61992d3a46..22ac50e14a 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -426,7 +426,7 @@ @ cdecl _o__ismbcpunct(long) ucrtbase._o__ismbcpunct @ stub _o__ismbcpunct_l @ cdecl _o__ismbcspace(long) ucrtbase._o__ismbcspace -@ stub _o__ismbcspace_l +@ cdecl _o__ismbcspace_l(long ptr) ucrtbase._o__ismbcspace_l @ cdecl _o__ismbcsymbol(long) ucrtbase._o__ismbcsymbol @ stub _o__ismbcsymbol_l @ cdecl _o__ismbcupper(long) ucrtbase._o__ismbcupper diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 43d92304aa..30aaa302ef 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1001,7 +1001,7 @@ @ cdecl _ismbcpunct(long) @ stub _ismbcpunct_l @ cdecl _ismbcspace(long) -@ stub _ismbcspace_l +@ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcsymbol(long) @ stub _ismbcsymbol_l @ cdecl _ismbcupper(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 0acb77474e..6bf022ac74 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1347,7 +1347,7 @@ @ cdecl _ismbcpunct(long) @ stub _ismbcpunct_l @ cdecl _ismbcspace(long) -@ stub _ismbcspace_l +@ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcsymbol(long) @ stub _ismbcsymbol_l @ cdecl _ismbcupper(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 26ebdd2445..48d58977a7 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1352,7 +1352,7 @@ @ cdecl _ismbcpunct(long) @ stub _ismbcpunct_l @ cdecl _ismbcspace(long) -@ stub _ismbcspace_l +@ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcsymbol(long) @ stub _ismbcsymbol_l @ cdecl _ismbcupper(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 93b5be804d..ddf81b4858 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -673,7 +673,7 @@ @ cdecl _ismbcpunct(long) @ stub _ismbcpunct_l @ cdecl _ismbcspace(long) -@ stub _ismbcspace_l +@ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcsymbol(long) @ stub _ismbcsymbol_l @ cdecl _ismbcupper(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5dccd7cf30..9a86afb37c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -651,7 +651,7 @@ @ cdecl _ismbcpunct(long) @ stub _ismbcpunct_l @ cdecl _ismbcspace(long) -@ stub _ismbcspace_l +@ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcsymbol(long) @ stub _ismbcsymbol_l @ cdecl _ismbcupper(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 59dcbcc4fe..e93aafc44a 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1538,13 +1538,20 @@ int CDECL _ismbcalnum(unsigned int ch) return _ismbcalnum_l( ch, NULL ); } +/********************************************************************* + * _ismbcspace_l (MSVCRT.@) + */ +int CDECL _ismbcspace_l(unsigned int ch, MSVCRT__locale_t locale) +{ + return MSVCRT__iswspace_l( msvcrt_mbc_to_wc_l(ch, locale), locale ); +} + /********************************************************************* * _ismbcspace (MSVCRT.@) */ int CDECL _ismbcspace(unsigned int ch) { - MSVCRT_wchar_t wch = msvcrt_mbc_to_wc( ch ); - return (get_char_typeW( wch ) & C1_SPACE); + return _ismbcspace_l( ch, NULL ); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5f68220d4b..12c4a718e8 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -619,7 +619,7 @@ @ cdecl _ismbcpunct(long) # stub _ismbcpunct_l(long ptr) @ cdecl _ismbcspace(long) -# stub _ismbcspace_l(long ptr) +@ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcsymbol(long) # stub _ismbcsymbol_l(long ptr) @ cdecl _ismbcupper(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2492fec1e6..c93d0cee04 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -491,7 +491,7 @@ @ cdecl _ismbcpunct(long) @ stub _ismbcpunct_l @ cdecl _ismbcspace(long) -@ stub _ismbcspace_l +@ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcsymbol(long) @ stub _ismbcsymbol_l @ cdecl _ismbcupper(long) @@ -1090,7 +1090,7 @@ @ cdecl _o__ismbcpunct(long) _ismbcpunct @ stub _o__ismbcpunct_l @ cdecl _o__ismbcspace(long) _ismbcspace -@ stub _o__ismbcspace_l +@ cdecl _o__ismbcspace_l(long ptr) _ismbcspace_l @ cdecl _o__ismbcsymbol(long) _ismbcsymbol @ stub _o__ismbcsymbol_l @ cdecl _o__ismbcupper(long) _ismbcupper

1 0

Jacek Caban : server: Allow creating console renderer with open_file.
by Alexandre Julliard July 16, 2020

July 16, 2020

Module: wine Branch: master Commit: 5a174dd60446effe39f78ec7b4394e80e2522d98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a174dd60446effe39f78ec7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 16 17:49:55 2020 +0200 server: Allow creating console renderer with open_file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/server/console.c b/server/console.c index 17e11bc7ec..345dd9b4e5 100644 --- a/server/console.c +++ b/server/console.c @@ -124,6 +124,8 @@ static const struct fd_ops console_input_fd_ops = static void console_input_events_dump( struct object *obj, int verbose ); static void console_input_events_destroy( struct object *obj ); static struct fd *console_input_events_get_fd( struct object *obj ); +static struct object *console_input_events_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); struct console_input_events { @@ -152,7 +154,7 @@ static const struct object_ops console_input_events_ops = no_lookup_name, /* lookup_name */ no_link_name, /* link_name */ NULL, /* unlink_name */ - no_open_file, /* open_file */ + console_input_events_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ no_close_handle, /* close_handle */ console_input_events_destroy /* destroy */ @@ -331,6 +333,12 @@ static struct fd *console_input_events_get_fd( struct object* obj ) return (struct fd*)grab_object( evts->fd ); } +static struct object *console_input_events_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + return grab_object( obj ); +} + /* retrieves events from the console's renderer events list */ static int get_renderer_events( struct console_input_events* evts, struct async *async ) { @@ -406,7 +414,7 @@ static void console_input_events_append( struct console_input* console, } } -static struct console_input_events *create_console_input_events(void) +static struct object *create_console_input_events(void) { struct console_input_events* evt; @@ -419,7 +427,7 @@ static struct console_input_events *create_console_input_events(void) release_object( evt ); return NULL; } - return evt; + return &evt->obj; } static struct object *create_console_input( struct thread* renderer, int fd ) @@ -439,7 +447,7 @@ static struct object *create_console_input( struct thread* renderer, int fd ) console_input->active = NULL; console_input->recnum = 0; console_input->records = NULL; - console_input->evt = renderer ? create_console_input_events() : NULL; + console_input->evt = renderer ? (struct console_input_events *)create_console_input_events() : NULL; console_input->title = NULL; console_input->title_len = 0; console_input->history_size = 50; @@ -1747,6 +1755,7 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni static const WCHAR consoleW[] = {'C','o','n','s','o','l','e'}; static const WCHAR current_inW[] = {'C','u','r','r','e','n','t','I','n'}; static const WCHAR current_outW[] = {'C','u','r','r','e','n','t','O','u','t'}; + static const WCHAR rendererW[] = {'R','e','n','d','e','r','e','r'}; if (name->len == sizeof(current_inW) && !memcmp( name->str, current_inW, name->len )) { @@ -1776,6 +1785,12 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni return grab_object( obj ); } + if (name->len == sizeof(rendererW) && !memcmp( name->str, rendererW, name->len )) + { + name->len = 0; + return create_console_input_events(); + } + return NULL; }

1 0

Jacek Caban : server: Remove support for crating renderer in alloc_console request.
by Alexandre Julliard July 16, 2020

July 16, 2020

Module: wine Branch: master Commit: 9415667cdfbb4c94cdfe03a1e80a87482bee98c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9415667cdfbb4c94cdfe03a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 16 17:50:42 2020 +0200 server: Remove support for crating renderer in alloc_console request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/server/console.c b/server/console.c index 4ff433be4e..2785669deb 100644 --- a/server/console.c +++ b/server/console.c @@ -430,7 +430,7 @@ static struct object *create_console_input_events(void) return &evt->obj; } -static struct object *create_console_input( struct thread* renderer, int fd ) +static struct object *create_console_input( int fd ) { struct console_input *console_input; @@ -439,7 +439,7 @@ static struct object *create_console_input( struct thread* renderer, int fd ) if (fd != -1) close( fd ); return NULL; } - console_input->renderer = renderer; + console_input->renderer = NULL; console_input->mode = ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | ENABLE_INSERT_MODE | ENABLE_EXTENDED_FLAGS; @@ -447,7 +447,7 @@ static struct object *create_console_input( struct thread* renderer, int fd ) console_input->active = NULL; console_input->recnum = 0; console_input->records = NULL; - console_input->evt = renderer ? (struct console_input_events *)create_console_input_events() : NULL; + console_input->evt = NULL; console_input->title = NULL; console_input->title_len = 0; console_input->history_size = 50; @@ -462,7 +462,7 @@ static struct object *create_console_input( struct thread* renderer, int fd ) console_input->fd = NULL; init_async_queue( &console_input->read_q ); - if (!console_input->history || (renderer && !console_input->evt) || !console_input->event) + if (!console_input->history || !console_input->event) { if (fd != -1) close( fd ); console_input->history_size = 0; @@ -1844,8 +1844,6 @@ struct object *create_console_device( struct object *root, const struct unicode_ /* allocate a console for the renderer */ DECL_HANDLER(alloc_console) { - obj_handle_t in = 0; - obj_handle_t evt = 0; struct process *process; struct console_input *console; int fd; @@ -1892,31 +1890,17 @@ DECL_HANDLER(alloc_console) { if (fd != -1) close( fd ); set_error( STATUS_ACCESS_DENIED ); - goto the_end; } - - if ((console = (struct console_input*)create_console_input( NULL, fd ))) + else if ((console = (struct console_input*)create_console_input( fd ))) { - if ((in = alloc_handle( current->process, console, req->access, req->attributes ))) + if ((reply->handle_in = alloc_handle( current->process, console, req->access, + req->attributes )) && attach) { - if (!console->evt || - (evt = alloc_handle( current->process, console->evt, SYNCHRONIZE|GENERIC_READ|GENERIC_WRITE, 0 ))) - { - if (attach) - { - process->console = (struct console_input*)grab_object( console ); - console->num_proc++; - } - reply->handle_in = in; - reply->event = evt; - release_object( console ); - goto the_end; - } - close_handle( current->process, in ); + process->console = (struct console_input*)grab_object( console ); + console->num_proc++; } release_object( console ); } - the_end: release_object( process ); }

1 0

Piotr Caban : msvcrt: Add _ismbcpunct_l implementation.
by Alexandre Julliard July 16, 2020

July 16, 2020

Module: wine Branch: master Commit: 986aa52fc41e1cf022cc72a0f40996937bb567dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=986aa52fc41e1cf022cc72a0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 15:33:38 2020 +0200 msvcrt: Add _ismbcpunct_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 11 +++++++++-- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 11 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 4f6a1f7679..84ae0f449b 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -51,7 +51,7 @@ @ cdecl _ismbcprint(long) ucrtbase._ismbcprint @ cdecl _ismbcprint_l(long ptr) ucrtbase._ismbcprint_l @ cdecl _ismbcpunct(long) ucrtbase._ismbcpunct -@ stub _ismbcpunct_l +@ cdecl _ismbcpunct_l(long ptr) ucrtbase._ismbcpunct_l @ cdecl _ismbcspace(long) ucrtbase._ismbcspace @ cdecl _ismbcspace_l(long ptr) ucrtbase._ismbcspace_l @ cdecl _ismbcsymbol(long) ucrtbase._ismbcsymbol diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index c6489ab976..af84ff943b 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -424,7 +424,7 @@ @ cdecl _o__ismbcprint(long) ucrtbase._o__ismbcprint @ cdecl _o__ismbcprint_l(long ptr) ucrtbase._o__ismbcprint_l @ cdecl _o__ismbcpunct(long) ucrtbase._o__ismbcpunct -@ stub _o__ismbcpunct_l +@ cdecl _o__ismbcpunct_l(long ptr) ucrtbase._o__ismbcpunct_l @ cdecl _o__ismbcspace(long) ucrtbase._o__ismbcspace @ cdecl _o__ismbcspace_l(long ptr) ucrtbase._o__ismbcspace_l @ cdecl _o__ismbcsymbol(long) ucrtbase._o__ismbcsymbol diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index f054026dd9..6451fda152 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -999,7 +999,7 @@ @ cdecl _ismbcprint(long) @ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcpunct(long) -@ stub _ismbcpunct_l +@ cdecl _ismbcpunct_l(long ptr) @ cdecl _ismbcspace(long) @ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcsymbol(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 3a4ed8f6d1..abfbb846b3 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1345,7 +1345,7 @@ @ stub _ismbcprint(long) @ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcpunct(long) -@ stub _ismbcpunct_l +@ cdecl _ismbcpunct_l(long ptr) @ cdecl _ismbcspace(long) @ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcsymbol(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 3d295f8324..00a1c3e49e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1350,7 +1350,7 @@ @ cdecl _ismbcprint(long) @ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcpunct(long) -@ stub _ismbcpunct_l +@ cdecl _ismbcpunct_l(long ptr) @ cdecl _ismbcspace(long) @ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcsymbol(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 55e43e6c51..aaa1b499c5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -671,7 +671,7 @@ @ cdecl _ismbcprint(long) @ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcpunct(long) -@ stub _ismbcpunct_l +@ cdecl _ismbcpunct_l(long ptr) @ cdecl _ismbcspace(long) @ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcsymbol(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 55df1046f5..9267c5b1dd 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -649,7 +649,7 @@ @ cdecl _ismbcprint(long) @ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcpunct(long) -@ stub _ismbcpunct_l +@ cdecl _ismbcpunct_l(long ptr) @ cdecl _ismbcspace(long) @ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcsymbol(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index a6b5e6d4db..359ab6fdf4 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1570,13 +1570,20 @@ int CDECL _ismbcprint(unsigned int ch) return _ismbcprint_l( ch, NULL ); } +/********************************************************************* + * _ismbcpunct_l (MSVCRT.@) + */ +int CDECL _ismbcpunct_l(unsigned int ch, MSVCRT__locale_t locale) +{ + return MSVCRT__iswpunct_l( msvcrt_mbc_to_wc_l(ch, locale), locale ); +} + /********************************************************************* * _ismbcpunct(MSVCRT.@) */ int CDECL _ismbcpunct(unsigned int ch) { - MSVCRT_wchar_t wch = msvcrt_mbc_to_wc( ch ); - return (get_char_typeW( wch ) & C1_PUNCT); + return _ismbcpunct_l( ch, NULL ); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 68245f6fdc..9395b7ecac 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1208,6 +1208,7 @@ int __cdecl MSVCRT__iswalpha_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswlower_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswupper_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswprint_l(MSVCRT_wchar_t, MSVCRT__locale_t); +int __cdecl MSVCRT__iswpunct_l(MSVCRT_wchar_t, MSVCRT__locale_t); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 79918ae7ab..1d26169cc1 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -617,7 +617,7 @@ @ cdecl _ismbcprint(long) @ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcpunct(long) -# stub _ismbcpunct_l(long ptr) +@ cdecl _ismbcpunct_l(long ptr) @ cdecl _ismbcspace(long) @ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcsymbol(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c20e3f0b55..8493ae79ba 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -489,7 +489,7 @@ @ cdecl _ismbcprint(long) @ cdecl _ismbcprint_l(long ptr) @ cdecl _ismbcpunct(long) -@ stub _ismbcpunct_l +@ cdecl _ismbcpunct_l(long ptr) @ cdecl _ismbcspace(long) @ cdecl _ismbcspace_l(long ptr) @ cdecl _ismbcsymbol(long) @@ -1088,7 +1088,7 @@ @ cdecl _o__ismbcprint(long) _ismbcprint @ cdecl _o__ismbcprint_l(long ptr) _ismbcprint_l @ cdecl _o__ismbcpunct(long) _ismbcpunct -@ stub _o__ismbcpunct_l +@ cdecl _o__ismbcpunct_l(long ptr) _ismbcpunct_l @ cdecl _o__ismbcspace(long) _ismbcspace @ cdecl _o__ismbcspace_l(long ptr) _ismbcspace_l @ cdecl _o__ismbcsymbol(long) _ismbcsymbol

1 0

Piotr Caban : msvcrt: Add _ismbcupper_l implementation.
by Alexandre Julliard July 16, 2020

July 16, 2020

Module: wine Branch: master Commit: 95b3ff9f74ada220295128ceee34a8e191b93baa URL: https://source.winehq.org/git/wine.git/?a=commit;h=95b3ff9f74ada220295128ce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 15:33:19 2020 +0200 msvcrt: Add _ismbcupper_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 11 +++++++++-- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 11 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 1131c6876e..1034c20970 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -57,7 +57,7 @@ @ cdecl _ismbcsymbol(long) ucrtbase._ismbcsymbol @ stub _ismbcsymbol_l @ cdecl _ismbcupper(long) ucrtbase._ismbcupper -@ stub _ismbcupper_l +@ cdecl _ismbcupper_l(long ptr) ucrtbase._ismbcupper_l @ cdecl _ismbslead(ptr ptr) ucrtbase._ismbslead @ stub _ismbslead_l @ cdecl _ismbstrail(ptr ptr) ucrtbase._ismbstrail diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index b5b2aa783a..61992d3a46 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -430,7 +430,7 @@ @ cdecl _o__ismbcsymbol(long) ucrtbase._o__ismbcsymbol @ stub _o__ismbcsymbol_l @ cdecl _o__ismbcupper(long) ucrtbase._o__ismbcupper -@ stub _o__ismbcupper_l +@ cdecl _o__ismbcupper_l(long ptr) ucrtbase._o__ismbcupper_l @ cdecl _o__ismbslead(ptr ptr) ucrtbase._o__ismbslead @ stub _o__ismbslead_l @ cdecl _o__ismbstrail(ptr ptr) ucrtbase._o__ismbstrail diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index cf1b51a4a9..43d92304aa 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1005,7 +1005,7 @@ @ cdecl _ismbcsymbol(long) @ stub _ismbcsymbol_l @ cdecl _ismbcupper(long) -@ stub _ismbcupper_l +@ cdecl _ismbcupper_l(long ptr) @ cdecl _ismbslead(ptr ptr) @ stub _ismbslead_l @ cdecl _ismbstrail(ptr ptr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d3bd29417c..0acb77474e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1351,7 +1351,7 @@ @ cdecl _ismbcsymbol(long) @ stub _ismbcsymbol_l @ cdecl _ismbcupper(long) -@ stub _ismbcupper_l +@ cdecl _ismbcupper_l(long ptr) @ cdecl _ismbslead(ptr ptr) @ stub _ismbslead_l @ cdecl _ismbstrail(ptr ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 604830ac60..26ebdd2445 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1356,7 +1356,7 @@ @ cdecl _ismbcsymbol(long) @ stub _ismbcsymbol_l @ cdecl _ismbcupper(long) -@ stub _ismbcupper_l +@ cdecl _ismbcupper_l(long ptr) @ cdecl _ismbslead(ptr ptr) @ stub _ismbslead_l @ cdecl _ismbstrail(ptr ptr) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ca668cda12..93b5be804d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -677,7 +677,7 @@ @ cdecl _ismbcsymbol(long) @ stub _ismbcsymbol_l @ cdecl _ismbcupper(long) -@ stub _ismbcupper_l +@ cdecl _ismbcupper_l(long ptr) @ cdecl _ismbslead(ptr ptr) @ stub _ismbslead_l @ cdecl _ismbstrail(ptr ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 77a9514271..5dccd7cf30 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -655,7 +655,7 @@ @ cdecl _ismbcsymbol(long) @ stub _ismbcsymbol_l @ cdecl _ismbcupper(long) -@ stub _ismbcupper_l +@ cdecl _ismbcupper_l(long ptr) @ cdecl _ismbslead(ptr ptr) @ stub _ismbslead_l @ cdecl _ismbstrail(ptr ptr) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index dccfce4448..59dcbcc4fe 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1491,13 +1491,20 @@ int CDECL _ismbclower(unsigned int ch) return _ismbclower_l( ch, NULL ); } +/********************************************************************* + * _ismbcupper_l (MSVCRT.@) + */ +int CDECL _ismbcupper_l(unsigned int ch, MSVCRT__locale_t locale) +{ + return MSVCRT__iswupper_l( msvcrt_mbc_to_wc_l(ch, locale), locale ); +} + /********************************************************************* * _ismbcupper (MSVCRT.@) */ int CDECL _ismbcupper(unsigned int ch) { - MSVCRT_wchar_t wch = msvcrt_mbc_to_wc( ch ); - return (get_char_typeW( wch ) & C1_LOWER); + return _ismbcupper_l( ch, NULL ); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a5a1bf64bc..492fdf26bc 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1206,6 +1206,7 @@ int __cdecl MSVCRT__iswdigit_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswgraph_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswalpha_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswlower_l(MSVCRT_wchar_t, MSVCRT__locale_t); +int __cdecl MSVCRT__iswupper_l(MSVCRT_wchar_t, MSVCRT__locale_t); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index bcea57a7e3..5f68220d4b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -623,7 +623,7 @@ @ cdecl _ismbcsymbol(long) # stub _ismbcsymbol_l(long ptr) @ cdecl _ismbcupper(long) -# stub _ismbcupper_l(long ptr) +@ cdecl _ismbcupper_l(long ptr) @ cdecl _ismbslead(ptr ptr) # stub _ismbslead_l(long ptr) @ cdecl _ismbstrail(ptr ptr) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 68b61fece9..2492fec1e6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -495,7 +495,7 @@ @ cdecl _ismbcsymbol(long) @ stub _ismbcsymbol_l @ cdecl _ismbcupper(long) -@ stub _ismbcupper_l +@ cdecl _ismbcupper_l(long ptr) @ cdecl _ismbslead(ptr ptr) @ stub _ismbslead_l @ cdecl _ismbstrail(ptr ptr) @@ -1094,7 +1094,7 @@ @ cdecl _o__ismbcsymbol(long) _ismbcsymbol @ stub _o__ismbcsymbol_l @ cdecl _o__ismbcupper(long) _ismbcupper -@ stub _o__ismbcupper_l +@ cdecl _o__ismbcupper_l(long ptr) _ismbcupper_l @ cdecl _o__ismbslead(ptr ptr) _ismbslead @ stub _o__ismbslead_l @ cdecl _o__ismbstrail(ptr ptr) _ismbstrail

1 0