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

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

July 17, 2020

Module: vkd3d Branch: master Commit: 36d21277650f821b7532dd5e89c86500ae39bedc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=36d21277650f821b7532dd5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 14:56:44 2020 +0430 vkd3d-shader: Rename the vkd3d_root_descriptor_table structure to vkd3d_shader_root_descriptor_table. 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 1ce701c..6fa2505 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -437,7 +437,7 @@ struct vkd3d_shader_descriptor_range unsigned int descriptor_table_offset; }; -struct vkd3d_root_descriptor_table +struct vkd3d_shader_root_descriptor_table { unsigned int descriptor_range_count; const struct vkd3d_shader_descriptor_range *descriptor_ranges; @@ -472,7 +472,7 @@ struct vkd3d_root_parameter enum vkd3d_shader_root_parameter_type parameter_type; union { - struct vkd3d_root_descriptor_table descriptor_table; + struct vkd3d_shader_root_descriptor_table descriptor_table; struct vkd3d_root_constants constants; struct vkd3d_root_descriptor descriptor; } u; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6297a04..0848c04 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2300,7 +2300,7 @@ static int shader_parse_descriptor_ranges1(struct root_signature_parser_context } static int shader_parse_descriptor_table(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_descriptor_table *table) + unsigned int offset, struct vkd3d_shader_root_descriptor_table *table) { struct vkd3d_shader_descriptor_range *ranges; unsigned int count; @@ -2807,7 +2807,7 @@ static int shader_write_root_signature_header(struct root_signature_writer_conte } static int shader_write_descriptor_ranges(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table *table) + const struct vkd3d_shader_root_descriptor_table *table) { const struct vkd3d_shader_descriptor_range *ranges = table->descriptor_ranges; unsigned int i; @@ -2855,7 +2855,7 @@ static int shader_write_descriptor_ranges1(struct root_signature_writer_context } static int shader_write_descriptor_table(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table *table) + const struct vkd3d_shader_root_descriptor_table *table) { if (!write_dword(context, table->descriptor_range_count)) return VKD3D_ERROR_OUT_OF_MEMORY; @@ -3036,7 +3036,7 @@ static int shader_write_root_signature(struct root_signature_writer_context *con return shader_write_static_samplers(context, desc); } -static int validate_descriptor_table_v_1_0(const struct vkd3d_root_descriptor_table *descriptor_table) +static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descriptor_table *descriptor_table) { bool have_srv_uav_cbv = false; bool have_sampler = false;

1 0

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

July 17, 2020

Module: vkd3d Branch: master Commit: 0f5dc670157713c2dd76be33b59a7773d4f310ba URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0f5dc670157713c2dd76be3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 14:56:46 2020 +0430 vkd3d-shader: Rename the vkd3d_root_descriptor structure to vkd3d_shader_root_descriptor. 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 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 0323766..b2c3dc9 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -450,7 +450,7 @@ struct vkd3d_shader_root_constants unsigned int value_count; }; -struct vkd3d_root_descriptor +struct vkd3d_shader_root_descriptor { unsigned int shader_register; unsigned int register_space; @@ -474,7 +474,7 @@ struct vkd3d_root_parameter { struct vkd3d_shader_root_descriptor_table descriptor_table; struct vkd3d_shader_root_constants constants; - struct vkd3d_root_descriptor descriptor; + struct vkd3d_shader_root_descriptor descriptor; } u; enum vkd3d_shader_visibility shader_visibility; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index a247d5c..1fb8dc8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2376,7 +2376,7 @@ static int shader_parse_root_constants(struct root_signature_parser_context *con } static int shader_parse_root_descriptor(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_descriptor *descriptor) + unsigned int offset, struct vkd3d_shader_root_descriptor *descriptor) { const char *ptr; @@ -2890,7 +2890,7 @@ static int shader_write_root_constants(struct root_signature_writer_context *con } static int shader_write_root_descriptor(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor *descriptor) + const struct vkd3d_shader_root_descriptor *descriptor) { if (!write_dword(context, descriptor->shader_register)) return VKD3D_ERROR_OUT_OF_MEMORY;

1 0

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

July 17, 2020

Module: vkd3d Branch: master Commit: e5c77186679c6d934c7cf181ee1ac252fa39a457 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e5c77186679c6d934c7cf18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 14:56:48 2020 +0430 vkd3d-shader: Rename the vkd3d_texture_address_mode enumeration to vkd3d_shader_texture_address_mode. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 2ae35ae..20f9678 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -367,15 +367,15 @@ enum vkd3d_shader_filter VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_FILTER), }; -enum vkd3d_texture_address_mode +enum vkd3d_shader_texture_address_mode { - VKD3D_TEXTURE_ADDRESS_MODE_WRAP = 1, - VKD3D_TEXTURE_ADDRESS_MODE_MIRROR = 2, - VKD3D_TEXTURE_ADDRESS_MODE_CLAMP = 3, - VKD3D_TEXTURE_ADDRESS_MODE_BORDER = 4, - VKD3D_TEXTURE_ADDRESS_MODE_MIRROR_ONCE = 5, + VKD3D_SHADER_TEXTURE_ADDRESS_MODE_WRAP = 0x1, + VKD3D_SHADER_TEXTURE_ADDRESS_MODE_MIRROR = 0x2, + VKD3D_SHADER_TEXTURE_ADDRESS_MODE_CLAMP = 0x3, + VKD3D_SHADER_TEXTURE_ADDRESS_MODE_BORDER = 0x4, + VKD3D_SHADER_TEXTURE_ADDRESS_MODE_MIRROR_ONCE = 0x5, - VKD3D_FORCE_32_BIT_ENUM(VKD3D_TEXTURE_ADDRESS_MODE), + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TEXTURE_ADDRESS_MODE), }; enum vkd3d_comparison_func @@ -404,9 +404,9 @@ enum vkd3d_static_border_color struct vkd3d_static_sampler_desc { enum vkd3d_shader_filter filter; - enum vkd3d_texture_address_mode address_u; - enum vkd3d_texture_address_mode address_v; - enum vkd3d_texture_address_mode address_w; + enum vkd3d_shader_texture_address_mode address_u; + enum vkd3d_shader_texture_address_mode address_v; + enum vkd3d_shader_texture_address_mode address_w; float mip_lod_bias; unsigned int max_anisotropy; enum vkd3d_comparison_func comparison_func;

1 0

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

July 17, 2020

Module: vkd3d Branch: master Commit: 270b31a7db0c3f7131f968eccd9fdfd9d7133031 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=270b31a7db0c3f7131f968e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 14:56:45 2020 +0430 vkd3d-shader: Rename the vkd3d_root_constants structure to vkd3d_shader_root_constants. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 6 +++--- libs/vkd3d-shader/dxbc.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 6fa2505..0323766 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -443,7 +443,7 @@ struct vkd3d_shader_root_descriptor_table const struct vkd3d_shader_descriptor_range *descriptor_ranges; }; -struct vkd3d_root_constants +struct vkd3d_shader_root_constants { unsigned int shader_register; unsigned int register_space; @@ -473,7 +473,7 @@ struct vkd3d_root_parameter union { struct vkd3d_shader_root_descriptor_table descriptor_table; - struct vkd3d_root_constants constants; + struct vkd3d_shader_root_constants constants; struct vkd3d_root_descriptor descriptor; } u; enum vkd3d_shader_visibility shader_visibility; @@ -553,7 +553,7 @@ struct vkd3d_root_parameter1 union { struct vkd3d_root_descriptor_table1 descriptor_table; - struct vkd3d_root_constants constants; + struct vkd3d_shader_root_constants constants; struct vkd3d_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 0848c04..a247d5c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2354,7 +2354,7 @@ static int shader_parse_descriptor_table1(struct root_signature_parser_context * } static int shader_parse_root_constants(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_constants *constants) + unsigned int offset, struct vkd3d_shader_root_constants *constants) { const char *ptr; @@ -2696,7 +2696,7 @@ static enum vkd3d_shader_visibility versioned_root_signature_get_parameter_shade return desc->u.v_1_1.parameters[i].shader_visibility; } -static const struct vkd3d_root_constants *versioned_root_signature_get_root_constants( +static const struct vkd3d_shader_root_constants *versioned_root_signature_get_root_constants( const struct vkd3d_versioned_root_signature_desc *desc, unsigned int i) { if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) @@ -2877,7 +2877,7 @@ static int shader_write_descriptor_table1(struct root_signature_writer_context * } static int shader_write_root_constants(struct root_signature_writer_context *context, - const struct vkd3d_root_constants *constants) + const struct vkd3d_shader_root_constants *constants) { if (!write_dword(context, constants->shader_register)) return VKD3D_ERROR_OUT_OF_MEMORY;

1 0

Jacek Caban : ntdll: Silence server_ioctl_file debug traces.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 42cb7d2ad1caba08de235e6319b9967296b5d554 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42cb7d2ad1caba08de235e63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 15 17:34:47 2020 +0200 ntdll: Silence server_ioctl_file debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index bf435f109f..b202864e66 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4743,8 +4743,8 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, SERVER_END_REQ; if (status == STATUS_NOT_SUPPORTED) - FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", - code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); + WARN("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", + code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); if (status != STATUS_PENDING) free( async );

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_GET_TITLE in WINECON_GetConsoleTitle.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: ffa52880f2519c885ce61b89b847c82e0531c032 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffa52880f2519c885ce61b89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 15 17:34:34 2020 +0200 wineconsole: Use IOCTL_CONDRV_GET_TITLE in WINECON_GetConsoleTitle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 94ef6c3dec..5040800946 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -173,22 +173,13 @@ static void WINECON_SetInsertMode(HANDLE hConIn, unsigned int enable) */ BOOL WINECON_GetConsoleTitle(HANDLE hConIn, WCHAR* buffer, size_t len) { - BOOL ret; + DWORD size; - if (len < sizeof(WCHAR)) return FALSE; + if (!DeviceIoControl(hConIn, IOCTL_CONDRV_GET_TITLE, NULL, 0, buffer, len - sizeof(WCHAR), &size, NULL)) + return FALSE; - SERVER_START_REQ( get_console_input_info ) - { - req->handle = wine_server_obj_handle( hConIn ); - wine_server_set_reply( req, buffer, len - sizeof(WCHAR) ); - if ((ret = !wine_server_call_err( req ))) - { - len = wine_server_reply_size( reply ); - buffer[len / sizeof(WCHAR)] = 0; - } - } - SERVER_END_REQ; - return ret; + buffer[size / sizeof(WCHAR)] = 0; + return TRUE; } /******************************************************************

1 0

Jacek Caban : server: Trace console ioctls.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 823c55ad2755c36f55cce1f0cf5f0ee6dcaf9d76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=823c55ad2755c36f55cce1f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 15 17:34:41 2020 +0200 server: Trace console ioctls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/trace.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/server/trace.c b/server/trace.c index a35b6c1918..7acab95efe 100644 --- a/server/trace.c +++ b/server/trace.c @@ -38,6 +38,7 @@ #include "winternl.h" #include "winuser.h" #include "winioctl.h" +#include "wine/condrv.h" #include "ddk/wdm.h" #include "ddk/ntddser.h" #define USE_WS_PREFIX @@ -113,6 +114,17 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) switch(*code) { #define CASE(c) case c: fprintf( stderr, "%s%s", prefix, #c ); break + CASE(IOCTL_CONDRV_FILL_OUTPUT); + CASE(IOCTL_CONDRV_GET_INPUT_INFO); + CASE(IOCTL_CONDRV_GET_MODE); + CASE(IOCTL_CONDRV_GET_OUTPUT_INFO); + CASE(IOCTL_CONDRV_GET_RENDERER_EVENTS); + CASE(IOCTL_CONDRV_GET_TITLE); + CASE(IOCTL_CONDRV_PEEK); + CASE(IOCTL_CONDRV_READ_INPUT); + CASE(IOCTL_CONDRV_SET_MODE); + CASE(IOCTL_CONDRV_SET_OUTPUT_INFO); + CASE(IOCTL_CONDRV_WRITE_INPUT); CASE(FSCTL_DISMOUNT_VOLUME); CASE(FSCTL_PIPE_DISCONNECT); CASE(FSCTL_PIPE_LISTEN);

1 0

Shawn M. Chapla : gdiplus/tests: Add additional logfont size tests.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: bfc8404041edc39292eb68b911df814c998055fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfc8404041edc39292eb68b9… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Tue Jul 14 21:24:56 2020 -0400 gdiplus/tests: Add additional logfont size tests. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codewevers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 10d1f3bd5a..74cf451e36 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -300,6 +300,56 @@ static void test_logfont(void) GdipDeleteFontFamily(family); GdipDeleteFont(font); + font = NULL; + + /* The next test must be done with a font where tmHeight - + tmInternalLeading != tmAscent. Times New Roman is such a font, + so make sure we really have it before continuing. */ + memset(&lfa, 0, sizeof(lfa)); + lstrcpyA(lfa.lfFaceName, "Times New Roman"); + + stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); + expect(Ok, stat); + + memset(&lfa2, 0, sizeof(lfa2)); + stat = GdipGetLogFontA(font, graphics, &lfa2); + expect(Ok, stat); + + GdipDeleteFont(font); + font = NULL; + + if (!lstrlenA(lfa.lfFaceName) || lstrcmpA(lfa.lfFaceName, lfa2.lfFaceName)) + { + skip("Times New Roman not installed\n"); + } + else + { + static const struct + { + INT input; + REAL expected; + } test_sizes[] = {{12, 9.0}, {36, 32.0}, {48, 42.0}, {72, 63.0}, {144, 127.0}}; + + UINT i; + + memset(&lfa, 0, sizeof(lfa)); + lstrcpyA(lfa.lfFaceName, "Times New Roman"); + + for (i = 0; i < sizeof(test_sizes)/sizeof(test_sizes[0]); ++i) + { + lfa.lfHeight = test_sizes[i].input; + + stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); + expect(Ok, stat); + + stat = GdipGetFontSize(font, &rval); + expect(Ok, stat); + todo_wine expectf(test_sizes[i].expected, rval); + + GdipDeleteFont(font); + font = NULL; + } + } GdipDeleteGraphics(graphics); ReleaseDC(0, hdc);

1 0

Piotr Caban : msvcrt: Don't use iscntrlW.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: f054370bc602f08561e6423996c7d531f89aa2c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f054370bc602f08561e64239… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:05:54 2020 +0200 msvcrt: Don't use iscntrlW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 5d70222bda..e962d00868 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1961,19 +1961,19 @@ INT CDECL MSVCRT_iswalpha( MSVCRT_wchar_t wc ) } /********************************************************************* - * iswcntrl (MSVCRT.@) + * _iswcntrl_l (MSVCRT.@) */ -INT CDECL MSVCRT_iswcntrl( MSVCRT_wchar_t wc ) +int CDECL MSVCRT__iswcntrl_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return iscntrlW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__CONTROL, locale ); } /********************************************************************* - * _iswcntrl_l (MSVCRT.@) + * iswcntrl (MSVCRT.@) */ -int CDECL MSVCRT__iswcntrl_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +INT CDECL MSVCRT_iswcntrl( MSVCRT_wchar_t wc ) { - return iscntrlW( wc ); + return MSVCRT__iswcntrl_l( wc, NULL ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use isalphaW.
by Alexandre Julliard July 15, 2020

July 15, 2020

Module: wine Branch: master Commit: 9dbf289cb832baeaecac8fa980a77963ddb1533d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dbf289cb832baeaecac8fa9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:05:50 2020 +0200 msvcrt: Don't use isalphaW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 6998c16f59..5d70222bda 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1945,19 +1945,19 @@ INT CDECL MSVCRT_iswalnum( MSVCRT_wchar_t wc ) } /********************************************************************* - * iswalpha (MSVCRT.@) + * iswalpha_l (MSVCRT.@) */ -INT CDECL MSVCRT_iswalpha( MSVCRT_wchar_t wc ) +INT CDECL MSVCRT__iswalpha_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return isalphaW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__ALPHA, locale ); } /********************************************************************* - * iswalpha_l (MSVCRT.@) + * iswalpha (MSVCRT.@) */ -INT CDECL MSVCRT__iswalpha_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +INT CDECL MSVCRT_iswalpha( MSVCRT_wchar_t wc ) { - return isalphaW( wc ); + return MSVCRT__iswalpha_l( wc, NULL ); } /*********************************************************************

1 0