November 2018 - Wine-Commits

Nikolay Sivov : msvcrt: Add _iswgraph_l().
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: b71f1ea1c996b5c36c734d1f3e4fc63c97d48add URL: https://source.winehq.org/git/wine.git/?a=commit;h=b71f1ea1c996b5c36c734d1f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 16 09:31:53 2018 +0300 msvcrt: Add _iswgraph_l(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../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 4667e99..7693755 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 69e5a1b..e38672e 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 8dc1a68..ed930d7 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 d4bcc65..1f3d22d 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 42b3e54..aa4b2b8 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 295fae5..8c69215 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 7c3c3e5..842cb5f 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 9491205..fa234fb 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 b68cc51..c4e27e1 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1855,6 +1855,14 @@ INT CDECL MSVCRT_iswgraph( MSVCRT_wchar_t wc ) } /********************************************************************* + * _iswgraph_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswgraph_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return isgraphW( wc ); +} + +/********************************************************************* * iswlower (MSVCRT.@) */ INT CDECL MSVCRT_iswlower( MSVCRT_wchar_t wc ) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b3f4d9e..adb3198 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

1 0

Nikolay Sivov : msvcrt: Add _iswcntrl_l().
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: 07d5635d98784e6ba6d674dc5a5934e0c25648c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07d5635d98784e6ba6d674dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 16 09:31:55 2018 +0300 msvcrt: Add _iswcntrl_l(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../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 6b01b2b..c29e510 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 5c0506c..afc9e0f 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 757ed7c..24def8e 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 52a3155..2f559f1 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 db607e0..bfb1046 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 baf89f5..26c45cf 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 79dab2e..653c156 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 dbff964..40326a7 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 72a2b71..386764b 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1839,6 +1839,14 @@ INT CDECL MSVCRT_iswcntrl( MSVCRT_wchar_t wc ) } /********************************************************************* + * _iswcntrl_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswcntrl_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return iscntrlW( wc ); +} + +/********************************************************************* * iswdigit (MSVCRT.@) */ INT CDECL MSVCRT_iswdigit( MSVCRT_wchar_t wc ) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 32a646a..2090e59 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

1 0

Nikolay Sivov : msvcrt: Add _iswprint_l().
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: e29fbaeca8458a5ad55c94da92a3446d6c228eb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e29fbaeca8458a5ad55c94da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 16 09:31:56 2018 +0300 msvcrt: Add _iswprint_l(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../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 c29e510..920d962 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 afc9e0f..de81eb8 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 24def8e..58e4632 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 2f559f1..db49594 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 bfb1046..749deb8 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 26c45cf..8004353 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 653c156..bf0fc97 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 40326a7..e38647f 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 386764b..caf9b6a 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1903,6 +1903,14 @@ INT CDECL MSVCRT_iswprint( MSVCRT_wchar_t wc ) } /********************************************************************* + * _iswprint_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswprint_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return isprintW( wc ); +} + +/********************************************************************* * _iswpunct_l (MSVCRT.@) */ INT CDECL MSVCRT__iswpunct_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2090e59..d68ce7c 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

1 0

Gabriel Ivăncescu : user32/tests: Add some tests for LBS_NODATA.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: 2fc9d0afd9f15d5588c0f19fb2b426f3b5623742 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fc9d0afd9f15d5588c0f19f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:13 2018 +0200 user32/tests: Add some tests for LBS_NODATA. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/listbox.c | 156 +++++++++++++++++++++++++++++++++----------- 1 file changed, 118 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2fc9d0afd9f15d5588c0…

1 0

Gabriel Ivăncescu : user32/tests: Add more Listbox tests for ownerdraw styles.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: 686fb7001684ea59b2d0c256c44974d46b60d243 URL: https://source.winehq.org/git/wine.git/?a=commit;h=686fb7001684ea59b2d0c256… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:12 2018 +0200 user32/tests: Add more Listbox tests for ownerdraw styles. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/listbox.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 019d284..4b5d574 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -371,6 +371,35 @@ static void test_ownerdraw(void) ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); DestroyWindow(hLB); + + /* Both FIXED and VARIABLE, FIXED should override VARIABLE. */ + hLB = CreateWindowA("listbox", "TestList", LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, + NULL, NULL, NULL, 0); + ok(hLB != NULL, "last error 0x%08x\n", GetLastError()); + + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(hLB, LB_INSERTSTRING, -1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 13); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); + ok(ret == 13, "Unexpected item height %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETITEMHEIGHT, 1, 42); + ok(ret == LB_OKAY, "Failed to set item height, %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); +todo_wine + ok(ret == 42, "Unexpected item height %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETITEMHEIGHT, 1, 0); + ok(ret == 42, "Unexpected item height %d.\n", ret); + + DestroyWindow (hLB); + DestroyWindow(parent); } @@ -1695,7 +1724,13 @@ static void test_listbox_dlgdir(void) static void test_set_count( void ) { + static const DWORD styles[] = + { + LBS_OWNERDRAWFIXED, + LBS_HASSTRINGS, + }; HWND parent, listbox; + unsigned int i; LONG ret; RECT r; @@ -1725,6 +1760,21 @@ static void test_set_count( void ) ok( !IsRectEmpty( &r ), "got empty rect\n"); DestroyWindow( listbox ); + + for (i = 0; i < ARRAY_SIZE(styles); ++i) + { + listbox = create_listbox( styles[i] | WS_CHILD | WS_VISIBLE, parent ); + + SetLastError( 0xdeadbeef ); + ret = SendMessageA( listbox, LB_SETCOUNT, 100, 0 ); + todo_wine_if(i == 0) + ok( ret == LB_ERR, "expected %d, got %d\n", LB_ERR, ret ); + todo_wine_if(i == 0) + ok( GetLastError() == ERROR_SETCOUNT_ON_BAD_LB, "Unexpected error %d.\n", GetLastError() ); + + DestroyWindow( listbox ); + } + DestroyWindow( parent ); }

1 0

Michael Stefaniuc : dsound: Primary buffers don' t support IDirectSoundNotify.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: b21b6ad717d2cf98ee23591a09442e5ff12813a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b21b6ad717d2cf98ee23591a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 14 22:49:50 2018 +0100 dsound: Primary buffers don't support IDirectSoundNotify. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 1 - dlls/dsound/tests/dsound.c | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index c64a6e7..f74db2f 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -1101,7 +1101,6 @@ static HRESULT WINAPI PrimaryBufferImpl_QueryInterface(IDirectSoundBuffer8 *ifac if ( IsEqualGUID( &IID_IDirectSoundNotify, riid ) ) { ERR("app requested IDirectSoundNotify on primary buffer\n"); - /* FIXME: should we support this? */ return E_NOINTERFACE; } diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 0807d43..89f0aa0 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -465,6 +465,7 @@ static HRESULT test_primary(LPGUID lpGuid) trace(" No Primary\n"); else if (rc==DS_OK && primary!=NULL) { LONG vol; + IDirectSoundNotify *notify; /* Try to create a second primary buffer */ /* DSOUND: Error: The primary buffer already exists. @@ -509,8 +510,10 @@ static HRESULT test_primary(LPGUID lpGuid) ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references\n",ref); ref=IDirectSoundBuffer_Release(primary); - ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, " - "should have 0\n",ref); + ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references\n",ref); + + rc=IDirectSoundBuffer_QueryInterface(primary,&IID_IDirectSoundNotify,(void **)&notify); + ok(rc==E_NOINTERFACE,"IDirectSoundBuffer_QueryInterface() failed %08x\n",rc); } /* Set the CooperativeLevel back to normal */

1 0

Paul Gofman : d3dx9/tests: Add tests for using D3DXLoadSurfaceFromSurface( ) with default render target.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: f9f6f4274968261e3453db586003f03027de797e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9f6f4274968261e3453db58… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Nov 15 20:23:34 2018 +0300 d3dx9/tests: Add tests for using D3DXLoadSurfaceFromSurface() with default render target. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/surface.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 37c488b..469c864 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -861,7 +861,28 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3D_OK); IDirect3DSurface9_Release(newsurf); - } else skip("Failed to create multisampled render target\n"); + } else skip("Failed to create multisampled render target.\n"); + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &newsurf); + ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderTarget returned %#x, expected %#x.\n", hr, D3D_OK); + + hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); + todo_wine + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); + todo_wine + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0xff000000); + todo_wine + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_TRIANGLE | D3DX_FILTER_MIRROR, 0); + todo_wine + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_LINEAR, 0); + todo_wine + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); + + IDirect3DSurface9_Release(newsurf); check_release((IUnknown*)surf, 0);

1 0

Michael Stefaniuc : msgsm32.acm: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: 41b0dbacea989799549b65027948968c881d14bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=41b0dbacea989799549b6502… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 15 20:42:11 2018 +0100 msgsm32.acm: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msgsm32.acm/msgsm32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index 99eef96..cbf396f 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -125,13 +125,13 @@ static LRESULT GSM_DriverDetails(PACMDRIVERDETAILSW add) add->cFilterTags = 0; add->hicon = NULL; MultiByteToWideChar( CP_ACP, 0, "Microsoft GSM 6.10", -1, - add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); + add->szShortName, ARRAY_SIZE( add->szShortName )); MultiByteToWideChar( CP_ACP, 0, "Wine GSM 6.10 libgsm codec", -1, - add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); + add->szLongName, ARRAY_SIZE( add->szLongName )); MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1, - add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR) ); + add->szCopyright, ARRAY_SIZE( add->szCopyright )); MultiByteToWideChar( CP_ACP, 0, "Refer to LICENSE file", -1, - add->szLicensing, sizeof(add->szLicensing)/sizeof(WCHAR) ); + add->szLicensing, ARRAY_SIZE( add->szLicensing )); add->szFeatures[0] = 0; return MMSYSERR_NOERROR; }

1 0

Gabriel Ivăncescu : user32/listbox: Don' t set any data for LBS_NODATA listboxes.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: d30aadd3e12aefc46ffa88e70711e643cee41aff URL: https://source.winehq.org/git/wine.git/?a=commit;h=d30aadd3e12aefc46ffa88e7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:21 2018 +0200 user32/listbox: Don't set any data for LBS_NODATA listboxes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 2 +- dlls/user32/tests/listbox.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index d46f685..7fc724c 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2692,7 +2692,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } - descr->items[wParam].data = lParam; + if (!(descr->style & LBS_NODATA)) descr->items[wParam].data = lParam; /* undocumented: returns TRUE, not LB_OKAY (0) */ return TRUE; diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 2115ee4..d0eb731 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -2104,13 +2104,10 @@ static void test_LBS_NODATA(void) /* More messages that don't work with LBS_NODATA. */ ret = SendMessageA(listbox, LB_FINDSTRING, 1, 42); -todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_FINDSTRINGEXACT, 1, 42); -todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); ret = SendMessageA(listbox, LB_SELECTSTRING, 1, 42); -todo_wine ok(ret == LB_ERR, "Unexpected return value %d.\n", ret); DestroyWindow(listbox);

1 0

Gabriel Ivăncescu : user32/listbox: Make SetCount fail if LBS_NODATA is not set.
by Alexandre Julliard Nov. 16, 2018

Nov. 16, 2018

Module: wine Branch: master Commit: 0a5c360f39b36c9e5bac6e6bb51e1766fe8b8025 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a5c360f39b36c9e5bac6e6b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 15 11:46:17 2018 +0200 user32/listbox: Make SetCount fail if LBS_NODATA is not set. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 2 +- dlls/user32/tests/listbox.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 2fcd735..b5b7dc6 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1757,7 +1757,7 @@ static LRESULT LISTBOX_SetCount( LB_DESCR *descr, INT count ) { LRESULT ret; - if (HAS_STRINGS(descr)) + if (!(descr->style & LBS_NODATA)) { SetLastError(ERROR_SETCOUNT_ON_BAD_LB); return LB_ERR; diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 776e3f3..813968f 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -264,7 +264,6 @@ static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA } else { - todo_wine_if((style & LBS_NODATA) && strings[mi->itemID]) ok((void*)mi->itemData == strings[mi->itemID], "mi->itemData = %08lx, expected %p\n", mi->itemData, strings[mi->itemID]); } @@ -1765,9 +1764,7 @@ static void test_set_count( void ) SetLastError( 0xdeadbeef ); ret = SendMessageA( listbox, LB_SETCOUNT, 100, 0 ); - todo_wine_if(i == 0) ok( ret == LB_ERR, "expected %d, got %d\n", LB_ERR, ret ); - todo_wine_if(i == 0) ok( GetLastError() == ERROR_SETCOUNT_ON_BAD_LB, "Unexpected error %d.\n", GetLastError() ); DestroyWindow( listbox ); @@ -2137,7 +2134,6 @@ todo_wine style = GetWindowLongA(listbox, GWL_STYLE); ok((style & invalid_styles[i]) == invalid_styles[i], "%u: unexpected window styles %#x.\n", i, style); ret = SendMessageA(listbox, LB_SETCOUNT, 100, 0); - todo_wine_if(i == 1 || i == 4) ok(ret == LB_ERR, "%u: unexpected return value %d.\n", i, ret); DestroyWindow(listbox); }

1 0