wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Piotr Caban : msvcrt: Don't set x87 control word in x86_64 fesetenv.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 67c7c40351741ce3ceecddc22eb1e298af170eb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67c7c40351741ce3ceecddc2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 21 13:21:23 2021 +0200 msvcrt: Don't set x87 control word in x86_64 fesetenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2b7249c5451..922fd7818a5 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5873,6 +5873,7 @@ int CDECL fesetenv(const fenv_t *env) { #if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) unsigned int x87_cw, sse_cw, x87_stat, sse_stat; +#ifdef __i386__ struct { WORD control_word; WORD unused1; @@ -5887,6 +5888,7 @@ int CDECL fesetenv(const fenv_t *env) WORD data_segment; WORD unused5; } fenv; +#endif TRACE( "(%p)\n", env ); @@ -5900,6 +5902,7 @@ int CDECL fesetenv(const fenv_t *env) if (!fenv_decode(env->_Fe_stat, &x87_stat, &sse_stat)) return 1; +#ifdef __i386__ __asm__ __volatile__( "fnstenv %0" : "=m" (fenv) ); fenv.control_word &= ~0xc3d; @@ -5938,6 +5941,7 @@ int CDECL fesetenv(const fenv_t *env) __asm__ __volatile__( "fldenv %0" : : "m" (fenv) : "st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)" ); +#endif if (sse2_supported) {

1 0

Piotr Caban : msvcrt: Introduce fenv_decode helper in all runtime versions.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 5189d73b54ffd65e4f3ff9b3c90a8c1a2aa91cc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5189d73b54ffd65e4f3ff9b3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 21 13:21:18 2021 +0200 msvcrt: Introduce fenv_decode helper in all runtime versions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e61c079f105..2b7249c5451 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5651,6 +5651,14 @@ static BOOL fenv_decode(__msvcrt_ulong enc, unsigned int *x, unsigned int *y) return TRUE; } #endif +#elif _MSVCR_VER >= 120 +#if (defined(__i386__) || defined(__x86_64__)) +static BOOL fenv_decode(__msvcrt_ulong enc, unsigned int *x, unsigned int *y) +{ + *x = *y = enc; + return TRUE; +} +#endif #endif #if _MSVCR_VER>=120 @@ -5887,15 +5895,10 @@ int CDECL fesetenv(const fenv_t *env) return 0; } -#if _MSVCR_VER>=140 if (!fenv_decode(env->_Fe_ctl, &x87_cw, &sse_cw)) return 1; if (!fenv_decode(env->_Fe_stat, &x87_stat, &sse_stat)) return 1; -#else - x87_cw = sse_cw = env->_Fe_ctl; - x87_stat = sse_stat = env->_Fe_stat; -#endif __asm__ __volatile__( "fnstenv %0" : "=m" (fenv) );

1 0

Piotr Caban : msvcrt: Use _MCW_RC rounding mask in fesetround and fegetround.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: bf859348ade4ff7dde0f587cd6d5ee40115b63cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf859348ade4ff7dde0f587c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 21 13:21:12 2021 +0200 msvcrt: Use _MCW_RC rounding mask in fesetround and fegetround. 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, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ecf5fdce4d8..e61c079f105 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5801,7 +5801,7 @@ int CDECL __fpe_flt_rounds(void) */ int CDECL fegetround(void) { - return _controlfp(0, 0) & _RC_CHOP; + return _controlfp(0, 0) & _MCW_RC; } /********************************************************************* @@ -5809,9 +5809,9 @@ int CDECL fegetround(void) */ int CDECL fesetround(int round_mode) { - if (round_mode & (~_RC_CHOP)) + if (round_mode & (~_MCW_RC)) return 1; - _controlfp(round_mode, _RC_CHOP); + _controlfp(round_mode, _MCW_RC); return 0; }

1 0

Biswapriyo Nath : include: Add structure padding for aarch64 in dbghelp.h.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 8647f7baa2ad2a33446b17f59f141f218dd5cb16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8647f7baa2ad2a33446b17f5… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Jul 21 14:41:57 2021 +0530 include: Add structure padding for aarch64 in dbghelp.h. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbghelp.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/dbghelp.h b/include/dbghelp.h index 303c0109d1f..bf235c7f97a 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -587,6 +587,9 @@ typedef struct _MINIDUMP_THREAD_CALLBACK { ULONG ThreadId; HANDLE ThreadHandle; +#if defined(__aarch64__) + ULONG Pad; +#endif CONTEXT Context; ULONG SizeOfContext; ULONG64 StackBase; @@ -597,6 +600,9 @@ typedef struct _MINIDUMP_THREAD_EX_CALLBACK { ULONG ThreadId; HANDLE ThreadHandle; +#if defined(__aarch64__) + ULONG Pad; +#endif CONTEXT Context; ULONG SizeOfContext; ULONG64 StackBase;

1 0

Jacek Caban : gdi32: Use NtGdiAngleArc for AngleArc implementation.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 3713901dffb3a795c1bb29219e83b4879ac82d36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3713901dffb3a795c1bb2921… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:20:02 2021 +0200 gdi32: Use NtGdiAngleArc for AngleArc implementation. 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/enhmfdrv/dc.c | 14 +------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/graphics.c | 6 +++--- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 15 +++++++++++++++ dlls/gdi32/painting.c | 6 ++---- 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index c19c9527dc2..7e09216cdea 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -600,18 +600,6 @@ static BOOL CDECL emfpathdrv_AbortPath( PHYSDEV dev ) return next->funcs->pAbortPath( next ); } -/*********************************************************************** - * emfpathdrv_AngleArc - */ -static BOOL CDECL emfpathdrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) -{ - PHYSDEV emfdev = get_emfdev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pAngleArc ); - - return (emfdev->funcs->pAngleArc( emfdev, x, y, radius, start, sweep ) && - next->funcs->pAngleArc( next, x, y, radius, start, sweep )); -} - /*********************************************************************** * emfpathdrv_BeginPath */ @@ -785,7 +773,7 @@ static const struct gdi_dc_funcs emfpath_driver = NULL, /* pAbortDoc */ emfpathdrv_AbortPath, /* pAbortPath */ NULL, /* pAlphaBlend */ - emfpathdrv_AngleArc, /* pAngleArc */ + NULL, /* pAngleArc */ NULL, /* pArc */ NULL, /* pArcTo */ emfpathdrv_BeginPath, /* pBeginPath */ diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 9f9799a54da..dd4ed6ad4d2 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -61,7 +61,6 @@ extern DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) DECLSPEC_H extern BOOL CDECL EMFDRV_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_AlphaBlend( PHYSDEV dev_dst, struct bitblt_coords *dst, PHYSDEV dev_src, struct bitblt_coords *src, BLENDFUNCTION func ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_ArcTo( PHYSDEV dev, INT left, INT top, INT right, diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 82e6f894521..90d22e1f3ef 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -355,9 +355,9 @@ BOOL CDECL EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, } /*********************************************************************** - * EMFDRV_AngleArc + * EMFDC_AngleArc */ -BOOL CDECL EMFDRV_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) +BOOL EMFDC_AngleArc( DC_ATTR *dc_attr, INT x, INT y, DWORD radius, FLOAT start, FLOAT sweep ) { EMRANGLEARC emr; @@ -369,7 +369,7 @@ BOOL CDECL EMFDRV_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT start emr.eStartAngle = start; emr.eSweepAngle = sweep; - return EMFDRV_WriteRecord( dev, &emr.emr ); + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } /*********************************************************************** diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index c941e095752..82d1d31fb95 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -39,7 +39,7 @@ static const struct gdi_dc_funcs emfdrv_driver = NULL, /* pAbortDoc */ EMFDRV_AbortPath, /* pAbortPath */ EMFDRV_AlphaBlend, /* pAlphaBlend */ - EMFDRV_AngleArc, /* pAngleArc */ + NULL, /* pAngleArc */ EMFDRV_Arc, /* pArc */ EMFDRV_ArcTo, /* pArcTo */ EMFDRV_BeginPath, /* pBeginPath */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8dd20c4bf11..1dfd3b2424c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -56,6 +56,8 @@ extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; /* enhanced metafiles */ +extern BOOL EMFDC_AngleArc( DC_ATTR *dc_attr, INT x, INT y, DWORD radius, FLOAT start, + FLOAT sweep ) DECLSPEC_HIDDEN; extern BOOL EMFDC_ArcChordPie( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend, DWORD type ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index f642eef75c0..2e31297d7d9 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -170,6 +170,21 @@ BOOL WINAPI Pie( HDC hdc, INT left, INT top, INT right, INT bottom, xstart, ystart, xend, yend ); } +/*********************************************************************** + * AngleArc (GDI32.@) + */ +BOOL WINAPI AngleArc( HDC hdc, INT x, INT y, DWORD radius, FLOAT start_angle, FLOAT sweep_angle ) +{ + DC_ATTR *dc_attr; + + TRACE( "%p, (%d, %d), %u, %f, %f\n", hdc, x, y, radius, start_angle, sweep_angle ); + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_AngleArc( dc_attr, x, y, radius, start_angle, sweep_angle )) + return FALSE; + return NtGdiAngleArc( hdc, x, y, radius, start_angle, sweep_angle ); +} + /*********************************************************************** * Ellipse (GDI32.@) */ diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 637b9ccda3f..ba3f886519b 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -776,16 +776,14 @@ BOOL WINAPI PolyBezierTo( HDC hdc, const POINT* lppt, DWORD cPoints ) } /*********************************************************************** - * AngleArc (GDI32.@) + * NtGdiAngleArc (win32u.@) */ -BOOL WINAPI AngleArc(HDC hdc, INT x, INT y, DWORD dwRadius, FLOAT eStartAngle, FLOAT eSweepAngle) +BOOL WINAPI NtGdiAngleArc( HDC hdc, INT x, INT y, DWORD dwRadius, FLOAT eStartAngle, FLOAT eSweepAngle ) { PHYSDEV physdev; BOOL result; DC *dc; - TRACE( "%p, (%d, %d), %u, %f, %f\n", hdc, x, y, dwRadius, eStartAngle, eSweepAngle ); - if( (signed int)dwRadius < 0 ) return FALSE;

1 0

Jacek Caban : gdi32: Use NtGdiRectangle for Rectangle implementation.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 0636b360130baf05025492eb59a806bbeffc3d33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0636b360130baf05025492eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:19:51 2021 +0200 gdi32: Use NtGdiRectangle for Rectangle implementation. 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/enhmfdrv/dc.c | 14 +--------- dlls/gdi32/enhmfdrv/graphics.c | 59 ++++++++++++++++++++++++++---------------- dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/gdidc.c | 15 +++++++++++ dlls/gdi32/mfdrv/graphics.c | 6 ++--- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/painting.c | 7 ++--- 8 files changed, 62 insertions(+), 45 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 80caa6cb9d3..c19c9527dc2 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -779,18 +779,6 @@ static BOOL CDECL emfpathdrv_PolylineTo( PHYSDEV dev, const POINT *pts, INT coun next->funcs->pPolylineTo( next, pts, count )); } -/*********************************************************************** - * emfpathdrv_Rectangle - */ -static BOOL CDECL emfpathdrv_Rectangle( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) -{ - PHYSDEV emfdev = get_emfdev( dev ); - PHYSDEV next = GET_NEXT_PHYSDEV( dev, pRectangle ); - - return (emfdev->funcs->pRectangle( emfdev, x1, y1, x2, y2 ) && - next->funcs->pRectangle( next, x1, y1, x2, y2 )); -} - static const struct gdi_dc_funcs emfpath_driver = { @@ -874,7 +862,7 @@ static const struct gdi_dc_funcs emfpath_driver = NULL, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ NULL, /* pRealizePalette */ - emfpathdrv_Rectangle, /* pRectangle */ + NULL, /* pRectangle */ NULL, /* pResetDC */ NULL, /* pRestoreDC */ NULL, /* pRoundRect */ diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index a3197276525..82e6f894521 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -422,37 +422,52 @@ BOOL CDECL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom } /*********************************************************************** - * EMFDRV_Rectangle + * EMFDC_Rectangle */ -BOOL CDECL EMFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) +BOOL EMFDC_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom ) { - EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); - DC *dc = get_physdev_dc( dev ); + EMFDRV_PDEVICE *emf = dc_attr->emf; EMRRECTANGLE emr; - INT temp; - - TRACE("%d,%d - %d,%d\n", left, top, right, bottom); if(left == right || top == bottom) return FALSE; - if(left > right) {temp = left; left = right; right = temp;} - if(top > bottom) {temp = top; top = bottom; bottom = temp;} - - if(dc->attr->graphics_mode == GM_COMPATIBLE) { - right--; - bottom--; - } - emr.emr.iType = EMR_RECTANGLE; emr.emr.nSize = sizeof(emr); - emr.rclBox.left = left; - emr.rclBox.top = top; - emr.rclBox.right = right; - emr.rclBox.bottom = bottom; + emr.rclBox.left = min( left, right ); + emr.rclBox.top = min( top, bottom ); + emr.rclBox.right = max( left, right ); + emr.rclBox.bottom = max( top, bottom ); + if (dc_attr->graphics_mode == GM_COMPATIBLE) + { + emr.rclBox.right--; + emr.rclBox.bottom--; + } - if(!physDev->path) - EMFDRV_UpdateBBox( dev, &emr.rclBox ); - return EMFDRV_WriteRecord( dev, &emr.emr ); + return EMFDRV_WriteRecord( &emf->dev, &emr.emr ); +} + +/*********************************************************************** + * EMFDC_Rectangle + */ +BOOL EMFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) +{ + DC *dc = get_physdev_dc( dev ); + RECTL bounds; + + if (left == right || top == bottom) return FALSE; + + bounds.left = min( left, right ); + bounds.top = min( top, bottom ); + bounds.right = max( left, right ); + bounds.bottom = max( top, bottom ); + if (dc->attr->graphics_mode == GM_COMPATIBLE) + { + bounds.right--; + bounds.bottom--; + } + + EMFDRV_UpdateBBox( dev, &bounds ); + return TRUE; } /*********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 52302fe4c23..8dd20c4bf11 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -51,6 +51,7 @@ extern BOOL METADC_LineTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_MoveTo( HDC hdc, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL METADC_Pie( HDC hdc, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL METADC_Rectangle( HDC hdc, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL METADC_RoundRect( HDC hdc, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; @@ -62,6 +63,8 @@ extern BOOL EMFDC_Ellipse( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL EMFDC_LineTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL EMFDC_MoveTo( DC_ATTR *dc_attr, INT x, INT y ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_Rectangle( DC_ATTR *dc_attr, INT left, INT top, INT right, + INT bottom) DECLSPEC_HIDDEN; extern BOOL EMFDC_RoundRect( DC_ATTR *dc_attr, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index fbdfbed450c..f642eef75c0 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -185,6 +185,21 @@ BOOL WINAPI Ellipse( HDC hdc, INT left, INT top, INT right, INT bottom ) return NtGdiEllipse( hdc, left, top, right, bottom ); } +/*********************************************************************** + * Rectangle (GDI32.@) + */ +BOOL WINAPI Rectangle( HDC hdc, INT left, INT top, INT right, INT bottom ) +{ + DC_ATTR *dc_attr; + + TRACE( "%p, (%d, %d)-(%d, %d)\n", hdc, left, top, right, bottom ); + + if (is_meta_dc( hdc )) return METADC_Rectangle( hdc, left, top, right, bottom ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_Rectangle( dc_attr, left, top, right, bottom )) return FALSE; + return NtGdiRectangle( hdc, left, top, right, bottom ); +} + /*********************************************************************** * RoundRect (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index 727065eac65..37da92185af 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -98,11 +98,11 @@ BOOL METADC_Ellipse( HDC hdc, INT left, INT top, INT right, INT bottom ) } /*********************************************************************** - * MFDRV_Rectangle + * METADC_Rectangle */ -BOOL CDECL MFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) +BOOL METADC_Rectangle( HDC hdc, INT left, INT top, INT right, INT bottom ) { - return MFDRV_MetaParam4(dev, META_RECTANGLE, left, top, right, bottom); + return metadc_param4( hdc, META_RECTANGLE, left, top, right, bottom ); } /*********************************************************************** diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index a90b5da35e7..df4d9dc9541 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -179,7 +179,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ MFDRV_RealizePalette, /* pRealizePalette */ - MFDRV_Rectangle, /* pRectangle */ + NULL, /* pRectangle */ NULL, /* pResetDC */ MFDRV_RestoreDC, /* pRestoreDC */ NULL, /* pRoundRect */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 5a2ad9958bd..66375295cd9 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -98,7 +98,6 @@ extern BOOL CDECL MFDRV_PolyBezierTo( PHYSDEV dev, const POINT* pt, DWORD count extern BOOL CDECL MFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polygons) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_Polyline( PHYSDEV dev, const POINT* pt,INT count) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index e31fb997b9a..637b9ccda3f 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -357,17 +357,14 @@ BOOL WINAPI NtGdiEllipse( HDC hdc, INT left, INT top, INT right, INT bottom ) /*********************************************************************** - * Rectangle (GDI32.@) + * NtGdiRectangle (win32u.@) */ -BOOL WINAPI Rectangle( HDC hdc, INT left, INT top, - INT right, INT bottom ) +BOOL WINAPI NtGdiRectangle( HDC hdc, INT left, INT top, INT right, INT bottom ) { PHYSDEV physdev; BOOL ret; DC * dc = get_dc_ptr( hdc ); - TRACE( "%p, (%d, %d)-(%d, %d)\n", hdc, left, top, right, bottom ); - if (!dc) return FALSE; update_dc( dc ); physdev = GET_DC_PHYSDEV( dc, pRectangle );

1 0

Jacek Caban : gdi32: Use NtGdiRoundRect for RoundRect implementation.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: ffaf75a082123fb5a174a648d9b4f6fc5bbd66da URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffaf75a082123fb5a174a648… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:19:41 2021 +0200 gdi32: Use NtGdiRoundRect for RoundRect implementation. 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/enhmfdrv/dc.c | 15 +--------- dlls/gdi32/enhmfdrv/graphics.c | 62 +++++++++++++++++++++++++++--------------- dlls/gdi32/gdi_private.h | 4 +++ dlls/gdi32/gdidc.c | 22 +++++++++++++++ dlls/gdi32/mfdrv/graphics.c | 10 +++---- dlls/gdi32/mfdrv/init.c | 13 ++++++++- dlls/gdi32/mfdrv/metafiledrv.h | 4 +-- dlls/gdi32/painting.c | 8 ++---- 8 files changed, 89 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ffaf75a082123fb5a174…

1 0

Jacek Caban : gdi32: Use NtGdiEllipse for Ellipse implementation.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: 680220c565410354fa3256ef187848c4eb260ac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=680220c565410354fa3256ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:19:33 2021 +0200 gdi32: Use NtGdiEllipse for Ellipse implementation. 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/enhmfdrv/dc.c | 14 +--------- dlls/gdi32/enhmfdrv/graphics.c | 59 ++++++++++++++++++++++++++---------------- dlls/gdi32/gdi_private.h | 3 +++ dlls/gdi32/gdidc.c | 15 +++++++++++ dlls/gdi32/mfdrv/graphics.c | 6 ++--- dlls/gdi32/mfdrv/init.c | 11 +++++++- dlls/gdi32/mfdrv/metafiledrv.h | 3 ++- dlls/gdi32/painting.c | 7 ++--- 8 files changed, 73 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=680220c565410354fa32…

1 0

Jacek Caban : gdi32: Handle EMFs directly in arc functions.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: b9f773ded1f1f8b7c988f4388ca13bd59f7546c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9f773ded1f1f8b7c988f438… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:19:24 2021 +0200 gdi32: Handle EMFs directly in arc functions. 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/enhmfdrv/dc.c | 60 +++----------------------------------- dlls/gdi32/enhmfdrv/graphics.c | 66 ++++++++++++++++++++++++++++++------------ dlls/gdi32/gdi_private.h | 3 ++ dlls/gdi32/gdidc.c | 28 ++++++++++++++++++ 4 files changed, 83 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9f773ded1f1f8b7c988…

1 0

Jacek Caban : gdi32: Store graphics mode in DC_ATTR.
by Alexandre Julliard 21 Jul '21

21 Jul '21

Module: wine Branch: master Commit: b825727d1d7c0987bf3938570639d85d586ce97b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b825727d1d7c0987bf393857… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 20 09:19:14 2021 +0200 gdi32: Store graphics mode 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 | 12 ++++++------ dlls/gdi32/dibdrv/graphics.c | 4 ++-- dlls/gdi32/enhmfdrv/graphics.c | 10 +++++----- dlls/gdi32/font.c | 8 ++++---- dlls/gdi32/mapping.c | 4 ++-- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/path.c | 4 ++-- include/ntgdi.h | 1 + 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 4441592f59f..2573390c6f2 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -99,7 +99,7 @@ static void set_initial_dc_state( DC *dc ) dc->breakExtra = 0; dc->breakRem = 0; dc->MapMode = MM_TEXT; - dc->GraphicsMode = GM_COMPATIBLE; + dc->attr->graphics_mode = GM_COMPATIBLE; dc->attr->cur_pos.x = 0; dc->attr->cur_pos.y = 0; dc->ArcDirection = AD_COUNTERCLOCKWISE; @@ -414,7 +414,7 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev ) newdc->breakExtra = dc->breakExtra; newdc->breakRem = dc->breakRem; newdc->MapMode = dc->MapMode; - newdc->GraphicsMode = dc->GraphicsMode; + newdc->attr->graphics_mode = dc->attr->graphics_mode; newdc->attr->cur_pos = dc->attr->cur_pos; newdc->ArcDirection = dc->ArcDirection; newdc->xformWorld2Wnd = dc->xformWorld2Wnd; @@ -491,7 +491,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->breakExtra = dcs->breakExtra; dc->breakRem = dcs->breakRem; dc->MapMode = dcs->MapMode; - dc->GraphicsMode = dcs->GraphicsMode; + dc->attr->graphics_mode = dcs->attr->graphics_mode; dc->attr->cur_pos = dcs->attr->cur_pos; dc->ArcDirection = dcs->ArcDirection; dc->xformWorld2Wnd = dcs->xformWorld2Wnd; @@ -1053,7 +1053,7 @@ INT WINAPI GetGraphicsMode( HDC hdc ) DC * dc = get_dc_ptr( hdc ); if (dc) { - ret = dc->GraphicsMode; + ret = dc->attr->graphics_mode; release_dc_ptr( dc ); } return ret; @@ -1076,8 +1076,8 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) if (!dc) return 0; if ((mode > 0) && (mode <= GM_LAST)) { - ret = dc->GraphicsMode; - dc->GraphicsMode = mode; + ret = dc->attr->graphics_mode; + dc->attr->graphics_mode = mode; } /* font metrics depend on the graphics mode */ if (ret != mode) NtGdiSelectFont(dc->hSelf, dc->hFont); diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index a875ae113cd..b6ae4ab10e2 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -561,7 +561,7 @@ static struct cached_font *add_cached_font( DC *dc, HFONT hfont, UINT aa_flags ) GetObjectW( hfont, sizeof(font.lf), &font.lf ); font.xform = dc->xformWorld2Vport; font.xform.eDx = font.xform.eDy = 0; /* unused, would break hashing */ - if (dc->GraphicsMode == GM_COMPATIBLE) + if (dc->attr->graphics_mode == GM_COMPATIBLE) { font.lf.lfOrientation = font.lf.lfEscapement; if (font.xform.eM11 * font.xform.eM22 < 0) @@ -1399,7 +1399,7 @@ BOOL CDECL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bott TRACE("(%p, %d, %d, %d, %d)\n", dev, left, top, right, bottom); - if (dc->GraphicsMode == GM_ADVANCED) + if (dc->attr->graphics_mode == GM_ADVANCED) { pts[0].x = pts[3].x = left; pts[0].y = pts[1].y = top; diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 3c8c8b3bd07..2c23d0f9ae7 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -188,7 +188,7 @@ EMFDRV_ArcChordPie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, if(left > right) {temp = left; left = right; right = temp;} if(top > bottom) {temp = top; top = bottom; bottom = temp;} - if(dc->GraphicsMode == GM_COMPATIBLE) { + if(dc->attr->graphics_mode == GM_COMPATIBLE) { right--; bottom--; } @@ -359,7 +359,7 @@ BOOL CDECL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom if(left > right) {temp = left; left = right; right = temp;} if(top > bottom) {temp = top; top = bottom; bottom = temp;} - if(dc->GraphicsMode == GM_COMPATIBLE) { + if(dc->attr->graphics_mode == GM_COMPATIBLE) { right--; bottom--; } @@ -393,7 +393,7 @@ BOOL CDECL EMFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT botto if(left > right) {temp = left; left = right; right = temp;} if(top > bottom) {temp = top; top = bottom; bottom = temp;} - if(dc->GraphicsMode == GM_COMPATIBLE) { + if(dc->attr->graphics_mode == GM_COMPATIBLE) { right--; bottom--; } @@ -426,7 +426,7 @@ BOOL CDECL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, if(left > right) {temp = left; left = right; right = temp;} if(top > bottom) {temp = top; top = bottom; bottom = temp;} - if(dc->GraphicsMode == GM_COMPATIBLE) { + if(dc->attr->graphics_mode == GM_COMPATIBLE) { right--; bottom--; } @@ -810,7 +810,7 @@ BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT int textHeight = 0; int textWidth = 0; const UINT textAlign = dc->textAlign; - const INT graphicsMode = dc->GraphicsMode; + const INT graphicsMode = dc->attr->graphics_mode; FLOAT exScale, eyScale; nSize = sizeof(*pemr) + ((count+1) & ~1) * sizeof(WCHAR) + count * sizeof(INT); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 066b7a3648e..c3cbe18f0c8 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3759,7 +3759,7 @@ static HFONT CDECL font_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) lf.lfWeight, lf.lfPitchAndFamily, lf.lfCharSet, lf.lfOrientation, lf.lfEscapement ); - if (dc->GraphicsMode == GM_ADVANCED) + if (dc->attr->graphics_mode == GM_ADVANCED) { memcpy( &dcmat, &dc->xformWorld2Vport, sizeof(FMAT2) ); /* try to avoid not necessary glyph transformations */ @@ -6015,7 +6015,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, if(!(tm.tmPitchAndFamily & TMPF_VECTOR)) /* Non-scalable fonts shouldn't be rotated */ lf.lfEscapement = 0; - if ((dc->GraphicsMode == GM_COMPATIBLE) && + if ((dc->attr->graphics_mode == GM_COMPATIBLE) && (dc->vport2WorldValid && dc->xformWorld2Vport.eM11 * dc->xformWorld2Vport.eM22 < 0)) { lf.lfEscapement = -lf.lfEscapement; @@ -6116,7 +6116,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, desired[1].x -= desired[0].x; desired[1].y -= desired[0].y; - if (dc->GraphicsMode == GM_COMPATIBLE) + if (dc->attr->graphics_mode == GM_COMPATIBLE) { if (dc->vport2WorldValid && dc->xformWorld2Vport.eM11 < 0) desired[1].x = -desired[1].x; @@ -6146,7 +6146,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, desired[1].x -= desired[0].x; desired[1].y -= desired[0].y; - if (dc->GraphicsMode == GM_COMPATIBLE) + if (dc->attr->graphics_mode == GM_COMPATIBLE) { if (dc->vport2WorldValid && dc->xformWorld2Vport.eM11 < 0) desired[1].x = -desired[1].x; diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 5eb06555831..46a7973644e 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -561,7 +561,7 @@ BOOL WINAPI ModifyWorldTransform( HDC hdc, const XFORM *xform, DWORD mode ) if ((dc = get_dc_ptr( hdc ))) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pModifyWorldTransform ); - if (dc->GraphicsMode == GM_ADVANCED) + if (dc->attr->graphics_mode == GM_ADVANCED) ret = physdev->funcs->pModifyWorldTransform( physdev, xform, mode ); release_dc_ptr( dc ); } @@ -587,7 +587,7 @@ BOOL WINAPI SetWorldTransform( HDC hdc, const XFORM *xform ) if ((dc = get_dc_ptr( hdc ))) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetWorldTransform ); - if (dc->GraphicsMode == GM_ADVANCED) + if (dc->attr->graphics_mode == GM_ADVANCED) ret = physdev->funcs->pSetWorldTransform( physdev, xform ); release_dc_ptr( dc ); } diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index ba065c2439f..4527651bb33 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -135,7 +135,6 @@ typedef struct tagDC INT breakExtra; /* breakTotalExtra / breakCount */ INT breakRem; /* breakTotalExtra % breakCount */ INT MapMode; - INT GraphicsMode; /* Graphics mode */ ABORTPROC pAbortProc; /* AbortProc for Printing */ INT ArcDirection; XFORM xformWorld2Wnd; /* World-to-window transformation */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 4bca32c2e30..3a1da23df30 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -383,7 +383,7 @@ static BOOL PATH_CheckCorners( DC *dc, POINT corners[], INT x1, INT y1, INT x2, } /* In GM_COMPATIBLE, don't include bottom and right edges */ - if (dc->GraphicsMode == GM_COMPATIBLE) + if (dc->attr->graphics_mode == GM_COMPATIBLE) { if (corners[0].x == corners[1].x) return FALSE; if (corners[0].y == corners[1].y) return FALSE; @@ -1129,7 +1129,7 @@ static BOOL PATH_Arc( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, } /* In GM_COMPATIBLE, don't include bottom and right edges */ - if (dc->GraphicsMode == GM_COMPATIBLE) + if (dc->attr->graphics_mode == GM_COMPATIBLE) { corners[1].x--; corners[1].y--; diff --git a/include/ntgdi.h b/include/ntgdi.h index 53915033c89..4d1d6a48c4f 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -89,6 +89,7 @@ enum typedef struct DC_ATTR { POINT cur_pos; + INT graphics_mode; void *emf; } DC_ATTR;

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
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