Alexandre Julliard : gdi32: Get rid of the no longer used DC_SAVED flag.
Alexandre Julliard
julliard at winehq.org
Thu Mar 17 12:26:58 CDT 2011
Module: wine
Branch: master
Commit: 174e906aa573e0f1dbd2ec08f470cca25a695237
URL: http://source.winehq.org/git/wine.git/?a=commit;h=174e906aa573e0f1dbd2ec08f470cca25a695237
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Mar 16 21:28:53 2011 +0100
gdi32: Get rid of the no longer used DC_SAVED flag.
---
dlls/gdi32/dc.c | 26 ++++++++++----------------
dlls/gdi32/gdi_private.h | 1 -
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
index d70d2c2..c5e513e 100644
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -384,7 +384,7 @@ INT CDECL nulldrv_SaveDC( PHYSDEV dev )
DC *newdc, *dc = get_nulldrv_dc( dev );
if (!(newdc = HeapAlloc( GetProcessHeap(), 0, sizeof(*newdc )))) return 0;
- newdc->flags = dc->flags | DC_SAVED;
+ newdc->flags = dc->flags;
newdc->layout = dc->layout;
newdc->hPen = dc->hPen;
newdc->hBrush = dc->hBrush;
@@ -484,7 +484,7 @@ BOOL CDECL nulldrv_RestoreDC( PHYSDEV dev, INT level )
if (!PATH_AssignGdiPath( &dc->path, &dcs->path )) return FALSE;
- dc->flags = dcs->flags & ~DC_SAVED;
+ dc->flags = dcs->flags;
dc->layout = dcs->layout;
dc->hDevice = dcs->hDevice;
dc->ROPmode = dcs->ROPmode;
@@ -827,16 +827,13 @@ BOOL WINAPI DeleteDC( HDC hdc )
free_dc_state( dcs );
}
- if (!(dc->flags & DC_SAVED))
- {
- SelectObject( hdc, GetStockObject(BLACK_PEN) );
- SelectObject( hdc, GetStockObject(WHITE_BRUSH) );
- SelectObject( hdc, GetStockObject(SYSTEM_FONT) );
- SelectObject( hdc, GetStockObject(DEFAULT_BITMAP) );
- if (dc->funcs->pDeleteDC) dc->funcs->pDeleteDC(dc->physDev);
- dc->physDev = NULL;
- }
+ SelectObject( hdc, GetStockObject(BLACK_PEN) );
+ SelectObject( hdc, GetStockObject(WHITE_BRUSH) );
+ SelectObject( hdc, GetStockObject(SYSTEM_FONT) );
+ SelectObject( hdc, GetStockObject(DEFAULT_BITMAP) );
+ if (dc->funcs->pDeleteDC) dc->funcs->pDeleteDC(dc->physDev);
+ dc->physDev = NULL;
free_dc_ptr( dc );
return TRUE;
}
@@ -1273,11 +1270,8 @@ BOOL WINAPI SetDCHook( HDC hdc, DCHOOKPROC hookProc, DWORD_PTR dwHookData )
if (!dc) return FALSE;
- if (!(dc->flags & DC_SAVED))
- {
- dc->dwHookData = dwHookData;
- dc->hookProc = hookProc;
- }
+ dc->dwHookData = dwHookData;
+ dc->hookProc = hookProc;
release_dc_ptr( dc );
return TRUE;
}
diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
index 2273009..2dd1569 100644
--- a/dlls/gdi32/gdi_private.h
+++ b/dlls/gdi32/gdi_private.h
@@ -318,7 +318,6 @@ typedef struct tagDC
} DC;
/* DC flags */
-#define DC_SAVED 0x0002 /* It is a saved DC */
#define DC_BOUNDS_ENABLE 0x0008 /* Bounding rectangle tracking is enabled */
#define DC_BOUNDS_SET 0x0010 /* Bounding rectangle has been set */
More information about the wine-cvs
mailing list