Alexandre Julliard : gdi32: Rename the CLIPPING_UpdateGCRegion function.
Alexandre Julliard
julliard at winehq.org
Wed Dec 7 13:57:12 CST 2011
Module: wine
Branch: master
Commit: 5b17ba887b50919fa202ba70d4f4df6d2d8288e3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b17ba887b50919fa202ba70d4f4df6d2d8288e3
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Dec 7 17:09:11 2011 +0100
gdi32: Rename the CLIPPING_UpdateGCRegion function.
We haven't used a GC here for a long time now.
---
dlls/gdi32/clipping.c | 18 +++++++++---------
dlls/gdi32/dc.c | 6 +++---
dlls/gdi32/gdi_private.h | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c
index ca31580..bb50bec 100644
--- a/dlls/gdi32/clipping.c
+++ b/dlls/gdi32/clipping.c
@@ -79,11 +79,11 @@ BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src )
}
/***********************************************************************
- * CLIPPING_UpdateGCRegion
+ * update_dc_clipping
*
- * Update the GC clip region when the ClipRgn or VisRgn have changed.
+ * Update the DC and device clip regions when the ClipRgn or VisRgn have changed.
*/
-void CLIPPING_UpdateGCRegion( DC * dc )
+void update_dc_clipping( DC * dc )
{
PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDeviceClipping );
HRGN regions[3];
@@ -171,7 +171,7 @@ INT nulldrv_ExtSelectClipRgn( PHYSDEV dev, HRGN rgn, INT mode )
if (mirrored) DeleteObject( mirrored );
}
- CLIPPING_UpdateGCRegion( dc );
+ update_dc_clipping( dc );
return ret;
}
@@ -186,7 +186,7 @@ INT nulldrv_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
if (!dc->hClipRgn) create_default_clip_region( dc );
ret = CombineRgn( dc->hClipRgn, dc->hClipRgn, rgn, RGN_DIFF );
DeleteObject( rgn );
- if (ret != ERROR) CLIPPING_UpdateGCRegion( dc );
+ if (ret != ERROR) update_dc_clipping( dc );
return ret;
}
@@ -208,7 +208,7 @@ INT nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bo
ret = CombineRgn( dc->hClipRgn, dc->hClipRgn, rgn, RGN_AND );
DeleteObject( rgn );
}
- if (ret != ERROR) CLIPPING_UpdateGCRegion( dc );
+ if (ret != ERROR) update_dc_clipping( dc );
return ret;
}
@@ -223,7 +223,7 @@ INT nulldrv_OffsetClipRgn( PHYSDEV dev, INT x, INT y )
y = MulDiv( y, dc->vportExtY, dc->wndExtY );
if (dc->layout & LAYOUT_RTL) x = -x;
ret = OffsetRgn( dc->hClipRgn, x, y );
- CLIPPING_UpdateGCRegion( dc );
+ update_dc_clipping( dc );
}
return ret;
}
@@ -277,7 +277,7 @@ void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect )
dc->vis_rect = *vis_rect;
dc->hVisRgn = hrgn;
DC_UpdateXforms( dc );
- CLIPPING_UpdateGCRegion( dc );
+ update_dc_clipping( dc );
release_dc_ptr( dc );
}
@@ -560,7 +560,7 @@ INT WINAPI SetMetaRgn( HDC hdc )
}
/* else nothing to do */
- /* Note: no need to call CLIPPING_UpdateGCRegion, the overall clip region hasn't changed */
+ /* Note: no need to call update_dc_clipping, the overall clip region hasn't changed */
ret = GetRgnBox( dc->hMetaRgn, &dummy );
release_dc_ptr( dc );
diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
index 986ee0a..b1065de 100644
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -242,7 +242,7 @@ void DC_InitDC( DC* dc )
SelectObject( dc->hSelf, dc->hPen );
SelectObject( dc->hSelf, dc->hBrush );
SelectObject( dc->hSelf, dc->hFont );
- CLIPPING_UpdateGCRegion( dc );
+ update_dc_clipping( dc );
SetVirtualResolution( dc->hSelf, 0, 0, 0, 0 );
}
@@ -490,7 +490,7 @@ BOOL nulldrv_RestoreDC( PHYSDEV dev, INT level )
dc->hMetaRgn = 0;
}
DC_UpdateXforms( dc );
- CLIPPING_UpdateGCRegion( dc );
+ update_dc_clipping( dc );
SelectObject( dev->hdc, dcs->hBitmap );
SelectObject( dev->hdc, dcs->hBrush );
@@ -780,7 +780,7 @@ HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode )
dc->vis_rect.bottom = GetDeviceCaps( hdc, DESKTOPVERTRES );
if (dc->hVisRgn) DeleteObject( dc->hVisRgn );
dc->hVisRgn = 0;
- CLIPPING_UpdateGCRegion( dc );
+ update_dc_clipping( dc );
}
release_dc_ptr( dc );
}
diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
index 604e87d..56fc96d 100644
--- a/dlls/gdi32/gdi_private.h
+++ b/dlls/gdi32/gdi_private.h
@@ -213,7 +213,7 @@ extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits,
/* clipping.c */
extern BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) DECLSPEC_HIDDEN;
-extern void CLIPPING_UpdateGCRegion( DC * dc ) DECLSPEC_HIDDEN;
+extern void update_dc_clipping( DC * dc ) DECLSPEC_HIDDEN;
/* Return the total DC region (if any) */
static inline HRGN get_dc_region( DC *dc )
More information about the wine-cvs
mailing list