wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Shawn M. Chapla : gdiplus/tests: Add additional logfont size tests.
by Alexandre Julliard 15 Jul '20

15 Jul '20

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 isxdigitW.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: a2a3537200436802f832ba6bd77766180173012c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2a3537200436802f832ba6b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:06:34 2020 +0200 msvcrt: Don't use isxdigitW. 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 fb494ebe39..29cad7c44e 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2090,19 +2090,19 @@ INT CDECL MSVCRT_iswupper( MSVCRT_wchar_t wc ) } /********************************************************************* - * iswxdigit (MSVCRT.@) + * _iswxdigit_l (MSVCRT.@) */ -INT CDECL MSVCRT_iswxdigit( MSVCRT_wchar_t wc ) +int CDECL MSVCRT__iswxdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return isxdigitW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__HEX, locale ); } /********************************************************************* - * _iswxdigit_l (MSVCRT.@) + * iswxdigit (MSVCRT.@) */ -int CDECL MSVCRT__iswxdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +INT CDECL MSVCRT_iswxdigit( MSVCRT_wchar_t wc ) { - return isxdigitW( wc ); + return MSVCRT__iswxdigit_l( wc, NULL ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use isupperW.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: da164d19e84034c9947726bb192216bfe300f898 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da164d19e84034c9947726bb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:06:29 2020 +0200 msvcrt: Don't use isupperW. 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 f3dac854d8..fb494ebe39 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2074,19 +2074,19 @@ INT CDECL MSVCRT_iswspace( MSVCRT_wchar_t wc ) } /********************************************************************* - * iswupper (MSVCRT.@) + * _iswupper_l (MSVCRT.@) */ -INT CDECL MSVCRT_iswupper( MSVCRT_wchar_t wc ) +int CDECL MSVCRT__iswupper_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return isupperW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__UPPER, locale ); } /********************************************************************* - * _iswupper_l (MSVCRT.@) + * iswupper (MSVCRT.@) */ -int CDECL MSVCRT__iswupper_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +INT CDECL MSVCRT_iswupper( MSVCRT_wchar_t wc ) { - return isupperW( wc ); + return MSVCRT__iswupper_l( wc, NULL ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use ispunctW.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: ab678ee097134927bf140ee79b3537f3c506258b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab678ee097134927bf140ee7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:06:22 2020 +0200 msvcrt: Don't use ispunctW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 82ee5c9ef8..f3dac854d8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2046,7 +2046,7 @@ INT CDECL MSVCRT_iswprint( MSVCRT_wchar_t wc ) */ INT CDECL MSVCRT__iswpunct_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return ispunctW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__PUNCT, locale ); } /********************************************************************* @@ -2054,7 +2054,7 @@ INT CDECL MSVCRT__iswpunct_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) */ INT CDECL MSVCRT_iswpunct( MSVCRT_wchar_t wc ) { - return ispunctW( wc ); + return MSVCRT__iswpunct_l( wc, NULL ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use isprintW.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: f6576c76d99be5ad857e7894455a939476e2d590 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6576c76d99be5ad857e7894… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:06:10 2020 +0200 msvcrt: Don't use isprintW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 2e3a624d3c..82ee5c9ef8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2025,19 +2025,20 @@ INT CDECL MSVCRT_iswlower( MSVCRT_wchar_t wc ) } /********************************************************************* - * iswprint (MSVCRT.@) + * _iswprint_l (MSVCRT.@) */ -INT CDECL MSVCRT_iswprint( MSVCRT_wchar_t wc ) +int CDECL MSVCRT__iswprint_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return isprintW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__ALPHA | MSVCRT__BLANK | + MSVCRT__DIGIT | MSVCRT__PUNCT, locale ); } /********************************************************************* - * _iswprint_l (MSVCRT.@) + * iswprint (MSVCRT.@) */ -int CDECL MSVCRT__iswprint_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +INT CDECL MSVCRT_iswprint( MSVCRT_wchar_t wc ) { - return isprintW( wc ); + return MSVCRT__iswprint_l( wc, NULL ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use islowerW.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: badc282cf7dcff01690f4081cdf867ef1a083d14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=badc282cf7dcff01690f4081… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:06:06 2020 +0200 msvcrt: Don't use islowerW. 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 3f6b56dab8..2e3a624d3c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2009,19 +2009,19 @@ INT CDECL MSVCRT_iswgraph( MSVCRT_wchar_t wc ) } /********************************************************************* - * iswlower (MSVCRT.@) + * _iswlower_l (MSVCRT.@) */ -INT CDECL MSVCRT_iswlower( MSVCRT_wchar_t wc ) +int CDECL MSVCRT__iswlower_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return islowerW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__LOWER, locale ); } /********************************************************************* - * _iswlower_l (MSVCRT.@) + * iswlower (MSVCRT.@) */ -int CDECL MSVCRT__iswlower_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +INT CDECL MSVCRT_iswlower( MSVCRT_wchar_t wc ) { - return islowerW( wc ); + return MSVCRT__iswlower_l( wc, NULL ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use isgraphW.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: 9254edc30d668e59eac487fe3b2b829092c4eb82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9254edc30d668e59eac487fe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:06:00 2020 +0200 msvcrt: Don't use isgraphW. 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 af09d38af4..3f6b56dab8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1993,19 +1993,19 @@ INT CDECL MSVCRT_iswdigit( MSVCRT_wchar_t wc ) } /********************************************************************* - * iswgraph (MSVCRT.@) + * _iswgraph_l (MSVCRT.@) */ -INT CDECL MSVCRT_iswgraph( MSVCRT_wchar_t wc ) +int CDECL MSVCRT__iswgraph_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return isgraphW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__PUNCT, locale ); } /********************************************************************* - * _iswgraph_l (MSVCRT.@) + * iswgraph (MSVCRT.@) */ -int CDECL MSVCRT__iswgraph_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +INT CDECL MSVCRT_iswgraph( MSVCRT_wchar_t wc ) { - return isgraphW( wc ); + return MSVCRT__iswgraph_l( wc, NULL ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use isdigitW.
by Alexandre Julliard 15 Jul '20

15 Jul '20

Module: wine Branch: master Commit: b2e235a8e8777d1530862b6d293ed9075a92405a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2e235a8e8777d1530862b6d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 15 14:05:57 2020 +0200 msvcrt: Don't use isdigitW. 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 e962d00868..af09d38af4 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1977,19 +1977,19 @@ INT CDECL MSVCRT_iswcntrl( MSVCRT_wchar_t wc ) } /********************************************************************* - * iswdigit (MSVCRT.@) + * _iswdigit_l (MSVCRT.@) */ -INT CDECL MSVCRT_iswdigit( MSVCRT_wchar_t wc ) +INT CDECL MSVCRT__iswdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) { - return isdigitW( wc ); + return MSVCRT__iswctype_l( wc, MSVCRT__DIGIT, locale ); } /********************************************************************* - * _iswdigit_l (MSVCRT.@) + * iswdigit (MSVCRT.@) */ -INT CDECL MSVCRT__iswdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +INT CDECL MSVCRT_iswdigit( MSVCRT_wchar_t wc ) { - return isdigitW( wc ); + return MSVCRT__iswdigit_l( wc, NULL ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use iscntrlW.
by Alexandre Julliard 15 Jul '20

15 Jul '20

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 15 Jul '20

15 Jul '20

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

← Newer
1
...
43
44
45
46
47
48
49
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2020