Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 4667e9970f..7693755a71 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -27,7 +27,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) ucrtbase._iswctype_l @ cdecl _iswdigit_l(long ptr) ucrtbase._iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) ucrtbase._iswgraph_l @ cdecl _iswlower_l(long ptr) ucrtbase._iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) ucrtbase._iswpunct_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 69e5a1be85..e38672efbd 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1023,7 +1023,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 8dc1a68816..ed930d7817 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1369,7 +1369,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d4bcc65759..1f3d22d983 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1375,7 +1375,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 42b3e54375..aa4b2b874b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1240,7 +1240,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) msvcr120._iswctype_l @ cdecl _iswdigit_l(long ptr) msvcr120._iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) msvcr120._iswgraph_l @ cdecl _iswlower_l(long ptr) msvcr120._iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) msvcr120._iswpunct_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 295fae565e..8c69215cdb 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -695,7 +695,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7c3c3e5a5f..842cb5f32e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -673,7 +673,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9491205b74..fa234fb99d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -638,7 +638,7 @@ # stub _iswcntrl_l(long ptr) @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -# stub _iswgraph_l(long ptr) +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l # stub _iswprint_l(long ptr) @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b68cc51561..c4e27e1439 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1854,6 +1854,14 @@ INT CDECL MSVCRT_iswgraph( MSVCRT_wchar_t wc ) return isgraphW( wc ); }
+/********************************************************************* + * _iswgraph_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswgraph_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return isgraphW( wc ); +} + /********************************************************************* * iswlower (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b3f4d9e0f1..adb3198305 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -514,7 +514,7 @@ @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -@ stub _iswgraph_l +@ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l @ stub _iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 7693755a71..6b01b2b751 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -19,7 +19,7 @@ @ stub _ispunct_l @ cdecl _isspace_l(long ptr) ucrtbase._isspace_l @ cdecl _isupper_l(long ptr) ucrtbase._isupper_l -@ stub _iswalnum_l +@ cdecl _iswalnum_l(long ptr) ucrtbase._iswalnum_l @ cdecl _iswalpha_l(long ptr) ucrtbase._iswalpha_l @ cdecl _iswblank_l(long ptr) ucrtbase._iswblank_l @ stub _iswcntrl_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e38672efbd..5c0506c9fc 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1016,7 +1016,7 @@ @ stub _ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l -@ stub _iswalnum_l +@ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l @ stub _iswcntrl_l @ stub _iswcsym_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index ed930d7817..757ed7c543 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1362,7 +1362,7 @@ @ stub _ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l -@ stub _iswalnum_l +@ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l @ stub _iswcntrl_l @ stub _iswcsym_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1f3d22d983..52a315574f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1367,7 +1367,7 @@ @ stub _ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l -@ stub _iswalnum_l +@ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l @ cdecl _iswblank_l(long ptr) MSVCRT__iswblank_l @ stub _iswcntrl_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index aa4b2b874b..db607e031d 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1232,7 +1232,7 @@ @ stub _ispunct_l @ cdecl _isspace_l(long ptr) msvcr120._isspace_l @ cdecl _isupper_l(long ptr) msvcr120._isupper_l -@ stub _iswalnum_l +@ cdecl _iswalnum_l(long ptr) msvcr120._iswalnum_l @ cdecl _iswalpha_l(long ptr) msvcr120._iswalpha_l @ cdecl _iswblank_l(long ptr) msvcr120._iswblank_l @ stub _iswcntrl_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8c69215cdb..baf89f5947 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -688,7 +688,7 @@ @ stub _ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l -@ stub _iswalnum_l +@ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l @ stub _iswcntrl_l @ stub _iswcsym_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 842cb5f32e..79dab2e198 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -666,7 +666,7 @@ @ stub _ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l -@ stub _iswalnum_l +@ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l @ stub _iswcntrl_l @ stub _iswcsym_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index fa234fb99d..dbff9642cc 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -633,7 +633,7 @@ @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l -# stub _iswalnum_l(long ptr) +@ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l # stub _iswcntrl_l(long ptr) @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index c4e27e1439..72a2b71b0c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1806,6 +1806,14 @@ INT CDECL MSVCRT_iswalnum( MSVCRT_wchar_t wc ) return isalnumW( wc ); }
+/********************************************************************* + * _iswalnum_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswalnum_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return isalnumW( wc ); +} + /********************************************************************* * iswalpha (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index adb3198305..32a646acf1 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -506,7 +506,7 @@ @ stub _ispunct_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l -@ stub _iswalnum_l +@ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l @ cdecl _iswblank_l(long ptr) MSVCRT__iswblank_l @ stub _iswcntrl_l
Signed-off-by: Piotr Caban piotr@codeweavers.com
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 6b01b2b751..c29e510344 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -22,7 +22,7 @@ @ cdecl _iswalnum_l(long ptr) ucrtbase._iswalnum_l @ cdecl _iswalpha_l(long ptr) ucrtbase._iswalpha_l @ cdecl _iswblank_l(long ptr) ucrtbase._iswblank_l -@ stub _iswcntrl_l +@ cdecl _iswcntrl_l(long ptr) ucrtbase._iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) ucrtbase._iswctype_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5c0506c9fc..afc9e0f9e8 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1018,7 +1018,7 @@ @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l -@ stub _iswcntrl_l +@ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 757ed7c543..24def8eac7 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1364,7 +1364,7 @@ @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l -@ stub _iswcntrl_l +@ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 52a315574f..2f559f154d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1370,7 +1370,7 @@ @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l @ cdecl _iswblank_l(long ptr) MSVCRT__iswblank_l -@ stub _iswcntrl_l +@ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index db607e031d..bfb1046c5c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1235,7 +1235,7 @@ @ cdecl _iswalnum_l(long ptr) msvcr120._iswalnum_l @ cdecl _iswalpha_l(long ptr) msvcr120._iswalpha_l @ cdecl _iswblank_l(long ptr) msvcr120._iswblank_l -@ stub _iswcntrl_l +@ cdecl _iswcntrl_l(long ptr) msvcr120._iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) msvcr120._iswctype_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index baf89f5947..26c45cf9d3 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -690,7 +690,7 @@ @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l -@ stub _iswcntrl_l +@ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 79dab2e198..653c156680 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -668,7 +668,7 @@ @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l -@ stub _iswcntrl_l +@ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index dbff9642cc..40326a7c86 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -635,7 +635,7 @@ @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l -# stub _iswcntrl_l(long ptr) +@ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 72a2b71b0c..386764b4e3 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1838,6 +1838,14 @@ INT CDECL MSVCRT_iswcntrl( MSVCRT_wchar_t wc ) return iscntrlW( wc ); }
+/********************************************************************* + * _iswcntrl_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswcntrl_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return iscntrlW( wc ); +} + /********************************************************************* * iswdigit (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 32a646acf1..2090e59d9b 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -509,7 +509,7 @@ @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l @ cdecl _iswblank_l(long ptr) MSVCRT__iswblank_l -@ stub _iswcntrl_l +@ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @ cdecl _iswctype_l(long long ptr) MSVCRT__iswctype_l
Signed-off-by: Piotr Caban piotr@codeweavers.com
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index c29e510344..920d962ba6 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -29,7 +29,7 @@ @ cdecl _iswdigit_l(long ptr) ucrtbase._iswdigit_l @ cdecl _iswgraph_l(long ptr) ucrtbase._iswgraph_l @ cdecl _iswlower_l(long ptr) ucrtbase._iswlower_l -@ stub _iswprint_l +@ cdecl _iswprint_l(long ptr) ucrtbase._iswprint_l @ cdecl _iswpunct_l(long ptr) ucrtbase._iswpunct_l @ cdecl _iswspace_l(long ptr) ucrtbase._iswspace_l @ cdecl _iswupper_l(long ptr) ucrtbase._iswupper_l diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index afc9e0f9e8..de81eb88be 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1025,7 +1025,7 @@ @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l -@ stub _iswprint_l +@ cdecl _iswprint_l(long ptr) MSVCRT__iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 24def8eac7..58e463250e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1371,7 +1371,7 @@ @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l -@ stub _iswprint_l +@ cdecl _iswprint_l(long ptr) MSVCRT__iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 2f559f154d..db49594c54 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1377,7 +1377,7 @@ @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l -@ stub _iswprint_l +@ cdecl _iswprint_l(long ptr) MSVCRT__iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index bfb1046c5c..749deb816a 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1242,7 +1242,7 @@ @ cdecl _iswdigit_l(long ptr) msvcr120._iswdigit_l @ cdecl _iswgraph_l(long ptr) msvcr120._iswgraph_l @ cdecl _iswlower_l(long ptr) msvcr120._iswlower_l -@ stub _iswprint_l +@ cdecl _iswprint_l(long ptr) msvcr120._iswprint_l @ cdecl _iswpunct_l(long ptr) msvcr120._iswpunct_l @ cdecl _iswspace_l(long ptr) msvcr120._iswspace_l @ cdecl _iswupper_l(long ptr) msvcr120._iswupper_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 26c45cf9d3..8004353b66 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -697,7 +697,7 @@ @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l -@ stub _iswprint_l +@ cdecl _iswprint_l(long ptr) MSVCRT__iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 653c156680..bf0fc97438 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -675,7 +675,7 @@ @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l -@ stub _iswprint_l +@ cdecl _iswprint_l(long ptr) MSVCRT__iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 40326a7c86..e38647f0e5 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -640,7 +640,7 @@ @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l -# stub _iswprint_l(long ptr) +@ cdecl _iswprint_l(long ptr) MSVCRT__iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 386764b4e3..caf9b6a908 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1902,6 +1902,14 @@ INT CDECL MSVCRT_iswprint( MSVCRT_wchar_t wc ) return isprintW( wc ); }
+/********************************************************************* + * _iswprint_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswprint_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return isprintW( wc ); +} + /********************************************************************* * _iswpunct_l (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2090e59d9b..d68ce7c1c0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -516,7 +516,7 @@ @ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l @ cdecl _iswgraph_l(long ptr) MSVCRT__iswgraph_l @ cdecl _iswlower_l(long ptr) MSVCRT__iswlower_l -@ stub _iswprint_l +@ cdecl _iswprint_l(long ptr) MSVCRT__iswprint_l @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l
Signed-off-by: Piotr Caban piotr@codeweavers.com
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index 920d962ba6..0a61576bb6 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -33,7 +33,7 @@ @ cdecl _iswpunct_l(long ptr) ucrtbase._iswpunct_l @ cdecl _iswspace_l(long ptr) ucrtbase._iswspace_l @ cdecl _iswupper_l(long ptr) ucrtbase._iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) ucrtbase._iswxdigit_l @ cdecl _isxdigit_l(long ptr) ucrtbase._isxdigit_l @ cdecl _memccpy(ptr ptr long long) ucrtbase._memccpy @ cdecl _memicmp(str str long) ucrtbase._memicmp diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index de81eb88be..151d6ae5af 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1029,7 +1029,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 58e463250e..abb6adafaa 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1375,7 +1375,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index db49594c54..8b7b154a0f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1381,7 +1381,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 749deb816a..d293900ead 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1246,7 +1246,7 @@ @ cdecl _iswpunct_l(long ptr) msvcr120._iswpunct_l @ cdecl _iswspace_l(long ptr) msvcr120._iswspace_l @ cdecl _iswupper_l(long ptr) msvcr120._iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) msvcr120._iswxdigit_l @ cdecl _isxdigit_l(long ptr) msvcr120._isxdigit_l @ cdecl _itoa(long ptr long) msvcr120._itoa @ cdecl _itoa_s(long ptr long long) msvcr120._itoa_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8004353b66..aa89792adb 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -701,7 +701,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index bf0fc97438..cf604b7ad6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -679,7 +679,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e38647f0e5..e4d0aad8fb 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -644,7 +644,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -# stub _iswxdigit_l(long ptr) +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index caf9b6a908..27c9eb8740 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1966,6 +1966,14 @@ INT CDECL MSVCRT_iswxdigit( MSVCRT_wchar_t wc ) return isxdigitW( wc ); }
+/********************************************************************* + * _iswxdigit_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswxdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return isxdigitW( wc ); +} + /********************************************************************* * _iswctype_l (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d68ce7c1c0..1f0975d939 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -520,7 +520,7 @@ @ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l -@ stub _iswxdigit_l +@ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _itoa(long ptr long) MSVCRT__itoa @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s
Signed-off-by: Piotr Caban piotr@codeweavers.com
-
Nikolay Sivov -
Piotr Caban