July 2016 - Wine-Commits - list.winehq.org

Huw Davies : gdi32: Access several more properties directly from the DC.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 199ca9258a966b0fe4e164a91f327004223645dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=199ca9258a966b0fe4e164a91… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 15:09:35 2016 +0100 gdi32: Access several more properties directly from the DC. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 6 +++--- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/enhmfdrv/graphics.c | 35 ++++++++++++++++++++--------------- dlls/gdi32/font.c | 18 ++++++++++-------- dlls/gdi32/painting.c | 9 ++++++--- 5 files changed, 41 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=199ca9258a966b0fe4e16…

1 0

Huw Davies : gdi32: Pass the path directly to start_new_stroke().
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 1b4f0f8a07c81363aa4946de382e1852675cbec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4f0f8a07c81363aa4946de3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 15:09:27 2016 +0100 gdi32: Pass the path directly to start_new_stroke(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index c03208f..a5d01bc 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -298,10 +298,8 @@ static void reverse_points( POINT *points, UINT count ) } /* start a new path stroke if necessary */ -static BOOL start_new_stroke( struct path_physdev *physdev ) +static BOOL start_new_stroke( struct gdi_path *path ) { - struct gdi_path *path = physdev->path; - if (!path->newStroke && path->count && !(path->flags[path->count - 1] & PT_CLOSEFIGURE) && path->points[path->count - 1].x == path->pos.x && @@ -309,7 +307,7 @@ static BOOL start_new_stroke( struct path_physdev *physdev ) return TRUE; path->newStroke = FALSE; - return add_points( physdev->path, &path->pos, 1, PT_MOVETO ) != NULL; + return add_points( path, &path->pos, 1, PT_MOVETO ) != NULL; } /* set current position to the last point that was added to the path */ @@ -330,7 +328,7 @@ static void close_figure( struct gdi_path *path ) static BOOL add_log_points_new_stroke( struct path_physdev *physdev, const POINT *points, DWORD count, BYTE type ) { - if (!start_new_stroke( physdev )) return FALSE; + if (!start_new_stroke( physdev->path )) return FALSE; if (!add_log_points( physdev, points, count, type )) return FALSE; update_current_pos( physdev->path ); return TRUE; @@ -1143,7 +1141,7 @@ static BOOL PATH_Arc( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, } /* arcto: Add a PT_MOVETO only if this is the first entry in a stroke */ - if (lines==-1 && !start_new_stroke( physdev )) return FALSE; + if (lines == -1 && !start_new_stroke( physdev->path )) return FALSE; /* Add the arc to the path with one Bezier spline per quadrant that the * arc spans */

1 0

Huw Davies : gdi32: Don't call GetObjectW() unless necessary.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 0c1e42235aa8c6e2df939e8d7d673d16469d78d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c1e42235aa8c6e2df939e8d7… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 13:13:07 2016 +0100 gdi32: Don't call GetObjectW() unless necessary. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2faefe8..02efc8a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -681,13 +681,15 @@ static void update_font_code_page( DC *dc, HANDLE font ) { CHARSETINFO csi; int charset = get_text_charset_info( dc, NULL, 0 ); - LOGFONTW lf; - GetObjectW( font, sizeof(lf), &lf ); + if (charset == ANSI_CHARSET && get_associated_charset_info() & ASSOC_CHARSET_ANSI) + { + LOGFONTW lf; - if (charset == ANSI_CHARSET && !(lf.lfClipPrecision & CLIP_DFA_DISABLE) && - get_associated_charset_info() & ASSOC_CHARSET_ANSI) - charset = DEFAULT_CHARSET; + GetObjectW( font, sizeof(lf), &lf ); + if (!(lf.lfClipPrecision & CLIP_DFA_DISABLE)) + charset = DEFAULT_CHARSET; + } /* Hmm, nicely designed api this one! */ if (TranslateCharsetInfo( ULongToPtr(charset), &csi, TCI_SRCCHARSET) )

1 0

Huw Davies : gdi32: Add an internal version of GetTextCharsetInfo() that takes a DC pointer.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 41f763ea879045464b02d45c048852e7e13cea93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41f763ea879045464b02d45c0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 13:13:06 2016 +0100 gdi32: Add an internal version of GetTextCharsetInfo() that takes a DC pointer. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 57 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b42aaa6..2faefe8 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -407,6 +407,40 @@ DWORD WINAPI GdiGetCodePage( HDC hdc ) } /*********************************************************************** + * get_text_charset_info + * + * Internal version of GetTextCharsetInfo() that takes a DC pointer. + */ +static UINT get_text_charset_info(DC *dc, FONTSIGNATURE *fs, DWORD flags) +{ + UINT ret = DEFAULT_CHARSET; + PHYSDEV dev; + + dev = GET_DC_PHYSDEV( dc, pGetTextCharsetInfo ); + ret = dev->funcs->pGetTextCharsetInfo( dev, fs, flags ); + + if (ret == DEFAULT_CHARSET && fs) + memset(fs, 0, sizeof(FONTSIGNATURE)); + return ret; +} + +/*********************************************************************** + * GetTextCharsetInfo (GDI32.@) + */ +UINT WINAPI GetTextCharsetInfo(HDC hdc, FONTSIGNATURE *fs, DWORD flags) +{ + UINT ret = DEFAULT_CHARSET; + DC *dc = get_dc_ptr(hdc); + + if (dc) + { + ret = get_text_charset_info( dc, fs, flags ); + release_dc_ptr( dc ); + } + return ret; +} + +/*********************************************************************** * FONT_mbtowc * * Returns a Unicode translation of str using the charset of the @@ -646,7 +680,7 @@ static DWORD get_associated_charset_info(void) static void update_font_code_page( DC *dc, HANDLE font ) { CHARSETINFO csi; - int charset = GetTextCharsetInfo( dc->hSelf, NULL, 0 ); + int charset = get_text_charset_info( dc, NULL, 0 ); LOGFONTW lf; GetObjectW( font, sizeof(lf), &lf ); @@ -3689,27 +3723,6 @@ UINT WINAPI GetTextCharset(HDC hdc) } /*********************************************************************** - * GetTextCharsetInfo (GDI32.@) - */ -UINT WINAPI GetTextCharsetInfo(HDC hdc, LPFONTSIGNATURE fs, DWORD flags) -{ - UINT ret = DEFAULT_CHARSET; - DC *dc = get_dc_ptr(hdc); - PHYSDEV dev; - - if (dc) - { - dev = GET_DC_PHYSDEV( dc, pGetTextCharsetInfo ); - ret = dev->funcs->pGetTextCharsetInfo( dev, fs, flags ); - release_dc_ptr( dc ); - } - - if (ret == DEFAULT_CHARSET && fs) - memset(fs, 0, sizeof(FONTSIGNATURE)); - return ret; -} - -/*********************************************************************** * GdiGetCharDimensions (GDI32.@) * * Gets the average width of the characters in the English alphabet.

1 0

Huw Davies : gdi32: Convert a few uses of get_dc_ptr() to get_physdev_dc() .
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 0f2a776a59006a15fb84a2a51237d3484f136966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f2a776a59006a15fb84a2a51… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 15:09:36 2016 +0100 gdi32: Convert a few uses of get_dc_ptr() to get_physdev_dc(). In these cases we have the PHYSDEV meaning we own the DC already. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 11 ++--------- dlls/gdi32/enhmfdrv/dc.c | 13 ++++--------- dlls/gdi32/freetype.c | 4 +--- dlls/gdi32/path.c | 6 ++---- 4 files changed, 9 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index ebed7af..3a8f0f4 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -250,7 +250,7 @@ void get_mono_dc_colors( DC *dc, BITMAPINFO *info, int count ) BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) { - DC *dc_src, *dc_dst = get_nulldrv_dc( dst_dev ); + DC *dc_src = get_physdev_dc( src_dev ), *dc_dst = get_nulldrv_dc( dst_dev ); char src_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; char dst_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *src_info = (BITMAPINFO *)src_buffer; @@ -258,13 +258,9 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, DWORD err; struct gdi_image_bits bits; - if (!(dc_src = get_dc_ptr( src_dev->hdc ))) return FALSE; src_dev = GET_DC_PHYSDEV( dc_src, pGetImage ); if (src_dev->funcs->pGetImage( src_dev, src_info, &bits, src )) - { - release_dc_ptr( dc_src ); return FALSE; - } dst_dev = GET_DC_PHYSDEV( dc_dst, pPutImage ); copy_bitmapinfo( dst_info, src_info ); @@ -305,7 +301,6 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, } if (bits.free) bits.free( &bits ); - release_dc_ptr( dc_src ); return !err; } @@ -313,7 +308,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION func ) { - DC *dc_src, *dc_dst = get_nulldrv_dc( dst_dev ); + DC *dc_src = get_physdev_dc( src_dev ), *dc_dst = get_nulldrv_dc( dst_dev ); char src_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; char dst_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *src_info = (BITMAPINFO *)src_buffer; @@ -321,7 +316,6 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, DWORD err; struct gdi_image_bits bits; - if (!(dc_src = get_dc_ptr( src_dev->hdc ))) return FALSE; src_dev = GET_DC_PHYSDEV( dc_src, pGetImage ); err = src_dev->funcs->pGetImage( src_dev, src_info, &bits, src ); if (err) goto done; @@ -345,7 +339,6 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, if (bits.free) bits.free( &bits ); done: - release_dc_ptr( dc_src ); if (err) SetLastError( err ); return !err; } diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 00f4d65..64c6136 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -52,7 +52,7 @@ BOOL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pRestoreDC ); EMFDRV_PDEVICE* physDev = get_emf_physdev( dev ); - DC *dc = get_dc_ptr( dev->hdc ); + DC *dc = get_physdev_dc( dev ); EMRRESTOREDC emr; BOOL ret; @@ -63,7 +63,6 @@ BOOL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) emr.iRelative = level; else emr.iRelative = level - dc->saveLevel - 1; - release_dc_ptr( dc ); physDev->restoring++; ret = next->funcs->pRestoreDC( next, level ); @@ -433,7 +432,7 @@ BOOL EMFDRV_BeginPath( PHYSDEV dev ) EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); PHYSDEV next = GET_NEXT_PHYSDEV( dev, pBeginPath ); EMRBEGINPATH emr; - DC *dc; + DC *dc = get_physdev_dc( dev ); emr.emr.iType = EMR_BEGINPATH; emr.emr.nSize = sizeof(emr); @@ -442,10 +441,8 @@ BOOL EMFDRV_BeginPath( PHYSDEV dev ) if (physDev->path) return TRUE; /* already open */ if (!next->funcs->pBeginPath( next )) return FALSE; - dc = get_dc_ptr( dev->hdc ); push_dc_driver( &dc->physDev, &physDev->pathdev, &emfpath_driver ); physDev->path = TRUE; - release_dc_ptr( dc ); return TRUE; } @@ -519,10 +516,9 @@ static BOOL emfpathdrv_AbortPath( PHYSDEV dev ) { PHYSDEV emfdev = get_emfdev( dev ); PHYSDEV next = GET_NEXT_PHYSDEV( dev, pAbortPath ); - DC *dc = get_dc_ptr( dev->hdc ); + DC *dc = get_physdev_dc( dev ); emfpath_driver.pDeleteDC( pop_dc_driver( dc, &emfpath_driver )); - release_dc_ptr( dc ); emfdev->funcs->pAbortPath( emfdev ); return next->funcs->pAbortPath( next ); } @@ -641,10 +637,9 @@ static BOOL emfpathdrv_EndPath( PHYSDEV dev ) { PHYSDEV emfdev = get_emfdev( dev ); PHYSDEV next = GET_NEXT_PHYSDEV( dev, pEndPath ); - DC *dc = get_dc_ptr( dev->hdc ); + DC *dc = get_physdev_dc( dev ); emfpath_driver.pDeleteDC( pop_dc_driver( dc, &emfpath_driver )); - release_dc_ptr( dc ); emfdev->funcs->pEndPath( emfdev ); return next->funcs->pEndPath( next ); } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f8b4235..5ddfc6a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5322,14 +5322,13 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) CHARSETINFO csi; FMAT2 dcmat; FontSubst *psub = NULL; - DC *dc = get_dc_ptr( dev->hdc ); + DC *dc = get_physdev_dc( dev ); const SYSTEM_LINKS *font_link; if (!hfont) /* notification that the font has been changed by another driver */ { release_font( physdev->font ); physdev->font = NULL; - release_dc_ptr( dc ); return 0; } @@ -5779,7 +5778,6 @@ done: physdev->font = ret; } LeaveCriticalSection( &freetype_cs ); - release_dc_ptr( dc ); return ret ? hfont : 0; } diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 4ae9ba2..51334b2 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -767,10 +767,9 @@ static BOOL pathdrv_BeginPath( PHYSDEV dev ) */ static BOOL pathdrv_AbortPath( PHYSDEV dev ) { - DC *dc = get_dc_ptr( dev->hdc ); + DC *dc = get_physdev_dc( dev ); path_driver.pDeleteDC( pop_dc_driver( dc, &path_driver )); - release_dc_ptr( dc ); return TRUE; } @@ -781,12 +780,11 @@ static BOOL pathdrv_AbortPath( PHYSDEV dev ) static BOOL pathdrv_EndPath( PHYSDEV dev ) { struct path_physdev *physdev = get_path_physdev( dev ); - DC *dc = get_dc_ptr( dev->hdc ); + DC *dc = get_physdev_dc( dev ); dc->path = physdev->path; pop_dc_driver( dc, &path_driver ); HeapFree( GetProcessHeap(), 0, physdev ); - release_dc_ptr( dc ); return TRUE; }

1 0

Huw Davies : gdi32: Where possible directly access the DC instead of using GetCurrentObject() .
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: aa4934783fb213c781e7ea4e5d54782ec5e570e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4934783fb213c781e7ea4e5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 15:09:34 2016 +0100 gdi32: Where possible directly access the DC instead of using GetCurrentObject(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 6 +++--- dlls/gdi32/driver.c | 4 ++-- dlls/gdi32/enhmfdrv/objects.c | 6 ++++-- dlls/gdi32/font.c | 2 +- dlls/gdi32/palette.c | 3 ++- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3b6c2ea..92a98df 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -354,8 +354,8 @@ void DC_UpdateXforms( DC *dc ) if (memcmp(&oldworld2vport, &dc->xformWorld2Vport, sizeof(oldworld2vport)) && !GdiIsMetaFileDC(dc->hSelf)) { - SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT)); - SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_PEN)); + SelectObject(dc->hSelf, dc->hFont); + SelectObject(dc->hSelf, dc->hPen); } } @@ -1038,7 +1038,7 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) dc->GraphicsMode = mode; } /* font metrics depend on the graphics mode */ - if (ret != mode) SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT)); + if (ret != mode) SelectObject(dc->hSelf, dc->hFont); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index d052e04..18e109e 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -390,9 +390,9 @@ static INT nulldrv_GetTextFace( PHYSDEV dev, INT size, LPWSTR name ) { INT ret = 0; LOGFONTW font; - HFONT hfont = GetCurrentObject( dev->hdc, OBJ_FONT ); + DC *dc = get_nulldrv_dc( dev ); - if (GetObjectW( hfont, sizeof(font), &font )) + if (GetObjectW( dc->hFont, sizeof(font), &font )) { ret = strlenW( font.lfFaceName ) + 1; if (name) diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index a8f6fb5..9bf79e4 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -463,10 +463,11 @@ found: COLORREF EMFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) { EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); + DC *dc = get_physdev_dc( dev ); EMRSELECTOBJECT emr; DWORD index; - if (GetCurrentObject( dev->hdc, OBJ_BRUSH ) != GetStockObject( DC_BRUSH )) return color; + if (dc->hBrush != GetStockObject( DC_BRUSH )) return color; if (physDev->dc_brush) DeleteObject( physDev->dc_brush ); if (!(physDev->dc_brush = CreateSolidBrush( color ))) return CLR_INVALID; @@ -484,11 +485,12 @@ COLORREF EMFDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) COLORREF EMFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) { EMFDRV_PDEVICE *physDev = get_emf_physdev( dev ); + DC *dc = get_physdev_dc( dev ); EMRSELECTOBJECT emr; DWORD index; LOGPEN logpen = { PS_SOLID, { 0, 0 }, color }; - if (GetCurrentObject( dev->hdc, OBJ_PEN ) != GetStockObject( DC_PEN )) return color; + if (dc->hPen != GetStockObject( DC_PEN )) return color; if (physDev->dc_pen) DeleteObject( physDev->dc_pen ); if (!(physDev->dc_pen = CreatePenIndirect( &logpen ))) return CLR_INVALID; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index afeebb8..0dad024 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2269,7 +2269,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, } GetTextMetricsW(hdc, &tm); - GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(lf), &lf); + GetObjectW(dc->hFont, sizeof(lf), &lf); if(!(tm.tmPitchAndFamily & TMPF_VECTOR)) /* Non-scalable fonts shouldn't be rotated */ lf.lfEscapement = 0; diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index be84b71..a8135d5 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -503,6 +503,7 @@ UINT WINAPI GetNearestPaletteIndex( COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) { unsigned char spec_type; + DC *dc = get_nulldrv_dc( dev ); if (!(GetDeviceCaps( dev->hdc, RASTERCAPS ) & RC_PALETTE)) return color; @@ -512,7 +513,7 @@ COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) /* we need logical palette for PALETTERGB and PALETTEINDEX colorrefs */ UINT index; PALETTEENTRY entry; - HPALETTE hpal = GetCurrentObject( dev->hdc, OBJ_PAL ); + HPALETTE hpal = dc->hPalette; if (!hpal) hpal = GetStockObject( DEFAULT_PALETTE ); if (spec_type == 2) /* PALETTERGB */

1 0

Huw Davies : gdi32: Add an internal version of DPtoLP that takes a DC pointer.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: e1130cbb99fb21f9884cd969b0121dd3ccb827b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1130cbb99fb21f9884cd969b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 15:09:32 2016 +0100 gdi32: Add an internal version of DPtoLP that takes a DC pointer. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/clipping.c | 2 +- dlls/gdi32/dc.c | 2 +- dlls/gdi32/font.c | 22 +++++++++++----------- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/mapping.c | 26 ++++++++++++++++++++------ dlls/gdi32/path.c | 2 +- 6 files changed, 35 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 4e965b9..d5553ee 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -438,7 +438,7 @@ INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) rect->left = rect->right - 1; rect->right = tmp - 1; } - DPtoLP( hdc, (LPPOINT)rect, 2 ); + dp_to_lp( dc, (LPPOINT)rect, 2 ); release_dc_ptr( dc ); TRACE("%p => %d %s\n", hdc, ret, wine_dbgstr_rect( rect )); return ret; diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index f8bf3f8..59a3d9b 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1484,7 +1484,7 @@ UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags) rect->bottom = min( rect->bottom, dc->vis_rect.bottom - dc->vis_rect.top ); ret = DCB_SET; } - DPtoLP( hdc, (POINT *)rect, 2 ); + dp_to_lp( dc, (POINT *)rect, 2 ); } else ret = 0; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 02efc8a..afeebb8 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1901,7 +1901,7 @@ static RECT get_total_extents( HDC hdc, INT x, INT y, UINT flags, UINT aa_flags, } /* helper for nulldrv_ExtTextOut */ -static void draw_glyph( HDC hdc, INT origin_x, INT origin_y, const GLYPHMETRICS *metrics, +static void draw_glyph( DC *dc, INT origin_x, INT origin_y, const GLYPHMETRICS *metrics, const struct gdi_image_bits *image, const RECT *clip ) { static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; @@ -1941,8 +1941,8 @@ static void draw_glyph( HDC hdc, INT origin_x, INT origin_y, const GLYPHMETRICS } } assert( count <= max_count ); - DPtoLP( hdc, pts, count ); - for (i = 0; i < count; i += 2) Polyline( hdc, pts + i, 2 ); + dp_to_lp( dc, pts, count ); + for (i = 0; i < count; i += 2) Polyline( dc->hSelf, pts + i, 2 ); HeapFree( GetProcessHeap(), 0, pts ); } @@ -1966,7 +1966,7 @@ BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect if (brush) { orig = SelectObject( dev->hdc, brush ); - DPtoLP( dev->hdc, (POINT *)&rc, 2 ); + dp_to_lp( dc, (POINT *)&rc, 2 ); PatBlt( dev->hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); SelectObject( dev->hdc, orig ); DeleteObject( brush ); @@ -2063,7 +2063,7 @@ BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect err = get_glyph_bitmap( dev->hdc, str[i], flags, GGO_BITMAP, &metrics, &image ); if (err) continue; - if (image.ptr) draw_glyph( dev->hdc, x, y, &metrics, &image, (flags & ETO_CLIPPED) ? rect : NULL ); + if (image.ptr) draw_glyph( dc, x, y, &metrics, &image, (flags & ETO_CLIPPED) ? rect : NULL ); if (image.free) image.free( &image ); if (dx) @@ -2424,7 +2424,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, { pt.x = x + width.x; pt.y = y + width.y; - DPtoLP(hdc, &pt, 1); + dp_to_lp(dc, &pt, 1); MoveToEx(hdc, pt.x, pt.y, NULL); } break; @@ -2441,7 +2441,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, { pt.x = x; pt.y = y; - DPtoLP(hdc, &pt, 1); + dp_to_lp(dc, &pt, 1); MoveToEx(hdc, pt.x, pt.y, NULL); } break; @@ -2494,8 +2494,6 @@ done: if(reordered_str != str) HeapFree(GetProcessHeap(), 0, reordered_str); - release_dc_ptr( dc ); - if (ret && (lf.lfUnderline || lf.lfStrikeOut)) { int underlinePos, strikeoutPos; @@ -2541,7 +2539,7 @@ done: pts[3].y = pts[0].y + underlineWidth * cosEsc; pts[4].x = pts[0].x; pts[4].y = pts[0].y; - DPtoLP(hdc, pts, 5); + dp_to_lp(dc, pts, 5); Polygon(hdc, pts, 5); } @@ -2557,7 +2555,7 @@ done: pts[3].y = pts[0].y + strikeoutWidth * cosEsc; pts[4].x = pts[0].x; pts[4].y = pts[0].y; - DPtoLP(hdc, pts, 5); + dp_to_lp(dc, pts, 5); Polygon(hdc, pts, 5); } @@ -2566,6 +2564,8 @@ done: DeleteObject(hbrush); } + release_dc_ptr( dc ); + return ret; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3df3a2c..e4633d1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -304,6 +304,7 @@ extern void GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; extern void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; /* mapping.c */ +extern BOOL dp_to_lp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; extern void lp_to_dp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; /* metafile.c */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 496643e..28b12bc 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -306,13 +306,12 @@ BOOL nulldrv_SetWorldTransform( PHYSDEV dev, const XFORM *xform ) } /*********************************************************************** - * DPtoLP (GDI32.@) + * dp_to_lp + * + * Internal version of DPtoLP that takes a DC *. */ -BOOL WINAPI DPtoLP( HDC hdc, LPPOINT points, INT count ) +BOOL dp_to_lp( DC *dc, POINT *points, INT count ) { - DC * dc = get_dc_ptr( hdc ); - if (!dc) return FALSE; - if (dc->vport2WorldValid) { while (count--) @@ -328,10 +327,25 @@ BOOL WINAPI DPtoLP( HDC hdc, LPPOINT points, INT count ) points++; } } - release_dc_ptr( dc ); return (count < 0); } +/*********************************************************************** + * DPtoLP (GDI32.@) + */ +BOOL WINAPI DPtoLP( HDC hdc, POINT *points, INT count ) +{ + DC * dc = get_dc_ptr( hdc ); + BOOL ret; + + if (!dc) return FALSE; + + ret = dp_to_lp( dc, points, count ); + + release_dc_ptr( dc ); + return ret; +} + /*********************************************************************** * lp_to_dp diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index f6b6552..4ae9ba2 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -670,7 +670,7 @@ INT WINAPI GetPath(HDC hdc, LPPOINT pPoints, LPBYTE pTypes, INT nSize) memcpy(pTypes, dc->path->flags, sizeof(BYTE)*dc->path->count); /* Convert the points to logical coordinates */ - if(!DPtoLP(hdc, pPoints, dc->path->count)) + if(!dp_to_lp(dc, pPoints, dc->path->count)) { /* FIXME: Is this the correct value? */ SetLastError(ERROR_CAN_NOT_COMPLETE);

1 0

Huw Davies : gdi32: Pass a DC pointer to PATH_CheckCorners().
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 377010dcfce629d52472261e0c3c18252f638abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=377010dcfce629d52472261e0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 15:09:29 2016 +0100 gdi32: Pass a DC pointer to PATH_CheckCorners(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 24a9436..015a059 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -362,7 +362,7 @@ static HRGN path_to_region( const struct gdi_path *path, int mode ) * * Helper function for RoundRect() and Rectangle() */ -static BOOL PATH_CheckCorners( HDC hdc, POINT corners[], INT x1, INT y1, INT x2, INT y2 ) +static BOOL PATH_CheckCorners( DC *dc, POINT corners[], INT x1, INT y1, INT x2, INT y2 ) { INT temp; @@ -371,7 +371,7 @@ static BOOL PATH_CheckCorners( HDC hdc, POINT corners[], INT x1, INT y1, INT x2, corners[0].y=y1; corners[1].x=x2; corners[1].y=y2; - LPtoDP( hdc, corners, 2 ); + lp_to_dp( dc, corners, 2 ); /* Make sure first corner is top left and second corner is bottom right */ if(corners[0].x>corners[1].x) @@ -388,7 +388,7 @@ static BOOL PATH_CheckCorners( HDC hdc, POINT corners[], INT x1, INT y1, INT x2, } /* In GM_COMPATIBLE, don't include bottom and right edges */ - if (GetGraphicsMode( hdc ) == GM_COMPATIBLE) + if (dc->GraphicsMode == GM_COMPATIBLE) { if (corners[0].x == corners[1].x) return FALSE; if (corners[0].y == corners[1].y) return FALSE; @@ -902,10 +902,11 @@ static BOOL pathdrv_LineTo( PHYSDEV dev, INT x, INT y ) static BOOL pathdrv_Rectangle( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) { struct path_physdev *physdev = get_path_physdev( dev ); + DC *dc = get_physdev_dc( dev ); POINT corners[2], points[4]; BYTE *type; - if (!PATH_CheckCorners( dev->hdc, corners, x1, y1, x2, y2 )) return TRUE; + if (!PATH_CheckCorners( dc, corners, x1, y1, x2, y2 )) return TRUE; points[0].x = corners[1].x; points[0].y = corners[0].y; @@ -913,7 +914,7 @@ static BOOL 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 (GetArcDirection( dev->hdc ) == AD_CLOCKWISE) reverse_points( points, 4 ); + if (dc->ArcDirection == AD_CLOCKWISE) reverse_points( points, 4 ); if (!(type = add_points( physdev->path, points, 4, PT_LINETO ))) return FALSE; type[0] = PT_MOVETO; @@ -929,18 +930,19 @@ static BOOL pathdrv_RoundRect( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, INT { const double factor = 0.55428475; /* 4 / 3 * (sqrt(2) - 1) */ struct path_physdev *physdev = get_path_physdev( dev ); + DC *dc = get_physdev_dc( dev ); POINT corners[2], ellipse[2], points[16]; BYTE *type; double width, height; if (!ell_width || !ell_height) return pathdrv_Rectangle( dev, x1, y1, x2, y2 ); - if (!PATH_CheckCorners( dev->hdc, corners, x1, y1, x2, y2 )) return TRUE; + if (!PATH_CheckCorners( dc, corners, x1, y1, x2, y2 )) return TRUE; ellipse[0].x = ellipse[0].y = 0; ellipse[1].x = ell_width; ellipse[1].y = ell_height; - LPtoDP( dev->hdc, (POINT *)&ellipse, 2 ); + lp_to_dp( dc, (POINT *)&ellipse, 2 ); ell_width = min( abs( ellipse[1].x - ellipse[0].x ), corners[1].x - corners[0].x ); ell_height = min( abs( ellipse[1].y - ellipse[0].y ), corners[1].y - corners[0].y ); width = ell_width / 2.0; @@ -987,7 +989,7 @@ static BOOL pathdrv_RoundRect( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, INT points[15].x = corners[1].x; points[15].y = corners[1].y - GDI_ROUND( height ); - if (GetArcDirection( dev->hdc ) == AD_CLOCKWISE) reverse_points( points, 16 ); + if (dc->ArcDirection == 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; @@ -1003,11 +1005,12 @@ static BOOL pathdrv_Ellipse( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) { const double factor = 0.55428475; /* 4 / 3 * (sqrt(2) - 1) */ struct path_physdev *physdev = get_path_physdev( dev ); + DC *dc = get_physdev_dc( dev ); POINT corners[2], points[13]; BYTE *type; double width, height; - if (!PATH_CheckCorners( dev->hdc, corners, x1, y1, x2, y2 )) return TRUE; + if (!PATH_CheckCorners( dc, corners, x1, y1, x2, y2 )) return TRUE; width = (corners[1].x - corners[0].x) / 2.0; height = (corners[1].y - corners[0].y) / 2.0; @@ -1044,7 +1047,7 @@ static BOOL 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 (GetArcDirection( dev->hdc ) == AD_CLOCKWISE) reverse_points( points, 13 ); + if (dc->ArcDirection == 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 );

1 0

Huw Davies : gdi32: Pass a DC pointer to the point adding routines.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: f1aaf0efb0344bc7f8d75606dcc02109e38e4443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1aaf0efb0344bc7f8d75606d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 15:09:28 2016 +0100 gdi32: Pass a DC pointer to the point adding routines. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 54 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index a5d01bc..24a9436 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -162,9 +162,8 @@ static struct gdi_path *copy_gdi_path( const struct gdi_path *src_path ) /* Performs a world-to-viewport transformation on the specified point (which * is in floating point format). */ -static inline void INTERNAL_LPTODP_FLOAT( HDC hdc, FLOAT_POINT *point, int count ) +static inline void INTERNAL_LPTODP_FLOAT( DC *dc, FLOAT_POINT *point, int count ) { - DC *dc = get_dc_ptr( hdc ); double x, y; while (count--) @@ -175,7 +174,6 @@ static inline void INTERNAL_LPTODP_FLOAT( HDC hdc, FLOAT_POINT *point, int count point->y = x * dc->xformWorld2Vport.eM12 + y * dc->xformWorld2Vport.eM22 + dc->xformWorld2Vport.eDy; point++; } - release_dc_ptr( dc ); } static inline INT int_from_fixed(FIXED f) @@ -255,16 +253,16 @@ static BOOL PATH_AddEntry(struct gdi_path *pPath, const POINT *pPoint, BYTE flag /* add a number of points, converting them to device coords */ /* return a pointer to the first type byte so it can be fixed up if necessary */ -static BYTE *add_log_points( struct path_physdev *physdev, const POINT *points, DWORD count, BYTE type ) +static BYTE *add_log_points( DC *dc, struct gdi_path *path, const POINT *points, + DWORD count, BYTE type ) { BYTE *ret; - struct gdi_path *path = physdev->path; if (!PATH_ReserveEntries( path, path->count + count )) return NULL; ret = &path->flags[path->count]; memcpy( &path->points[path->count], points, count * sizeof(*points) ); - LPtoDP( physdev->dev.hdc, &path->points[path->count], count ); + lp_to_dp( dc, &path->points[path->count], count ); memset( ret, type, count ); path->count += count; return ret; @@ -325,12 +323,12 @@ static void close_figure( struct gdi_path *path ) } /* add a number of points, starting a new stroke if necessary */ -static BOOL add_log_points_new_stroke( struct path_physdev *physdev, const POINT *points, +static BOOL add_log_points_new_stroke( DC *dc, struct gdi_path *path, const POINT *points, DWORD count, BYTE type ) { - if (!start_new_stroke( physdev->path )) return FALSE; - if (!add_log_points( physdev, points, count, type )) return FALSE; - update_current_pos( physdev->path ); + if (!start_new_stroke( path )) return FALSE; + if (!add_log_points( dc, path, points, count, type )) return FALSE; + update_current_pos( path ); return TRUE; } @@ -889,11 +887,12 @@ static BOOL pathdrv_MoveTo( PHYSDEV dev, INT x, INT y ) static BOOL pathdrv_LineTo( PHYSDEV dev, INT x, INT y ) { struct path_physdev *physdev = get_path_physdev( dev ); + DC *dc = get_physdev_dc( dev ); POINT point; point.x = x; point.y = y; - return add_log_points_new_stroke( physdev, &point, 1, PT_LINETO ); + return add_log_points_new_stroke( dc, physdev->path, &point, 1, PT_LINETO ); } @@ -1066,6 +1065,7 @@ static BOOL pathdrv_Ellipse( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2 ) static BOOL PATH_Arc( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, INT xStart, INT yStart, INT xEnd, INT yEnd, int direction, int lines ) { + DC *dc = get_physdev_dc( dev ); struct path_physdev *physdev = get_path_physdev( dev ); double angleStart, angleEnd, angleStartQuadrant, angleEndQuadrant=0.0; /* Initialize angleEndQuadrant to silence gcc's warning */ @@ -1091,9 +1091,9 @@ static BOOL PATH_Arc( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, pointStart.y = yStart; pointEnd.x = xEnd; pointEnd.y = yEnd; - INTERNAL_LPTODP_FLOAT(dev->hdc, corners, 2); - INTERNAL_LPTODP_FLOAT(dev->hdc, &pointStart, 1); - INTERNAL_LPTODP_FLOAT(dev->hdc, &pointEnd, 1); + INTERNAL_LPTODP_FLOAT(dc, corners, 2); + INTERNAL_LPTODP_FLOAT(dc, &pointStart, 1); + INTERNAL_LPTODP_FLOAT(dc, &pointEnd, 1); /* Make sure first corner is top left and second corner is bottom right */ if(corners[0].x>corners[1].x) @@ -1266,8 +1266,9 @@ static BOOL pathdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, static BOOL pathdrv_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD cbPoints ) { struct path_physdev *physdev = get_path_physdev( dev ); + DC *dc = get_physdev_dc( dev ); - return add_log_points_new_stroke( physdev, pts, cbPoints, PT_BEZIERTO ); + return add_log_points_new_stroke( dc, physdev->path, pts, cbPoints, PT_BEZIERTO ); } @@ -1277,7 +1278,8 @@ static BOOL pathdrv_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD cbPoints static BOOL pathdrv_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD cbPoints ) { struct path_physdev *physdev = get_path_physdev( dev ); - BYTE *type = add_log_points( physdev, pts, cbPoints, PT_BEZIERTO ); + DC *dc = get_physdev_dc( dev ); + BYTE *type = add_log_points( dc, physdev->path, pts, cbPoints, PT_BEZIERTO ); if (!type) return FALSE; type[0] = PT_MOVETO; @@ -1292,6 +1294,7 @@ static BOOL pathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, { struct path_physdev *physdev = get_path_physdev( dev ); struct gdi_path *path = physdev->path; + DC *dc = get_physdev_dc( dev ); POINT orig_pos; INT i, lastmove = 0; @@ -1310,13 +1313,13 @@ static BOOL pathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, break; case PT_LINETO: case PT_LINETO | PT_CLOSEFIGURE: - if (!add_log_points_new_stroke( physdev, &pts[i], 1, PT_LINETO )) return FALSE; + if (!add_log_points_new_stroke( dc, path, &pts[i], 1, PT_LINETO )) return FALSE; break; case PT_BEZIERTO: if ((i + 2 < cbPoints) && (types[i + 1] == PT_BEZIERTO) && (types[i + 2] & ~PT_CLOSEFIGURE) == PT_BEZIERTO) { - if (!add_log_points_new_stroke( physdev, &pts[i], 3, PT_BEZIERTO )) return FALSE; + if (!add_log_points_new_stroke( dc, path, &pts[i], 3, PT_BEZIERTO )) return FALSE; i += 2; break; } @@ -1343,10 +1346,11 @@ static BOOL pathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, static BOOL pathdrv_Polyline( PHYSDEV dev, const POINT *pts, INT count ) { struct path_physdev *physdev = get_path_physdev( dev ); + DC *dc = get_physdev_dc( dev ); BYTE *type; if (count < 2) return FALSE; - if (!(type = add_log_points( physdev, pts, count, PT_LINETO ))) return FALSE; + if (!(type = add_log_points( dc, physdev->path, pts, count, PT_LINETO ))) return FALSE; type[0] = PT_MOVETO; return TRUE; } @@ -1358,9 +1362,10 @@ static BOOL pathdrv_Polyline( PHYSDEV dev, const POINT *pts, INT count ) static BOOL pathdrv_PolylineTo( PHYSDEV dev, const POINT *pts, INT count ) { struct path_physdev *physdev = get_path_physdev( dev ); + DC *dc = get_physdev_dc( dev ); if (count < 1) return FALSE; - return add_log_points_new_stroke( physdev, pts, count, PT_LINETO ); + return add_log_points_new_stroke( dc, physdev->path, pts, count, PT_LINETO ); } @@ -1370,10 +1375,11 @@ static BOOL pathdrv_PolylineTo( PHYSDEV dev, const POINT *pts, INT count ) static BOOL pathdrv_Polygon( PHYSDEV dev, const POINT *pts, INT count ) { struct path_physdev *physdev = get_path_physdev( dev ); + DC *dc = get_physdev_dc( dev ); BYTE *type; if (count < 2) return FALSE; - if (!(type = add_log_points( physdev, pts, count, PT_LINETO ))) return FALSE; + if (!(type = add_log_points( dc, physdev->path, pts, count, PT_LINETO ))) return FALSE; type[0] = PT_MOVETO; type[count - 1] = PT_LINETO | PT_CLOSEFIGURE; return TRUE; @@ -1386,6 +1392,7 @@ static BOOL pathdrv_Polygon( PHYSDEV dev, const POINT *pts, INT count ) static BOOL pathdrv_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT polygons ) { struct path_physdev *physdev = get_path_physdev( dev ); + DC *dc = get_physdev_dc( dev ); UINT poly, count; BYTE *type; @@ -1396,7 +1403,7 @@ static BOOL pathdrv_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* count count += counts[poly]; } - type = add_log_points( physdev, pts, count, PT_LINETO ); + type = add_log_points( dc, physdev->path, pts, count, PT_LINETO ); if (!type) return FALSE; /* make the first point of each polyline a PT_MOVETO, and close the last one */ @@ -1415,6 +1422,7 @@ static BOOL pathdrv_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* count static BOOL pathdrv_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* counts, DWORD polylines ) { struct path_physdev *physdev = get_path_physdev( dev ); + DC *dc = get_physdev_dc( dev ); UINT poly, count; BYTE *type; @@ -1425,7 +1433,7 @@ static BOOL pathdrv_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* co count += counts[poly]; } - type = add_log_points( physdev, pts, count, PT_LINETO ); + type = add_log_points( dc, physdev->path, pts, count, PT_LINETO ); if (!type) return FALSE; /* make the first point of each polyline a PT_MOVETO */

1 0

Huw Davies : gdi32: Pass a DC pointer to get_gdi_flat_path().
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 67520ebaf57c76a6b69820a93c902c804843ea7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=67520ebaf57c76a6b69820a93… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 15:09:26 2016 +0100 gdi32: Pass a DC pointer to get_gdi_flat_path(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/graphics.c | 3 ++- dlls/gdi32/enhmfdrv/graphics.c | 3 ++- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/path.c | 8 ++------ 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 3ea39a1..e6d65e1 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -408,6 +408,7 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, /* helper for path stroking and filling functions */ static BOOL stroke_and_fill_path( dibdrv_physdev *dev, BOOL stroke, BOOL fill ) { + DC *dc = get_physdev_dc( &dev->dev ); struct gdi_path *path; POINT *points; BYTE *types; @@ -417,7 +418,7 @@ static BOOL stroke_and_fill_path( dibdrv_physdev *dev, BOOL stroke, BOOL fill ) if (dev->brush.style == BS_NULL) fill = FALSE; - if (!(path = get_gdi_flat_path( dev->dev.hdc, fill ? &interior : NULL ))) return FALSE; + if (!(path = get_gdi_flat_path( dc, fill ? &interior : NULL ))) return FALSE; if (!(total = get_gdi_path_data( path, &points, &types ))) goto done; if (stroke && dev->pen_uses_region) outline = CreateRectRgn( 0, 0, 0, 0 ); diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index f74e86b..7aaff9d 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -99,6 +99,7 @@ static void get_points_bounds( RECTL *bounds, const POINT *pts, UINT count, HDC /* helper for path stroke and fill functions */ static BOOL emfdrv_stroke_and_fill_path( PHYSDEV dev, INT type ) { + DC *dc = get_physdev_dc( dev ); EMRSTROKEANDFILLPATH emr; struct gdi_path *path; POINT *points; @@ -107,7 +108,7 @@ static BOOL emfdrv_stroke_and_fill_path( PHYSDEV dev, INT type ) emr.emr.iType = type; emr.emr.nSize = sizeof(emr); - if ((path = get_gdi_flat_path( dev->hdc, NULL ))) + if ((path = get_gdi_flat_path( dc, NULL ))) { int count = get_gdi_path_data( path, &points, &flags ); get_points_bounds( &emr.rclBounds, points, count, 0 ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5bad7b7..3df3a2c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -334,7 +334,7 @@ typedef struct /* path.c */ extern void free_gdi_path( struct gdi_path *path ) DECLSPEC_HIDDEN; -extern struct gdi_path *get_gdi_flat_path( HDC hdc, HRGN *rgn ) DECLSPEC_HIDDEN; +extern struct gdi_path *get_gdi_flat_path( DC *dc, HRGN *rgn ) DECLSPEC_HIDDEN; extern int get_gdi_path_data( struct gdi_path *path, POINT **points, BYTE **flags ) DECLSPEC_HIDDEN; extern BOOL PATH_SavePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; extern BOOL PATH_RestorePath( DC *dst, DC *src ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 2126dab..c03208f 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -536,24 +536,20 @@ static BOOL PATH_DoArcPart(struct gdi_path *pPath, FLOAT_POINT corners[], /* retrieve a flattened path in device coordinates, and optionally its region */ /* the DC path is deleted; the returned data must be freed by caller using free_gdi_path() */ /* helper for stroke_and_fill_path in the DIB driver */ -struct gdi_path *get_gdi_flat_path( HDC hdc, HRGN *rgn ) +struct gdi_path *get_gdi_flat_path( DC *dc, HRGN *rgn ) { - DC *dc = get_dc_ptr( hdc ); struct gdi_path *ret = NULL; - if (!dc) return NULL; - if (dc->path) { ret = PATH_FlattenPath( dc->path ); free_gdi_path( dc->path ); dc->path = NULL; - if (ret && rgn) *rgn = path_to_region( ret, GetPolyFillMode( hdc ) ); + if (ret && rgn) *rgn = path_to_region( ret, dc->polyFillMode ); } else SetLastError( ERROR_CAN_NOT_COMPLETE ); - release_dc_ptr( dc ); return ret; }

1 0