November 2023 - Wine-commits

Henri Verbeet : vkd3d-compiler: Slightly reword the --semantic-compat-map usage text.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: vkd3d Branch: master Commit: 4c4843126e0a8f3d6c309554f4f53b01757ad277 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4c4843126e0a8f3d6c309554f4f53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 5 00:28:47 2023 +0100 vkd3d-compiler: Slightly reword the --semantic-compat-map usage text. --- programs/vkd3d-compiler/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 2e5f2b97..51eb15e8 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -185,8 +185,6 @@ static void print_usage(const char *program_name) " --matrix-storage-order=<order>\n" " Specify default matrix storage order. Valid values are\n" " 'column' (default) and 'row'.\n" - " --semantic-compat-map Enable semantic mapping compatibility mode to use SM4+ system values\n" - " instead of SM1-3 style semantic names when compiling from HLSL sources.\n" " -e, --entry=<name> Use <name> as the entry point (default is \"main\").\n" " -E Preprocess the source code instead of compiling it.\n" " -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n" @@ -201,6 +199,8 @@ static void print_usage(const char *program_name) " --print-target-types Display the supported target types for the specified\n" " source type and exit.\n" " -p, --profile=<name> Specify the target shader profile for HLSL shaders.\n" + " --semantic-compat-map Map shader model 1-3 semantic names to shader model 4+\n" + " system values when compiling HLSL sources.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" " -x <type> Specify the type of the source. Use --print-source-types\n"

1 0

Henri Verbeet : vkd3d-compiler: Sort the options in the usage text.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: vkd3d Branch: master Commit: 375b3e0db3c87dbc261c15a51e32eed23399c0ed URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/375b3e0db3c87dbc261c15a51e32e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 5 00:22:10 2023 +0100 vkd3d-compiler: Sort the options in the usage text. --- programs/vkd3d-compiler/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 51eb15e8..2d10baca 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -182,19 +182,19 @@ static void print_usage(const char *program_name) " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n" - " --matrix-storage-order=<order>\n" - " Specify default matrix storage order. Valid values are\n" - " 'column' (default) and 'row'.\n" " -e, --entry=<name> Use <name> as the entry point (default is \"main\").\n" " -E Preprocess the source code instead of compiling it.\n" - " -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n" - " output file is specified, output will be written to\n" - " standard output.\n" " --formatting=<flags> Specify the formatting options for text output.\n" " <flags> is a comma separated list of formatting flags,\n" " optionally prefixed by '+' or '-'. Valid flags are\n" " 'colour', 'indent', 'offsets', 'header', and 'raw-ids'.\n" " The 'indent' and 'header' flags are enabled by default.\n" + " --matrix-storage-order=<order>\n" + " Specify the default matrix storage order. Valid values\n" + " are 'column' (default) and 'row'.\n" + " -o, --output=<file> Write the output to <file>. If <file> is '-' or no\n" + " output file is specified, output will be written to\n" + " standard output.\n" " --print-source-types Display the supported source types and exit.\n" " --print-target-types Display the supported target types for the specified\n" " source type and exit.\n"

1 0

Zebediah Figura : tests: Add more semantics to test_nop_tessellation_shaders().
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: vkd3d Branch: master Commit: 0805ce121ed3103fe08e044112a513c6fc27e0f6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0805ce121ed3103fe08e044112a51… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 7 19:47:07 2023 -0600 tests: Add more semantics to test_nop_tessellation_shaders(). To act as a regression test for 852eefc01df90c4202212944ecc4af4bac7a5fae. --- tests/d3d12.c | 230 ++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 160 insertions(+), 70 deletions(-)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add tex2Dlod() function.
by Alexandre Julliard 08 Nov '23

08 Nov '23

Module: vkd3d Branch: master Commit: 522a0dfb564d54ba1122f91eb49694bb3e9ddb24 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/522a0dfb564d54ba1122f91eb4969… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 26 11:41:57 2023 +0200 vkd3d-shader/hlsl: Add tex2Dlod() function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 46 +++++++++++++++++++++++++++++++++---- tests/hlsl/sample-level.shader_test | 24 +++++++++++++++++++ 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 0e72a539..77f6eaed 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3547,7 +3547,7 @@ static bool intrinsic_tan(struct hlsl_ctx *ctx, static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc, const char *name, enum hlsl_sampler_dim dim) { - struct hlsl_resource_load_params load_params = {.type = HLSL_RESOURCE_SAMPLE}; + struct hlsl_resource_load_params load_params = { 0 }; const struct hlsl_type *sampler_type; struct hlsl_ir_node *coords, *load; @@ -3576,10 +3576,41 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer * hlsl_release_string_buffer(ctx, string); } - if (!(coords = add_implicit_conversion(ctx, params->instrs, params->args[1], - hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, hlsl_sampler_dim_count(dim)), loc))) + if (!strcmp(name, "tex2Dlod")) { - return false; + struct hlsl_ir_node *lod, *c; + + load_params.type = HLSL_RESOURCE_SAMPLE_LOD; + + if (!(c = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(X, Y, Z, W), hlsl_sampler_dim_count(dim), params->args[1], loc))) + return false; + hlsl_block_add_instr(params->instrs, c); + + if (!(coords = add_implicit_conversion(ctx, params->instrs, c, hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, + hlsl_sampler_dim_count(dim)), loc))) + { + return false; + } + + if (!(lod = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(W, W, W, W), 1, params->args[1], loc))) + return false; + hlsl_block_add_instr(params->instrs, lod); + + if (!(load_params.lod = add_implicit_conversion(ctx, params->instrs, lod, + hlsl_get_scalar_type(ctx, HLSL_TYPE_FLOAT), loc))) + { + return false; + } + } + else + { + load_params.type = HLSL_RESOURCE_SAMPLE; + + if (!(coords = add_implicit_conversion(ctx, params->instrs, params->args[1], + hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, hlsl_sampler_dim_count(dim)), loc))) + { + return false; + } } /* tex1D() functions never produce 1D resource declarations. For newer profiles half offset @@ -3638,6 +3669,12 @@ static bool intrinsic_tex2D(struct hlsl_ctx *ctx, return intrinsic_tex(ctx, params, loc, "tex2D", HLSL_SAMPLER_DIM_2D); } +static bool intrinsic_tex2Dlod(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + return intrinsic_tex(ctx, params, loc, "tex2Dlod", HLSL_SAMPLER_DIM_2D); +} + static bool intrinsic_tex3D(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3822,6 +3859,7 @@ intrinsic_functions[] = {"tan", 1, true, intrinsic_tan}, {"tex1D", -1, false, intrinsic_tex1D}, {"tex2D", -1, false, intrinsic_tex2D}, + {"tex2Dlod", 2, false, intrinsic_tex2Dlod}, {"tex3D", -1, false, intrinsic_tex3D}, {"texCUBE", -1, false, intrinsic_texCUBE}, {"transpose", 1, true, intrinsic_transpose}, diff --git a/tests/hlsl/sample-level.shader_test b/tests/hlsl/sample-level.shader_test index c91c6549..8b2890ff 100644 --- a/tests/hlsl/sample-level.shader_test +++ b/tests/hlsl/sample-level.shader_test @@ -34,3 +34,27 @@ probe all rgba (0.5, 0.0, 1.0, 0.0) uniform 0 float4 1.0 0.0 0.0 0.0 todo(sm>=6) draw quad probe all rgba (0.0, 0.0, 1.0, 0.0) + +[require] +shader model >= 3.0 +options: backcompat + +[pixel shader fail(sm>=6)] +sampler s; +float level; + +float4 main() : sv_target +{ + return tex2Dlod(s, float4(0.5, 0.5, 0, level)); +} + +[test] +uniform 0 float4 0.0 0.0 0.0 0.0 +draw quad +probe all rgba (1.0, 0.0, 1.0, 0.0) +uniform 0 float4 0.5 0.0 0.0 0.0 +draw quad +probe all rgba (0.5, 0.0, 1.0, 0.0) +uniform 0 float4 1.0 0.0 0.0 0.0 +draw quad +probe all rgba (0.0, 0.0, 1.0, 0.0)

1 0

Alex Henrie : ddrawex: Use CRT allocation functions.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: 9365e6f682489a1654ee8e64223c3209d44e4651 URL: https://gitlab.winehq.org/wine/wine/-/commit/9365e6f682489a1654ee8e64223c32… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Nov 4 21:11:55 2023 -0600 ddrawex: Use CRT allocation functions. --- dlls/ddrawex/ddraw.c | 6 +++--- dlls/ddrawex/ddrawex_private.h | 2 -- dlls/ddrawex/main.c | 10 +++++----- dlls/ddrawex/surface.c | 4 ++-- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c index 4affc43ff3e..a03683b6c2f 100644 --- a/dlls/ddrawex/ddraw.c +++ b/dlls/ddrawex/ddraw.c @@ -165,7 +165,7 @@ static ULONG WINAPI ddrawex4_Release(IDirectDraw4 *iface) if (!refcount) { IDirectDraw4_Release(ddrawex->parent); - heap_free(ddrawex); + free(ddrawex); } return refcount; @@ -1425,7 +1425,7 @@ HRESULT WINAPI ddrawex_factory_CreateDirectDraw(IDirectDrawFactory *iface, GUID if (outer_unknown) FIXME("Implement aggregation in ddrawex's IDirectDraw interface.\n"); - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->ref = 1; @@ -1450,7 +1450,7 @@ err: IDirectDraw4_Release(object->parent); if (parent) IDirectDraw_Release(parent); - heap_free(object); + free(object); *ddraw = NULL; return hr; } diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index f60d3cb4e1b..9277ac354e4 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -19,8 +19,6 @@ #ifndef __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H #define __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H -#include "wine/heap.h" - DEFINE_GUID(CLSID_DirectDrawFactory, 0x4fd2a832, 0x86c8, 0x11d0, 0x8f, 0xca, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d); DEFINE_GUID(IID_IDirectDrawFactory, 0x4fd2a833, 0x86c8, 0x11d0, 0x8f, 0xca, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d); diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index fd6d7219c12..32449ad7cea 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -82,7 +82,7 @@ static ULONG WINAPI ddrawex_class_factory_Release(IClassFactory *iface) TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) - heap_free(factory); + free(factory); return refcount; } @@ -161,7 +161,7 @@ static ULONG WINAPI ddrawex_factory_Release(IDirectDrawFactory *iface) TRACE("%p decreasing refcount to %lu.\n", iface, refcount); if (!refcount) - heap_free(factory); + free(factory); return refcount; } @@ -193,13 +193,13 @@ static HRESULT ddrawex_factory_create(IUnknown *outer_unknown, REFIID riid, void if (outer_unknown) return CLASS_E_NOAGGREGATION; - if (!(factory = heap_alloc_zero(sizeof(*factory)))) + if (!(factory = calloc(1, sizeof(*factory)))) return E_OUTOFMEMORY; factory->IDirectDrawFactory_iface.lpVtbl = &ddrawex_factory_vtbl; if (FAILED(hr = ddrawex_factory_QueryInterface(&factory->IDirectDrawFactory_iface, riid, out))) - heap_free(factory); + free(factory); return hr; } @@ -223,7 +223,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) return CLASS_E_CLASSNOTAVAILABLE; } - if (!(factory = heap_alloc_zero(sizeof(*factory)))) + if (!(factory = calloc(1, sizeof(*factory)))) return E_OUTOFMEMORY; factory->IClassFactory_iface.lpVtbl = &ddrawex_class_factory_vtbl; diff --git a/dlls/ddrawex/surface.c b/dlls/ddrawex/surface.c index cc18494905c..d5cc6ffab82 100644 --- a/dlls/ddrawex/surface.c +++ b/dlls/ddrawex/surface.c @@ -124,7 +124,7 @@ static ULONG WINAPI ddrawex_surface4_Release(IDirectDrawSurface4 *iface) { IDirectDrawSurface4_FreePrivateData(surface->parent, &IID_DDrawexPriv); IDirectDrawSurface4_Release(surface->parent); - heap_free(surface); + free(surface); } return refcount; @@ -1208,7 +1208,7 @@ IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner) struct ddrawex_surface *impl; TRACE("Creating new ddrawex surface wrapper for surface %p\n", inner); - impl = heap_alloc_zero(sizeof(*impl)); + impl = calloc(1, sizeof(*impl)); impl->ref = 1; impl->IDirectDrawSurface3_iface.lpVtbl = &ddrawex_surface3_vtbl; impl->IDirectDrawSurface4_iface.lpVtbl = &ddrawex_surface4_vtbl;

1 0

Bartosz Kosiorek : msvcrt: Add _mbsnbcat_s_l implementation.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: a6ed3d554ef90f6cf82db3cb7e14a4dec4d1fac8 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6ed3d554ef90f6cf82db3cb7e14a4… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Mon Nov 6 20:04:55 2023 +0100 msvcrt: Add _mbsnbcat_s_l implementation. --- 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 | 27 +++++++++++++++++++++------ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 8 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 36452977926..0f57555e454 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1126,7 +1126,7 @@ @ cdecl _mbsnbcat(str str long) @ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) -@ stub _mbsnbcat_s_l +@ cdecl _mbsnbcat_s_l(str long ptr long ptr) @ cdecl _mbsnbcmp(str str long) @ cdecl _mbsnbcmp_l(str str long ptr) @ cdecl _mbsnbcnt(ptr long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b057d5b85ad..072cef0f0c9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1483,7 +1483,7 @@ @ cdecl _mbsnbcat(str str long) @ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) -@ stub _mbsnbcat_s_l +@ cdecl _mbsnbcat_s_l(str long ptr long ptr) @ cdecl _mbsnbcmp(str str long) @ cdecl _mbsnbcmp_l(str str long ptr) @ cdecl _mbsnbcnt(ptr long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5f24c3f7971..55a0a4b1d2d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1494,7 +1494,7 @@ @ cdecl _mbsnbcat(str str long) @ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) -@ stub _mbsnbcat_s_l +@ cdecl _mbsnbcat_s_l(str long ptr long ptr) @ cdecl _mbsnbcmp(str str long) @ cdecl _mbsnbcmp_l(str str long ptr) @ cdecl _mbsnbcnt(ptr long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 42e215d7f79..38d157f8a9a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -798,7 +798,7 @@ @ cdecl _mbsnbcat(str str long) @ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) -@ stub _mbsnbcat_s_l +@ cdecl _mbsnbcat_s_l(str long ptr long ptr) @ cdecl _mbsnbcmp(str str long) @ cdecl _mbsnbcmp_l(str str long ptr) @ cdecl _mbsnbcnt(ptr long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index be847415309..58cb3ef2e92 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -776,7 +776,7 @@ @ cdecl _mbsnbcat(str str long) @ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) -@ stub _mbsnbcat_s_l +@ cdecl _mbsnbcat_s_l(str long ptr long ptr) @ cdecl _mbsnbcmp(str str long) @ cdecl _mbsnbcmp_l(str str long ptr) @ cdecl _mbsnbcnt(ptr long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 01d290b2647..245dc843ba2 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2336,20 +2336,22 @@ unsigned char* CDECL _mbsnbcat(unsigned char *dst, const unsigned char *src, siz return _mbsnbcat_l(dst, src, len, NULL); } -int CDECL _mbsnbcat_s(unsigned char *dst, size_t size, const unsigned char *src, size_t len) +/********************************************************************* + * _mbsnbcat_s_l(MSVCRT.@) + */ +int CDECL _mbsnbcat_s_l(unsigned char *dst, size_t size, const unsigned char *src, size_t len, _locale_t locale) { unsigned char *ptr = dst; size_t i; + pthreadmbcinfo mbcinfo; - if (!dst && !size && !src && !len) + if (!dst && !size && !len) return 0; - if (!dst || !size || !src) + if (!MSVCRT_CHECK_PMT(dst && size && src)) { if (dst && size) *dst = '\0'; - - *_errno() = EINVAL; return EINVAL; } @@ -2364,9 +2366,14 @@ int CDECL _mbsnbcat_s(unsigned char *dst, size_t size, const unsigned char *src, return EINVAL; } + if (locale) + mbcinfo = locale->mbcinfo; + else + mbcinfo = get_mbcinfo(); + /* If necessary, check that the character preceding the null terminator is * a lead byte and move the pointer back by one for later overwrite. */ - if (ptr != dst && get_mbcinfo()->ismbcodepage && _ismbblead(*(ptr - 1))) + if (ptr != dst && mbcinfo->ismbcodepage && _ismbblead_l(*(ptr - 1), locale)) size++, ptr--; for (i = 0; *src && i < len; i++) @@ -2386,6 +2393,14 @@ int CDECL _mbsnbcat_s(unsigned char *dst, size_t size, const unsigned char *src, return 0; } +/********************************************************************* + * _mbsnbcat_s(MSVCRT.@) + */ +int CDECL _mbsnbcat_s(unsigned char *dst, size_t size, const unsigned char *src, size_t len) +{ + return _mbsnbcat_s_l(dst, size, src, len, NULL); +} + /********************************************************************* * _mbsncat(MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a997a4e61d5..738279a2cd3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -747,7 +747,7 @@ @ cdecl _mbsnbcat(str str long) @ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) -# stub _mbsnbcat_s_l(str long ptr long ptr) +@ cdecl _mbsnbcat_s_l(str long ptr long ptr) @ cdecl _mbsnbcmp(str str long) @ cdecl _mbsnbcmp_l(str str long ptr) @ cdecl _mbsnbcnt(ptr long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index f0b078e09e7..46cea0359b4 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -642,7 +642,7 @@ @ cdecl _mbsnbcat(str str long) @ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) -@ stub _mbsnbcat_s_l +@ cdecl _mbsnbcat_s_l(str long ptr long ptr) @ cdecl _mbsnbcmp(str str long) @ cdecl _mbsnbcmp_l(str str long ptr) @ cdecl _mbsnbcnt(ptr long) @@ -1211,7 +1211,7 @@ @ cdecl _o__mbsnbcat(str str long) _mbsnbcat @ cdecl _o__mbsnbcat_l(str str long ptr) _mbsnbcat_l @ cdecl _o__mbsnbcat_s(str long ptr long) _mbsnbcat_s -@ stub _o__mbsnbcat_s_l +@ cdecl _o__mbsnbcat_s_l(str long ptr long ptr) _mbsnbcat_s_l @ cdecl _o__mbsnbcmp(str str long) _mbsnbcmp @ cdecl _o_mbsnbcmp_l(str str long ptr) _mbsnbcmp_l @ cdecl _o__mbsnbcnt(ptr long) _mbsnbcnt

1 0

Bartosz Kosiorek : msvcrt: Add _mbsnbcpy_l implementation.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: bf9ac906e5041d7ab766f63858b04f719f832a5d URL: https://gitlab.winehq.org/wine/wine/-/commit/bf9ac906e5041d7ab766f63858b04f… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Mon Nov 6 20:15:48 2023 +0100 msvcrt: Add _mbsnbcpy_l implementation. --- 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 | 67 +++++++++++++++++++++++++++++---------------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +-- 8 files changed, 51 insertions(+), 32 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0f57555e454..884289175c0 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1134,7 +1134,7 @@ @ cdecl _mbsnbcoll(str str long) @ cdecl _mbsnbcoll_l(str str long ptr) @ cdecl _mbsnbcpy(ptr str long) -@ stub _mbsnbcpy_l +@ cdecl _mbsnbcpy_l(ptr str long ptr) @ cdecl _mbsnbcpy_s(ptr long str long) @ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 072cef0f0c9..89bb35c7dba 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1491,7 +1491,7 @@ @ cdecl _mbsnbcoll(str str long) @ cdecl _mbsnbcoll_l(str str long ptr) @ cdecl _mbsnbcpy(ptr str long) -@ stub _mbsnbcpy_l +@ cdecl _mbsnbcpy_l(ptr str long ptr) @ cdecl _mbsnbcpy_s(ptr long str long) @ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 55a0a4b1d2d..1be83715d23 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1502,7 +1502,7 @@ @ cdecl _mbsnbcoll(str str long) @ cdecl _mbsnbcoll_l(str str long ptr) @ cdecl _mbsnbcpy(ptr str long) -@ stub _mbsnbcpy_l +@ cdecl _mbsnbcpy_l(ptr str long ptr) @ cdecl _mbsnbcpy_s(ptr long str long) @ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 38d157f8a9a..78172dbc104 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -806,7 +806,7 @@ @ cdecl _mbsnbcoll(str str long) @ cdecl _mbsnbcoll_l(str str long ptr) @ cdecl _mbsnbcpy(ptr str long) -@ stub _mbsnbcpy_l +@ cdecl _mbsnbcpy_l(ptr str long ptr) @ cdecl _mbsnbcpy_s(ptr long str long) @ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 58cb3ef2e92..c1736877ff5 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -784,7 +784,7 @@ @ cdecl _mbsnbcoll(str str long) @ cdecl _mbsnbcoll_l(str str long ptr) @ cdecl _mbsnbcpy(ptr str long) -@ stub _mbsnbcpy_l +@ cdecl _mbsnbcpy_l(ptr str long ptr) @ cdecl _mbsnbcpy_s(ptr long str long) @ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 245dc843ba2..38ace70cd7e 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -993,39 +993,58 @@ int CDECL _mbscpy_s(unsigned char *dst, size_t size, const unsigned char *src) } /********************************************************************* - * _mbsnbcpy(MSVCRT.@) + * _mbsnbcpy_l(MSVCRT.@) * REMARKS * Like strncpy this function doesn't enforce the string to be * NUL-terminated */ -unsigned char* CDECL _mbsnbcpy(unsigned char* dst, const unsigned char* src, size_t n) +unsigned char* CDECL _mbsnbcpy_l(unsigned char* dst, const unsigned char* src, size_t n, _locale_t locale) { - unsigned char* ret = dst; - if(!n) - return dst; - if(get_mbcinfo()->ismbcodepage) - { - BOOL is_lead = FALSE; - while (*src && n) + unsigned char* ret = dst; + pthreadmbcinfo mbcinfo; + + if (!n) + return dst; + if (!MSVCRT_CHECK_PMT(dst && src)) + return NULL; + if (locale) + mbcinfo = locale->mbcinfo; + else + mbcinfo = get_mbcinfo(); + if (mbcinfo->ismbcodepage) { - is_lead = (!is_lead && _ismbblead(*src)); - n--; - *dst++ = *src++; - } + BOOL is_lead = FALSE; + while (*src && n) + { + is_lead = (!is_lead && _ismbblead_l(*src, locale)); + n--; + *dst++ = *src++; + } - if (is_lead) /* if string ends with a lead, remove it */ - *(dst - 1) = 0; - } - else - { - while (n) + if (is_lead) /* if string ends with a lead, remove it */ + *(dst - 1) = 0; + } + else { - n--; - if (!(*dst++ = *src++)) break; + while (n) + { + n--; + if (!(*dst++ = *src++)) break; + } } - } - while (n--) *dst++ = 0; - return ret; + while (n--) *dst++ = 0; + return ret; +} + +/********************************************************************* + * _mbsnbcpy(MSVCRT.@) + * REMARKS + * Like strncpy this function doesn't enforce the string to be + * NUL-terminated + */ +unsigned char* CDECL _mbsnbcpy(unsigned char* dst, const unsigned char* src, size_t n) +{ + return _mbsnbcpy_l(dst, src, n, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 738279a2cd3..998bd7268ca 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -755,7 +755,7 @@ @ cdecl _mbsnbcoll(str str long) @ cdecl _mbsnbcoll_l(str str long ptr) @ cdecl _mbsnbcpy(ptr str long) -# stub _mbsnbcpy_l(ptr str long ptr) +@ cdecl _mbsnbcpy_l(ptr str long ptr) @ cdecl _mbsnbcpy_s(ptr long str long) @ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 46cea0359b4..25c3e5ac766 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -650,7 +650,7 @@ @ cdecl _mbsnbcoll(str str long) @ cdecl _mbsnbcoll_l(str str long ptr) @ cdecl _mbsnbcpy(ptr str long) -@ stub _mbsnbcpy_l +@ cdecl _mbsnbcpy_l(ptr str long ptr) @ cdecl _mbsnbcpy_s(ptr long str long) @ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) @@ -1219,7 +1219,7 @@ @ cdecl _o__mbsnbcoll(str str long) _mbsnbcoll @ cdecl _o__mbsnbcoll_l(str str long ptr) _mbsnbcoll_l @ cdecl _o__mbsnbcpy(ptr str long) _mbsnbcpy -@ stub _o__mbsnbcpy_l +@ cdecl _o__mbsnbcpy_l(ptr str long ptr) _mbsnbcpy_l @ cdecl _o__mbsnbcpy_s(ptr long str long) _mbsnbcpy_s @ cdecl _o__mbsnbcpy_s_l(ptr long str long ptr) _mbsnbcpy_s_l @ cdecl _o__mbsnbicmp(str str long) _mbsnbicmp

1 0

Bartosz Kosiorek : msvcrt: Add _mbsnbicmp_l implementation.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: 62ba4a826102aed2f513ed7e0f812a44a4d62dd7 URL: https://gitlab.winehq.org/wine/wine/-/commit/62ba4a826102aed2f513ed7e0f812a… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Mon Nov 6 20:22:53 2023 +0100 msvcrt: Add _mbsnbicmp_l implementation. --- 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 | 93 +++++++++++++++++++++++++++------------------ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 +- 8 files changed, 64 insertions(+), 45 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 884289175c0..2e607207780 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1138,7 +1138,7 @@ @ cdecl _mbsnbcpy_s(ptr long str long) @ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) -@ stub _mbsnbicmp_l +@ cdecl _mbsnbicmp_l(str str long ptr) @ cdecl _mbsnbicoll(str str long) @ cdecl _mbsnbicoll_l(str str long ptr) @ cdecl _mbsnbset(ptr long long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 89bb35c7dba..4c552a2a80f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1495,7 +1495,7 @@ @ cdecl _mbsnbcpy_s(ptr long str long) @ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) -@ stub _mbsnbicmp_l +@ cdecl _mbsnbicmp_l(str str long ptr) @ cdecl _mbsnbicoll(str str long) @ cdecl _mbsnbicoll_l(str str long ptr) @ cdecl _mbsnbset(ptr long long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1be83715d23..d60c97a53fc 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1506,7 +1506,7 @@ @ cdecl _mbsnbcpy_s(ptr long str long) @ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) -@ stub _mbsnbicmp_l +@ cdecl _mbsnbicmp_l(str str long ptr) @ cdecl _mbsnbicoll(str str long) @ cdecl _mbsnbicoll_l(str str long ptr) @ cdecl _mbsnbset(ptr long long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 78172dbc104..d718ec58cb4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -810,7 +810,7 @@ @ cdecl _mbsnbcpy_s(ptr long str long) @ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) -@ stub _mbsnbicmp_l +@ cdecl _mbsnbicmp_l(str str long ptr) @ cdecl _mbsnbicoll(str str long) @ cdecl _mbsnbicoll_l(str str long ptr) @ cdecl _mbsnbset(ptr long long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c1736877ff5..d3b51e6cdac 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -788,7 +788,7 @@ @ cdecl _mbsnbcpy_s(ptr long str long) @ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) -@ stub _mbsnbicmp_l +@ cdecl _mbsnbicmp_l(str str long ptr) @ cdecl _mbsnbicoll(str str long) @ cdecl _mbsnbicoll_l(str str long ptr) @ cdecl _mbsnbset(ptr long long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 38ace70cd7e..e75a02e0193 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1362,47 +1362,66 @@ int CDECL _mbsnicmp(const unsigned char* str, const unsigned char* cmp, size_t l } /********************************************************************* - * _mbsnbicmp(MSVCRT.@) + * _mbsnbicmp_l(MSVCRT.@) */ -int CDECL _mbsnbicmp(const unsigned char* str, const unsigned char* cmp, size_t len) +int CDECL _mbsnbicmp_l(const unsigned char* str, const unsigned char* cmp, size_t len, _locale_t locale) { - if (!len) - return 0; - if(get_mbcinfo()->ismbcodepage) - { - unsigned int strc, cmpc; - while (len) + + pthreadmbcinfo mbcinfo; + + if (!len) + return 0; + if (!MSVCRT_CHECK_PMT(str && cmp)) + return _NLSCMPERROR; + + if (locale) + mbcinfo = locale->mbcinfo; + else + mbcinfo = get_mbcinfo(); + + if (mbcinfo->ismbcodepage) { - int clen; - if(!*str) - return *cmp ? -1 : 0; - if(!*cmp) - return 1; - if (_ismbblead(*str)) - { - strc=(len>=2)?_mbsnextc(str):0; - clen=2; - } - else - { - strc=*str; - clen=1; - } - if (_ismbblead(*cmp)) - cmpc=(len>=2)?_mbsnextc(cmp):0; - else - cmpc=*cmp; - strc = _mbctolower(strc); - cmpc = _mbctolower(cmpc); - if(strc != cmpc) - return strc < cmpc ? -1 : 1; - len -= clen; - str += clen; - cmp += clen; + unsigned int strc, cmpc; + while (len) + { + int clen; + if (!*str) + return *cmp ? -1 : 0; + if (!*cmp) + return 1; + if (_ismbblead_l(*str, locale)) + { + strc = (len >= 2) ? _mbsnextc_l(str, locale) : 0; + clen = 2; + } + else + { + strc = *str; + clen = 1; + } + if (_ismbblead_l(*cmp, locale)) + cmpc = (len >= 2) ? _mbsnextc_l(cmp, locale) : 0; + else + cmpc = *cmp; + strc = _mbctolower_l(strc, locale); + cmpc = _mbctolower_l(cmpc, locale); + if (strc != cmpc) + return strc < cmpc ? -1 : 1; + len -= clen; + str += clen; + cmp += clen; + } + return 0; /* Matched len bytes */ } - return 0; /* Matched len bytes */ - } - return u_strncasecmp(str,cmp,len); + return u_strncasecmp(str, cmp, len); +} + +/********************************************************************* + * _mbsnbicmp(MSVCRT.@) + */ +int CDECL _mbsnbicmp(const unsigned char* str, const unsigned char* cmp, size_t len) +{ + return _mbsnbicmp_l(str, cmp, len, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 998bd7268ca..e62e221b2b3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -759,7 +759,7 @@ @ cdecl _mbsnbcpy_s(ptr long str long) @ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) -# stub _mbsnbicmp_l(str str long ptr) +@ cdecl _mbsnbicmp_l(str str long ptr) @ cdecl _mbsnbicoll(str str long) @ cdecl _mbsnbicoll_l(str str long ptr) @ cdecl _mbsnbset(ptr long long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 25c3e5ac766..1ed734b76d8 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -654,7 +654,7 @@ @ cdecl _mbsnbcpy_s(ptr long str long) @ cdecl _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) -@ stub _mbsnbicmp_l +@ cdecl _mbsnbicmp_l(str str long ptr) @ cdecl _mbsnbicoll(str str long) @ cdecl _mbsnbicoll_l(str str long ptr) @ cdecl _mbsnbset(ptr long long) @@ -1223,7 +1223,7 @@ @ cdecl _o__mbsnbcpy_s(ptr long str long) _mbsnbcpy_s @ cdecl _o__mbsnbcpy_s_l(ptr long str long ptr) _mbsnbcpy_s_l @ cdecl _o__mbsnbicmp(str str long) _mbsnbicmp -@ stub _o__mbsnbicmp_l +@ cdecl _o__mbsnbicmp_l(str str long ptr) _mbsnbicmp_l @ cdecl _o__mbsnbicoll(str str long) _mbsnbicoll @ cdecl _o__mbsnbicoll_l(str str long ptr) _mbsnbicoll_l @ cdecl _o__mbsnbset(ptr long long) _mbsnbset

1 0

Bartosz Kosiorek : msvcrt: Add _mbsnbset_l implementation.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: 12a00363f68fd12f3a1319eba7ccbce95df4e275 URL: https://gitlab.winehq.org/wine/wine/-/commit/12a00363f68fd12f3a1319eba7ccbc… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Mon Nov 6 20:35:53 2023 +0100 msvcrt: Add _mbsnbset_l implementation. --- 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 | 45 +++++++++++++++++++++++++++++++-------------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 8 files changed, 39 insertions(+), 22 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2e607207780..121ff766807 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1142,7 +1142,7 @@ @ cdecl _mbsnbicoll(str str long) @ cdecl _mbsnbicoll_l(str str long ptr) @ cdecl _mbsnbset(ptr long long) -@ stub _mbsnbset_l +@ cdecl _mbsnbset_l(str long long ptr) @ stub _mbsnbset_s @ stub _mbsnbset_s_l @ cdecl _mbsncat(str str long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4c552a2a80f..b14ed43cb3b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1499,7 +1499,7 @@ @ cdecl _mbsnbicoll(str str long) @ cdecl _mbsnbicoll_l(str str long ptr) @ cdecl _mbsnbset(ptr long long) -@ stub _mbsnbset_l +@ cdecl _mbsnbset_l(str long long ptr) @ stub _mbsnbset_s @ stub _mbsnbset_s_l @ cdecl _mbsncat(str str long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d60c97a53fc..0aa7cafb660 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1510,7 +1510,7 @@ @ cdecl _mbsnbicoll(str str long) @ cdecl _mbsnbicoll_l(str str long ptr) @ cdecl _mbsnbset(ptr long long) -@ stub _mbsnbset_l +@ cdecl _mbsnbset_l(str long long ptr) @ stub _mbsnbset_s @ stub _mbsnbset_s_l @ cdecl _mbsncat(str str long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d718ec58cb4..52a9fbce0dc 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -814,7 +814,7 @@ @ cdecl _mbsnbicoll(str str long) @ cdecl _mbsnbicoll_l(str str long ptr) @ cdecl _mbsnbset(ptr long long) -@ stub _mbsnbset_l +@ cdecl _mbsnbset_l(str long long ptr) @ stub _mbsnbset_s @ stub _mbsnbset_s_l @ cdecl _mbsncat(str str long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d3b51e6cdac..78521a857ae 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -792,7 +792,7 @@ @ cdecl _mbsnbicoll(str str long) @ cdecl _mbsnbicoll_l(str str long ptr) @ cdecl _mbsnbset(ptr long long) -@ stub _mbsnbset_l +@ cdecl _mbsnbset_l(str long long ptr) @ stub _mbsnbset_s @ stub _mbsnbset_s_l @ cdecl _mbsncat(str str long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index e75a02e0193..2d492197452 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2200,35 +2200,52 @@ unsigned char* CDECL _mbsset(unsigned char* str, unsigned int c) } /********************************************************************* - * _mbsnbset(MSVCRT.@) + * _mbsnbset_l(MSVCRT.@) */ -unsigned char* CDECL _mbsnbset(unsigned char *str, unsigned int c, size_t len) +unsigned char* CDECL _mbsnbset_l(unsigned char *str, unsigned int c, size_t len, _locale_t locale) { unsigned char *ret = str; + pthreadmbcinfo mbcinfo; - if(!len) - return ret; + if (!len) + return ret; + if (!MSVCRT_CHECK_PMT(str)) + return NULL; + + if (locale) + mbcinfo = locale->mbcinfo; + else + mbcinfo = get_mbcinfo(); - if(!get_mbcinfo()->ismbcodepage || c < 256) - return u__strnset(str, c, len); /* ASCII CP or SB char */ + if (!mbcinfo->ismbcodepage || c < 256) + return u__strnset(str, c, len); /* ASCII CP or SB char */ c &= 0xffff; /* Strip high bits */ - while(str[0] && str[1] && (len > 1)) + while (str[0] && str[1] && (len > 1)) { - *str++ = c >> 8; - len--; - *str++ = c & 0xff; - len--; + *str++ = c >> 8; + len--; + *str++ = c & 0xff; + len--; } - if(len && str[0]) { - /* as per msdn pad with a blank character */ - str[0] = ' '; + if (len && str[0]) + { + /* as per msdn pad with a blank character */ + str[0] = ' '; } return ret; } +/********************************************************************* + * _mbsnbset(MSVCRT.@) + */ +unsigned char* CDECL _mbsnbset(unsigned char *str, unsigned int c, size_t len) +{ + return _mbsnbset_l(str, c, len, NULL); +} + /********************************************************************* * _mbsnset(MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e62e221b2b3..de58dd39a93 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -763,7 +763,7 @@ @ cdecl _mbsnbicoll(str str long) @ cdecl _mbsnbicoll_l(str str long ptr) @ cdecl _mbsnbset(ptr long long) -# stub _mbsnbset_l(str long long ptr) +@ cdecl _mbsnbset_l(str long long ptr) # stub _mbsnbset_s(ptr long long long) # stub _mbsnbset_s_l(ptr long long long ptr) @ cdecl _mbsncat(str str long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1ed734b76d8..a18f5d6e397 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -658,7 +658,7 @@ @ cdecl _mbsnbicoll(str str long) @ cdecl _mbsnbicoll_l(str str long ptr) @ cdecl _mbsnbset(ptr long long) -@ stub _mbsnbset_l +@ cdecl _mbsnbset_l(str long long ptr) @ stub _mbsnbset_s @ stub _mbsnbset_s_l @ cdecl _mbsncat(str str long) @@ -1227,7 +1227,7 @@ @ cdecl _o__mbsnbicoll(str str long) _mbsnbicoll @ cdecl _o__mbsnbicoll_l(str str long ptr) _mbsnbicoll_l @ cdecl _o__mbsnbset(ptr long long) _mbsnbset -@ stub _o__mbsnbset_l +@ cdecl _o__mbsnbset_l(str long long ptr) _mbsnbset_l @ stub _o__mbsnbset_s @ stub _o__mbsnbset_s_l @ cdecl _o__mbsncat(str str long) _mbsncat

1 0

Bartosz Kosiorek : msvcrt: Add _mbsncat_l implementation.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: a67a08895f7ae6e44543bfa4a05b10df7c253f08 URL: https://gitlab.winehq.org/wine/wine/-/commit/a67a08895f7ae6e44543bfa4a05b10… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Mon Nov 6 20:47:19 2023 +0100 msvcrt: Add _mbsncat_l implementation. --- 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 | 56 ++++++++++++++++++++++++++++++--------------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 8 files changed, 46 insertions(+), 26 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 121ff766807..565689ac6ab 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1146,7 +1146,7 @@ @ stub _mbsnbset_s @ stub _mbsnbset_s_l @ cdecl _mbsncat(str str long) -@ stub _mbsncat_l +@ cdecl _mbsncat_l(str str long ptr) @ stub _mbsncat_s @ stub _mbsncat_s_l @ cdecl _mbsnccnt(str long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b14ed43cb3b..bc143f34505 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1503,7 +1503,7 @@ @ stub _mbsnbset_s @ stub _mbsnbset_s_l @ cdecl _mbsncat(str str long) -@ stub _mbsncat_l +@ cdecl _mbsncat_l(str str long ptr) @ stub _mbsncat_s @ stub _mbsncat_s_l @ cdecl _mbsnccnt(str long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0aa7cafb660..cd76f568557 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1514,7 +1514,7 @@ @ stub _mbsnbset_s @ stub _mbsnbset_s_l @ cdecl _mbsncat(str str long) -@ stub _mbsncat_l +@ cdecl _mbsncat_l(str str long ptr) @ stub _mbsncat_s @ stub _mbsncat_s_l @ cdecl _mbsnccnt(str long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 52a9fbce0dc..5bc963edf57 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -818,7 +818,7 @@ @ stub _mbsnbset_s @ stub _mbsnbset_s_l @ cdecl _mbsncat(str str long) -@ stub _mbsncat_l +@ cdecl _mbsncat_l(str str long ptr) @ stub _mbsncat_s @ stub _mbsncat_s_l @ cdecl _mbsnccnt(str long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 78521a857ae..a7f47e568c7 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -796,7 +796,7 @@ @ stub _mbsnbset_s @ stub _mbsnbset_s_l @ cdecl _mbsncat(str str long) -@ stub _mbsncat_l +@ cdecl _mbsncat_l(str str long ptr) @ stub _mbsncat_s @ stub _mbsncat_s_l @ cdecl _mbsnccnt(str long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 2d492197452..77ced6e8a3e 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2457,30 +2457,50 @@ int CDECL _mbsnbcat_s(unsigned char *dst, size_t size, const unsigned char *src, } /********************************************************************* - * _mbsncat(MSVCRT.@) + * _mbsncat_l(MSVCRT.@) */ -unsigned char* CDECL _mbsncat(unsigned char* dst, const unsigned char* src, size_t len) +unsigned char* CDECL _mbsncat_l(unsigned char* dst, const unsigned char* src, size_t len, _locale_t locale) { - if(get_mbcinfo()->ismbcodepage) - { - unsigned char *res = dst; - while (*dst) - { - if (_ismbblead(*dst++)) - dst++; - } - while (*src && len--) + pthreadmbcinfo mbcinfo; + + if (!len) + return dst; + + if (!MSVCRT_CHECK_PMT(dst && src)) + return NULL; + + if (locale) + mbcinfo = locale->mbcinfo; + else + mbcinfo = get_mbcinfo(); + + if (mbcinfo->ismbcodepage) { - *dst++ = *src; - if(_ismbblead(*src++)) - *dst++ = *src++; + unsigned char *res = dst; + while (*dst) + { + if (_ismbblead_l(*dst++, locale)) + dst++; + } + while (*src && len--) + { + *dst++ = *src; + if (_ismbblead_l(*src++, locale)) + *dst++ = *src++; + } + *dst = '\0'; + return res; } - *dst = '\0'; - return res; - } - return u_strncat(dst, src, len); /* ASCII CP */ + return u_strncat(dst, src, len); /* ASCII CP */ } +/********************************************************************* + * _mbsncat(MSVCRT.@) + */ +unsigned char* CDECL _mbsncat(unsigned char* dst, const unsigned char* src, size_t len) +{ + return _mbsncat_l(dst, src, len, NULL); +} /********************************************************************* * _mbslwr_l(MSVCRT.@) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index de58dd39a93..ff6f14b884f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -767,7 +767,7 @@ # stub _mbsnbset_s(ptr long long long) # stub _mbsnbset_s_l(ptr long long long ptr) @ cdecl _mbsncat(str str long) -# stub _mbsncat_l(str str long ptr) +@ cdecl _mbsncat_l(str str long ptr) # stub _mbsncat_s(str long str long) # stub _mbsncat_s_l(str long str long ptr) @ cdecl _mbsnccnt(str long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a18f5d6e397..91c54e1a31c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -662,7 +662,7 @@ @ stub _mbsnbset_s @ stub _mbsnbset_s_l @ cdecl _mbsncat(str str long) -@ stub _mbsncat_l +@ cdecl _mbsncat_l(str str long ptr) @ stub _mbsncat_s @ stub _mbsncat_s_l @ cdecl _mbsnccnt(str long) @@ -1231,7 +1231,7 @@ @ stub _o__mbsnbset_s @ stub _o__mbsnbset_s_l @ cdecl _o__mbsncat(str str long) _mbsncat -@ stub _o__mbsncat_l +@ cdecl _o__mbsncat_l(str str long ptr) _mbsncat_l @ stub _o__mbsncat_s @ stub _o__mbsncat_s_l @ cdecl _o__mbsnccnt(str long) _mbsnccnt

1 0