wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Martin Storsjo : msvcrt: Fix strtof() error reporting for values out of float range.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 057ecd41cc98cc8c18b04058c0f4323495904e07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=057ecd41cc98cc8c18b04058… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 17:43:19 2021 +0300 msvcrt: Fix strtof() error reporting for values out of float range. If the values weren't out of range for the internal strtod() call, we still must mark them as out of range when returning as float. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 8 +++++++- dlls/msvcrt/wcs.c | 8 +++++++- dlls/ucrtbase/tests/string.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 27e3284326a..4d09405094d 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1065,7 +1065,13 @@ double CDECL strtod( const char *str, char **end ) */ float CDECL _strtof_l( const char *str, char **end, _locale_t locale ) { - return _strtod_l(str, end, locale); + double ret = _strtod_l(str, end, locale); + if (ret && isfinite(ret)) { + float f = ret; + if (!f || !isfinite(f)) + *_errno() = ERANGE; + } + return ret; } /********************************************************************* diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 615b4f36a33..aeab5527db4 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -798,7 +798,13 @@ double CDECL _wtof_l(const wchar_t *str, _locale_t locale) */ float CDECL _wcstof_l( const wchar_t *str, wchar_t **end, _locale_t locale ) { - return _wcstod_l(str, end, locale); + double ret = _wcstod_l(str, end, locale); + if (ret && isfinite(ret)) { + float f = ret; + if (!f || !isfinite(f)) + *_errno() = ERANGE; + } + return ret; } /********************************************************************* diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 9b1d21b801c..734dd68db76 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -152,6 +152,42 @@ static void test_strtod(void) test_strtod_str_errno("2.47e-324", 0, 9, ERANGE); } +static void test_strtof(void) +{ + static const struct { + const char *str; + int len; + float ret; + int err; + } tests[] = { + { "12.1", 4, 12.1f }, + { "-13.721", 7, -13.721f }, + { "1.e40", 5, INFINITY, ERANGE }, + { "-1.e40", 6, -INFINITY, ERANGE }, + { "0.0", 3, 0.0f }, + { "-0.0", 4, 0.0f }, + { "1.4e-45", 7, 1.4e-45f }, + { "-1.4e-45", 8, -1.4e-45f }, + { "1.e-60", 6, 0, ERANGE }, + { "-1.e-60", 7, 0, ERANGE }, + }; + + char *end; + float f; + int i; + + for (i=0; i<ARRAY_SIZE(tests); i++) + { + errno = 0xdeadbeef; + f = strtof(tests[i].str, &end); + ok(f == tests[i].ret, "%d) f = %.16e\n", i, f); + ok(end == tests[i].str + tests[i].len, "%d) len = %d\n", + i, (int)(end - tests[i].str)); + ok(errno == tests[i].err || (!tests[i].err && errno == 0xdeadbeef), + "%d) errno = %d\n", i, errno); + } +} + static void test__memicmp(void) { static const char *s1 = "abc"; @@ -558,6 +594,7 @@ START_TEST(string) "Invalid parameter handler was already set\n"); test_strtod(); + test_strtof(); test__memicmp(); test__memicmp_l(); test___strncnt();

1 0

Martin Storsjo : msvcrt: Add hyperbolic functions NAN tests.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 868c9ee7c92a528461fc1d00d30e75dbb85958bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=868c9ee7c92a528461fc1d00… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:42:24 2021 +0200 msvcrt: Add hyperbolic functions NAN tests. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/misc.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index b38915596df..81c23dd23f2 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -491,8 +491,35 @@ static void test_qsort_s(void) ok(tab[i] == i, "data sorted incorrectly on position %d: %d\n", i, tab[i]); } +static int eq_nan(UINT64 ai, double b) +{ + UINT64 bi = *(UINT64*)&b; + UINT64 mask; + +#if defined(__i386__) + mask = 0xFFFFFFFF00000000ULL; +#else + mask = ~0; +#endif + + ok((ai & mask) == (bi & mask), "comparing %s and %s\n", + wine_dbgstr_longlong(ai), wine_dbgstr_longlong(bi)); + return (ai & mask) == (bi & mask); +} + +static int eq_nanf(DWORD ai, float b) +{ + DWORD bi = *(DWORD*)&b; + ok(ai == bi, "comparing %08x and %08x\n", ai, bi); + return ai == bi; +} + static void test_math_functions(void) { + static const UINT64 test_nan_i = 0xFFF0000123456780ULL; + static const DWORD test_nanf_i = 0xFF801234; + double test_nan = *(double*)&test_nan_i; + float test_nanf = *(float*)&test_nanf_i; double ret; errno = 0xdeadbeef; @@ -525,6 +552,13 @@ static void test_math_functions(void) errno = 0xdeadbeef; p_exp(INFINITY); ok(errno == 0xdeadbeef, "errno = %d\n", errno); + + ok(eq_nan(test_nan_i | (1ULL << 51), cosh(test_nan)), "cosh not preserving nan\n"); + ok(eq_nan(test_nan_i | (1ULL << 51), sinh(test_nan)), "sinh not preserving nan\n"); + ok(eq_nan(test_nan_i | (1ULL << 51), tanh(test_nan)), "tanh not preserving nan\n"); + ok(eq_nanf(test_nanf_i | (1 << 22), coshf(test_nanf)), "coshf not preserving nan\n"); + ok(eq_nanf(test_nanf_i | (1 << 22), sinhf(test_nanf)), "sinhf not preserving nan\n"); + ok(eq_nanf(test_nanf_i | (1 << 22), tanhf(test_nanf)), "tanhf not preserving nan\n"); } static void __cdecl test_thread_func(void *end_thread_type)

1 0

Martin Storsjo : msvcrt: Make the tanh function NAN preserving.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 07ec052e5423f6bbacc2bac0c5684211cecca04f URL: https://source.winehq.org/git/wine.git/?a=commit;h=07ec052e5423f6bbacc2bac0… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:42:19 2021 +0200 msvcrt: Make the tanh function NAN preserving. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a2b03110cf0..69b807f722c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4336,12 +4336,11 @@ double CDECL tan( double x ) double CDECL tanh( double x ) { UINT64 ui = *(UINT64*)&x; + UINT64 sign = ui & 0x8000000000000000ULL; UINT32 w; - int sign; double t; /* x = |x| */ - sign = ui >> 63; ui &= (UINT64)-1 / 2; x = *(double*)&ui; w = ui >> 32; @@ -4349,11 +4348,15 @@ double CDECL tanh( double x ) if (w > 0x3fe193ea) { /* |x| > log(3)/2 ~= 0.5493 or nan */ if (w > 0x40340000) { + if (ui > 0x7ff0000000000000ULL) { + *(UINT64*)&x = ui | sign | 0x0008000000000000ULL; #if _MSVCR_VER < 140 - if (isnan(x)) return math_error(_DOMAIN, "tanh", x, 0, x); +#else + return x; #endif - /* |x| > 20 or nan */ + } + /* |x| > 20 */ /* note: this branch avoids raising overflow */ fp_barrier(x + 0x1p120f); t = 1 - 0 / x;

1 0

Martin Storsjo : msvcrt: Make the sinh function NAN preserving.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 11166aa01e7d17f8535977f648c0b5e098d43bd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11166aa01e7d17f8535977f6… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:42:14 2021 +0200 msvcrt: Make the sinh function NAN preserving. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2bd4206359b..a2b03110cf0 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4046,6 +4046,7 @@ double CDECL sin( double x ) double CDECL sinh( double x ) { UINT64 ux = *(UINT64*)&x; + UINT64 sign = ux & 0x8000000000000000ULL; UINT32 w; double t, h, absx; @@ -4070,7 +4071,10 @@ double CDECL sinh( double x ) /* |x| > log(DBL_MAX) or nan */ /* note: the result is stored to handle overflow */ - t = __expo2(absx, 2 * h); + if (ux > 0x7ff0000000000000ULL) + *(UINT64*)&t = ux | sign | 0x0008000000000000ULL; + else + t = __expo2(absx, 2 * h); return t; }

1 0

Martin Storsjo : msvcrt: Make the cosh function NAN preserving.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 60d178b410ba943c6c39b2ccf1deaec264d7d21a URL: https://source.winehq.org/git/wine.git/?a=commit;h=60d178b410ba943c6c39b2cc… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:42:09 2021 +0200 msvcrt: Make the cosh function NAN preserving. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a902d4f04b9..2bd4206359b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2776,6 +2776,7 @@ static double __expo2(double x, double sign) double CDECL cosh( double x ) { UINT64 ux = *(UINT64*)&x; + UINT64 sign = ux & 0x8000000000000000ULL; UINT32 w; double t; @@ -2803,7 +2804,10 @@ double CDECL cosh( double x ) /* |x| > log(DBL_MAX) or nan */ /* note: the result is stored to handle overflow */ - t = __expo2(x, 1.0); + if (ux > 0x7ff0000000000000ULL) + *(UINT64*)&t = ux | sign | 0x0008000000000000ULL; + else + t = __expo2(x, 1.0); return t; }

1 0

Martin Storsjo : msvcrt: Make the tanhf function NAN preserving.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: e93e2467195c4cc363d567f1be2ab87b61988b26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e93e2467195c4cc363d567f1… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:42:03 2021 +0200 msvcrt: Make the tanhf function NAN preserving. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 29912431bcd..a902d4f04b9 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1881,21 +1881,24 @@ float CDECL tanf( float x ) float CDECL tanhf( float x ) { UINT32 ui = *(UINT32*)&x; - int sign; + UINT32 sign = ui & 0x80000000; float t; /* x = |x| */ - sign = ui >> 31; ui &= 0x7fffffff; x = *(float*)&ui; if (ui > 0x3f0c9f54) { /* |x| > log(3)/2 ~= 0.5493 or nan */ if (ui > 0x41200000) { + if (ui > 0x7f800000) { + *(UINT32*)&x = ui | sign | 0x400000; #if _MSVCR_VER < 140 - if (isnan(x)) return math_error(_DOMAIN, "tanhf", x, 0, x); +#else + return x; #endif + } /* |x| > 10 */ fp_barrierf(x + 0x1p120f); t = 1 + 0 / x;

1 0

Martin Storsjo : msvcrt: Make the sinhf function NAN preserving.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 4fd9daea4a79d0826c9e5ab6466291043e40d579 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fd9daea4a79d0826c9e5ab6… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:41:57 2021 +0200 msvcrt: Make the sinhf function NAN preserving. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 92bf12b4d54..29912431bcd 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1699,7 +1699,10 @@ float CDECL sinhf( float x ) } /* |x| > logf(FLT_MAX) or nan */ - t = __expo2f(absx, 2 * h); + if (ui > 0x7f800000) + *(DWORD*)&t = *(DWORD*)&x | 0x400000; + else + t = __expo2f(absx, 2 * h); return t; }

1 0

Martin Storsjo : msvcrt: Make the coshf function NAN preserving.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 361143252bf23b6f29eead49a3715fdd6d552e8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=361143252bf23b6f29eead49… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 28 14:41:51 2021 +0200 msvcrt: Make the coshf function NAN preserving. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4e5dedd3576..92bf12b4d54 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1137,6 +1137,7 @@ static float __expo2f(float x, float sign) float CDECL coshf( float x ) { UINT32 ui = *(UINT32*)&x; + UINT32 sign = ui & 0x80000000; float t; /* |x| */ @@ -1160,7 +1161,10 @@ float CDECL coshf( float x ) } /* |x| > log(FLT_MAX) or nan */ - t = __expo2f(x, 1.0f); + if (ui > 0x7f800000) + *(UINT32*)&t = ui | sign | 0x400000; + else + t = __expo2f(x, 1.0f); return t; }

1 0

Jacek Caban : gdi32: Store arc direction in DC_ATTR.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 85e934e4b8f8578dc9486cc39a481e31418b4ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85e934e4b8f8578dc9486cc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 11:40:15 2021 +0200 gdi32: Store arc direction in DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 25 ++++--------------------- dlls/gdi32/dibdrv/graphics.c | 8 ++++---- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/path.c | 14 +++++++------- include/ntgdi.h | 1 + 6 files changed, 25 insertions(+), 33 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 71d27c03e4f..55b48b2be5f 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -102,7 +102,7 @@ static void set_initial_dc_state( DC *dc ) dc->attr->graphics_mode = GM_COMPATIBLE; dc->attr->cur_pos.x = 0; dc->attr->cur_pos.y = 0; - dc->ArcDirection = AD_COUNTERCLOCKWISE; + dc->attr->arc_direction = AD_COUNTERCLOCKWISE; dc->xformWorld2Wnd.eM11 = 1.0f; dc->xformWorld2Wnd.eM12 = 0.0f; dc->xformWorld2Wnd.eM21 = 0.0f; @@ -409,7 +409,6 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->breakExtra = dc->breakExtra; newdc->breakRem = dc->breakRem; newdc->MapMode = dc->MapMode; - newdc->ArcDirection = dc->ArcDirection; newdc->xformWorld2Wnd = dc->xformWorld2Wnd; newdc->xformWorld2Vport = dc->xformWorld2Vport; newdc->xformVport2World = dc->xformVport2World; @@ -486,7 +485,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->MapMode = dcs->MapMode; dc->attr->graphics_mode = dcs->attr->graphics_mode; dc->attr->cur_pos = dcs->attr->cur_pos; - dc->ArcDirection = dcs->ArcDirection; + dc->attr->arc_direction = dcs->attr->arc_direction; dc->xformWorld2Wnd = dcs->xformWorld2Wnd; dc->xformWorld2Vport = dcs->xformWorld2Vport; dc->xformVport2World = dcs->xformVport2World; @@ -991,22 +990,6 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) } -/*********************************************************************** - * GetArcDirection (GDI32.@) - */ -INT WINAPI GetArcDirection( HDC hdc ) -{ - INT ret = 0; - DC * dc = get_dc_ptr( hdc ); - if (dc) - { - ret = dc->ArcDirection; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetArcDirection (GDI32.@) */ @@ -1027,8 +1010,8 @@ INT WINAPI SetArcDirection( HDC hdc, INT dir ) dir = physdev->funcs->pSetArcDirection( physdev, dir ); if (dir) { - ret = dc->ArcDirection; - dc->ArcDirection = dir; + ret = dc->attr->arc_direction; + dc->attr->arc_direction = dir; } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 3eb9c5184a4..30ffad70b02 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -347,9 +347,9 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, { points[0] = dc->attr->cur_pos; lp_to_dp( dc, points, 1 ); - count = 1 + get_arc_points( dc->ArcDirection, &rect, pt[0], pt[1], points + 1 ); + count = 1 + get_arc_points( dc->attr->arc_direction, &rect, pt[0], pt[1], points + 1 ); } - else count = get_arc_points( dc->ArcDirection, &rect, pt[0], pt[1], points ); + else count = get_arc_points( dc->attr->arc_direction, &rect, pt[0], pt[1], points ); if (extra_lines == 2) { @@ -1396,7 +1396,7 @@ BOOL CDECL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bott rect.bottom--; reset_dash_origin(pdev); - if (dc->ArcDirection == AD_CLOCKWISE) + if (dc->attr->arc_direction == AD_CLOCKWISE) { /* 4 pts going clockwise starting from bottom-right */ pts[0].x = pts[3].x = rect.right; @@ -1493,7 +1493,7 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott count = ellipse_first_quadrant( ellipse_width, ellipse_height, points ); - if (dc->ArcDirection == AD_CLOCKWISE) + if (dc->attr->arc_direction == AD_CLOCKWISE) { for (i = 0; i < count; i++) { diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 3a4e6e48899..7f8af0552bf 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -124,6 +124,15 @@ INT WINAPI GetGraphicsMode( HDC hdc ) return dc_attr ? dc_attr->graphics_mode : 0; } +/*********************************************************************** + * GetArcDirection (GDI32.@) + */ +INT WINAPI GetArcDirection( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->arc_direction : 0; +} + /*********************************************************************** * GetLayout (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 110fc622d03..0f01102ed9d 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -129,7 +129,6 @@ typedef struct tagDC INT breakRem; /* breakTotalExtra % breakCount */ INT MapMode; ABORTPROC pAbortProc; /* AbortProc for Printing */ - INT ArcDirection; XFORM xformWorld2Wnd; /* World-to-window transformation */ XFORM xformWorld2Vport; /* World-to-viewport transformation */ XFORM xformVport2World; /* Inverse of the above transformation */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index ff3ab04480c..8761723f62e 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -893,7 +893,7 @@ static BOOL CDECL pathdrv_Rectangle( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 points[2].x = corners[0].x; points[2].y = corners[1].y; points[3] = corners[1]; - if (dc->ArcDirection == AD_CLOCKWISE) reverse_points( points, 4 ); + if (dc->attr->arc_direction == AD_CLOCKWISE) reverse_points( points, 4 ); if (!(type = add_points( physdev->path, points, 4, PT_LINETO ))) return FALSE; type[0] = PT_MOVETO; @@ -968,7 +968,7 @@ static BOOL CDECL pathdrv_RoundRect( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 points[15].x = corners[1].x; points[15].y = corners[1].y - GDI_ROUND( height ); - if (dc->ArcDirection == AD_CLOCKWISE) reverse_points( points, 16 ); + if (dc->attr->arc_direction == AD_CLOCKWISE) reverse_points( points, 16 ); if (!(type = add_points( physdev->path, points, 16, PT_BEZIERTO ))) return FALSE; type[0] = PT_MOVETO; type[4] = type[8] = type[12] = PT_LINETO; @@ -1026,7 +1026,7 @@ static BOOL CDECL pathdrv_Ellipse( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) points[12].x = corners[1].x; points[12].y = corners[1].y - GDI_ROUND( height ); - if (dc->ArcDirection == AD_CLOCKWISE) reverse_points( points, 13 ); + if (dc->attr->arc_direction == AD_CLOCKWISE) reverse_points( points, 13 ); if (!(type = add_points( physdev->path, points, 13, PT_BEZIERTO ))) return FALSE; type[0] = PT_MOVETO; close_figure( physdev->path ); @@ -1206,7 +1206,7 @@ static BOOL CDECL pathdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bo { DC *dc = get_physdev_dc( dev ); return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, - dc->ArcDirection, 0 ); + dc->attr->arc_direction, 0 ); } @@ -1218,7 +1218,7 @@ static BOOL CDECL pathdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT { DC *dc = get_physdev_dc( dev ); return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, - dc->ArcDirection, -1 ); + dc->attr->arc_direction, -1 ); } @@ -1230,7 +1230,7 @@ static BOOL CDECL pathdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT { DC *dc = get_physdev_dc( dev ); return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, - dc->ArcDirection, 1 ); + dc->attr->arc_direction, 1 ); } @@ -1242,7 +1242,7 @@ static BOOL CDECL pathdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bo { DC *dc = get_physdev_dc( dev ); return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, - dc->ArcDirection, 2 ); + dc->attr->arc_direction, 2 ); } diff --git a/include/ntgdi.h b/include/ntgdi.h index c1221d7995b..ba9d1fe7a00 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -103,6 +103,7 @@ typedef struct DC_ATTR COLORREF text_color; POINT cur_pos; INT graphics_mode; + INT arc_direction; DWORD layout; WORD text_align; WORD background_mode;

1 0

Jacek Caban : gdi32: Store text color in DC_ATTR.
by Alexandre Julliard 28 Jul '21

28 Jul '21

Module: wine Branch: master Commit: 454b0fcb1eb692a7a5754aefb10b6a4f0553f35e URL: https://source.winehq.org/git/wine.git/?a=commit;h=454b0fcb1eb692a7a5754aef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 28 11:40:07 2021 +0200 gdi32: Store text color in DC_ATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/dc.c | 29 ++++++----------------------- dlls/gdi32/dib.c | 2 +- dlls/gdi32/dibdrv/graphics.c | 4 ++-- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/font.c | 4 ++-- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/ntgdi_private.h | 1 - include/ntgdi.h | 1 + 9 files changed, 23 insertions(+), 31 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index b58419f1c78..39b28cba6df 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -262,7 +262,7 @@ static RGBQUAD get_dc_rgb_color( DC *dc, int color_table_size, COLORREF color ) void get_mono_dc_colors( DC *dc, int color_table_size, BITMAPINFO *info, int count ) { info->bmiColors[count - 1] = get_dc_rgb_color( dc, color_table_size, dc->attr->background_color ); - if (count > 1) info->bmiColors[0] = get_dc_rgb_color( dc, color_table_size, dc->textColor ); + if (count > 1) info->bmiColors[0] = get_dc_rgb_color( dc, color_table_size, dc->attr->text_color ); info->bmiHeader.biClrUsed = count; } diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3725bd1abf6..71d27c03e4f 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -90,7 +90,7 @@ static void set_initial_dc_state( DC *dc ) dc->attr->background_color = RGB( 255, 255, 255 ); dc->dcBrushColor = RGB( 255, 255, 255 ); dc->dcPenColor = RGB( 0, 0, 0 ); - dc->textColor = RGB( 0, 0, 0 ); + dc->attr->text_color = RGB( 0, 0, 0 ); dc->brush_org.x = 0; dc->brush_org.y = 0; dc->mapperFlags = 0; @@ -275,7 +275,7 @@ void DC_InitDC( DC* dc ) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pRealizeDefaultPalette ); physdev->funcs->pRealizeDefaultPalette( physdev ); - SetTextColor( dc->hSelf, dc->textColor ); + SetTextColor( dc->hSelf, dc->attr->text_color ); SetBkColor( dc->hSelf, dc->attr->background_color ); NtGdiSelectPen( dc->hSelf, dc->hPen ); NtGdiSelectBrush( dc->hSelf, dc->hBrush ); @@ -401,7 +401,6 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->polyFillMode = dc->polyFillMode; newdc->stretchBltMode = dc->stretchBltMode; newdc->relAbsMode = dc->relAbsMode; - newdc->textColor = dc->textColor; newdc->dcBrushColor = dc->dcBrushColor; newdc->dcPenColor = dc->dcPenColor; newdc->brush_org = dc->brush_org; @@ -475,7 +474,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->relAbsMode = dcs->relAbsMode; dc->attr->background_mode = dcs->attr->background_mode; dc->attr->background_color = dcs->attr->background_color; - dc->textColor = dcs->textColor; + dc->attr->text_color = dcs->attr->text_color; dc->dcBrushColor = dcs->dcBrushColor; dc->dcPenColor = dcs->dcPenColor; dc->brush_org = dcs->brush_org; @@ -527,7 +526,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) NtGdiSelectFont( dev->hdc, dcs->hFont ); NtGdiSelectPen( dev->hdc, dcs->hPen ); SetBkColor( dev->hdc, dcs->attr->background_color); - SetTextColor( dev->hdc, dcs->textColor); + SetTextColor( dev->hdc, dcs->attr->text_color); GDISelectPalette( dev->hdc, dcs->hPalette, FALSE ); dc->saved_dc = dcs->saved_dc; @@ -929,22 +928,6 @@ COLORREF WINAPI SetBkColor( HDC hdc, COLORREF color ) } -/*********************************************************************** - * GetTextColor (GDI32.@) - */ -COLORREF WINAPI GetTextColor( HDC hdc ) -{ - COLORREF ret = 0; - DC * dc = get_dc_ptr( hdc ); - if (dc) - { - ret = dc->textColor; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * SetTextColor (GDI32.@) */ @@ -958,8 +941,8 @@ COLORREF WINAPI SetTextColor( HDC hdc, COLORREF color ) if (dc) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetTextColor ); - ret = dc->textColor; - dc->textColor = physdev->funcs->pSetTextColor( physdev, color ); + ret = dc->attr->text_color; + dc->attr->text_color = physdev->funcs->pSetTextColor( physdev, color ); release_dc_ptr( dc ); } return ret; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 4c65b271661..22237b207a5 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -937,7 +937,7 @@ UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, const RGBQUA if (result) /* update colors of selected objects */ { - SetTextColor( hdc, dc->textColor ); + SetTextColor( hdc, dc->attr->text_color ); SetBkColor( hdc, dc->attr->background_color ); NtGdiSelectPen( hdc, dc->hPen ); NtGdiSelectBrush( hdc, dc->hBrush ); diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 402b1b10323..3eb9c5184a4 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -674,7 +674,7 @@ static inline void get_text_bkgnd_masks( DC *dc, const dib_info *dib, rop_mask * mask->xor = get_pixel_color( dc, dib, bg, FALSE ); else { - COLORREF fg = dc->textColor; + COLORREF fg = dc->attr->text_color; mask->xor = get_pixel_color( dc, dib, fg, TRUE ); if (fg != bg) mask->xor = ~mask->xor; } @@ -823,7 +823,7 @@ static void render_string( DC *dc, dib_info *dib, struct cached_font *font, INT glyph_dib.bits.is_copy = FALSE; glyph_dib.bits.free = NULL; - text_color = get_pixel_color( dc, dib, dc->textColor, TRUE ); + text_color = get_pixel_color( dc, dib, dc->attr->text_color, TRUE ); if (glyph_dib.bit_count == 32) intensity.gamma_ramp = dc->font_gamma_ramp; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index e34e78550eb..3a0ea7465a6 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1981,7 +1981,7 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * BOOL got_pixel; COLORREF color; - color = make_rgb_colorref( dc, &pdev->dib, dc->textColor, &got_pixel, &pixel ); + color = make_rgb_colorref( dc, &pdev->dib, dc->attr->text_color, &got_pixel, &pixel ); color_table[0].rgbRed = GetRValue( color ); color_table[0].rgbGreen = GetGValue( color ); color_table[0].rgbBlue = GetBValue( color ); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index e9595caa503..6e4a52fec02 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5783,7 +5783,7 @@ BOOL CDECL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT } } - pen = CreatePen( PS_SOLID, 1, dc->textColor ); + pen = CreatePen( PS_SOLID, 1, dc->attr->text_color ); orig = NtGdiSelectPen( dev->hdc, pen ); for (i = 0; i < count; i++) @@ -6238,7 +6238,7 @@ done: OUTLINETEXTMETRICW* otm = NULL; POINT pts[5]; HPEN hpen = NtGdiSelectPen(hdc, GetStockObject(NULL_PEN)); - HBRUSH hbrush = CreateSolidBrush(dc->textColor); + HBRUSH hbrush = CreateSolidBrush( dc->attr->text_color ); hbrush = NtGdiSelectBrush(hdc, hbrush); diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index d16d6c8d94a..3a4e6e48899 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -74,6 +74,15 @@ COLORREF WINAPI GetBkColor( HDC hdc ) return dc_attr ? dc_attr->background_color : CLR_INVALID; } +/*********************************************************************** + * GetTextColor (GDI32.@) + */ +COLORREF WINAPI GetTextColor( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->text_color : 0; +} + /*********************************************************************** * GetBkMode (GDI32.@) */ diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 65a06db61e5..110fc622d03 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -119,7 +119,6 @@ typedef struct tagDC WORD polyFillMode; WORD stretchBltMode; WORD relAbsMode; - COLORREF textColor; COLORREF dcBrushColor; COLORREF dcPenColor; POINT brush_org; diff --git a/include/ntgdi.h b/include/ntgdi.h index cb238b6eda1..c1221d7995b 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -100,6 +100,7 @@ typedef struct DC_ATTR { LONG disabled; /* disabled flag, controled by DCHF_(DISABLE|ENABLE)DC */ COLORREF background_color; + COLORREF text_color; POINT cur_pos; INT graphics_mode; DWORD layout;

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
73
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 2021