Module: wine Branch: master Commit: 7589bbeee41c3e1d6d4306a680014785e7d49a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7589bbeee41c3e1d6d4306a680...
Author: Michael Stefaniuc mstefani@redhat.de Date: Mon Sep 23 00:23:49 2013 +0200
gdi32: Avoid using CONST.
---
dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/enhmetafile.c | 7 ++----- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 +- dlls/gdi32/enhmfdrv/objects.c | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index adf29ea..dd7a7f1 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -906,7 +906,7 @@ INT WINAPI SetDIBitsToDevice(HDC hdc, INT xDest, INT yDest, DWORD cx, /*********************************************************************** * SetDIBColorTable (GDI32.@) */ -UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, CONST RGBQUAD *colors ) +UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, const RGBQUAD *colors ) { DC * dc; UINT result = 0; @@ -1466,7 +1466,7 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, /*********************************************************************** * CreateDIBSection (GDI32.@) */ -HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, +HBITMAP WINAPI CreateDIBSection(HDC hdc, const BITMAPINFO *bmi, UINT usage, VOID **bits, HANDLE section, DWORD offset) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 796796e..b2ae6aa 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2692,11 +2692,8 @@ typedef struct gdi_mf_comment * Translate from old style to new style. * */ -HENHMETAFILE WINAPI SetWinMetaFileBits(UINT cbBuffer, - CONST BYTE *lpbBuffer, - HDC hdcRef, - CONST METAFILEPICT *lpmfp - ) +HENHMETAFILE WINAPI SetWinMetaFileBits(UINT cbBuffer, const BYTE *lpbBuffer, HDC hdcRef, + const METAFILEPICT *lpmfp) { static const WCHAR szDisplayW[] = { 'D','I','S','P','L','A','Y','\0' }; HMETAFILE hmf = NULL; diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 3dd2923..cbd7368 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -73,7 +73,7 @@ extern BOOL EMFDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) DECLSPEC_HIDDEN; -extern BOOL EMFDRV_GdiComment( PHYSDEV dev, UINT bytes, CONST BYTE *buffer ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_GdiComment( PHYSDEV dev, UINT bytes, const BYTE *buffer ) DECLSPEC_HIDDEN; extern INT EMFDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) DECLSPEC_HIDDEN; extern INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 4c85fe7..4e1f3b1 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -503,7 +503,7 @@ COLORREF EMFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) /****************************************************************** * EMFDRV_GdiComment */ -BOOL EMFDRV_GdiComment(PHYSDEV dev, UINT bytes, CONST BYTE *buffer) +BOOL EMFDRV_GdiComment(PHYSDEV dev, UINT bytes, const BYTE *buffer) { EMRGDICOMMENT *emr; UINT total, rounded_size;