diff --git a/reactos/subsys/win32k/eng/clip.c b/reactos/subsys/win32k/eng/clip.c index 8827239bfb4..f179035a9c0 100644 --- a/reactos/subsys/win32k/eng/clip.c +++ b/reactos/subsys/win32k/eng/clip.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: clip.c,v 1.16 2003/08/11 21:10:49 royce Exp $ +/* $Id: clip.c,v 1.17 2003/10/30 08:56:37 gvg Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -259,7 +259,7 @@ CompareLeftUp(const PRECT r1, const PRECT r2) * @implemented */ ULONG STDCALL -CLIPOBJ_cEnumStart(IN PCLIPOBJ ClipObj, +CLIPOBJ_cEnumStart(IN CLIPOBJ* ClipObj, IN BOOL ShouldDoAll, IN ULONG ClipType, IN ULONG BuildOrder, @@ -316,17 +316,17 @@ CLIPOBJ_cEnumStart(IN PCLIPOBJ ClipObj, * @implemented */ BOOL STDCALL -CLIPOBJ_bEnum(IN PCLIPOBJ ClipObj, +CLIPOBJ_bEnum(IN CLIPOBJ* ClipObj, IN ULONG ObjSize, OUT ULONG *EnumRects) { CLIPGDI *ClipGDI = (CLIPGDI*)AccessInternalObjectFromUserObject(ClipObj); ULONG nCopy; - PENUMRECTS pERects = (PENUMRECTS)EnumRects; + ENUMRECTS* pERects = (ENUMRECTS*)EnumRects; //calculate how many rectangles we should copy - nCopy = MIN( ClipGDI->EnumMax - ClipGDI->EnumPos, - MIN( ClipGDI->EnumRects.c - ClipGDI->EnumPos, + nCopy = min( ClipGDI->EnumMax - ClipGDI->EnumPos, + min( ClipGDI->EnumRects.c - ClipGDI->EnumPos, (ObjSize - sizeof(ULONG)) / sizeof(RECTL))); RtlCopyMemory( pERects->arcl, ClipGDI->EnumRects.arcl + ClipGDI->EnumPos, diff --git a/reactos/subsys/win32k/eng/lineto.c b/reactos/subsys/win32k/eng/lineto.c index 663bde3c421..7a521fb8a86 100644 --- a/reactos/subsys/win32k/eng/lineto.c +++ b/reactos/subsys/win32k/eng/lineto.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: lineto.c,v 1.25 2003/10/29 08:38:55 gvg Exp $ + * $Id: lineto.c,v 1.26 2003/10/30 08:56:38 gvg Exp $ */ #include @@ -33,9 +33,9 @@ #include static void FASTCALL -TranslateRects(RECT_ENUM *RectEnum, PPOINTL Translate) +TranslateRects(RECT_ENUM *RectEnum, POINTL* Translate) { - PRECTL CurrentRect; + RECTL* CurrentRect; if (0 != Translate->x || 0 != Translate->y) { @@ -53,14 +53,14 @@ TranslateRects(RECT_ENUM *RectEnum, PPOINTL Translate) * Draw a line from top-left to bottom-right */ static void FASTCALL -NWtoSE(PSURFOBJ OutputObj, PSURFGDI OutputGDI, PCLIPOBJ Clip, - PBRUSHOBJ Brush, LONG x, LONG y, LONG deltax, LONG deltay, - PPOINTL Translate) +NWtoSE(SURFOBJ* OutputObj, SURFGDI* OutputGDI, CLIPOBJ* Clip, + BRUSHOBJ* Brush, LONG x, LONG y, LONG deltax, LONG deltay, + POINTL* Translate) { int i; int error; BOOLEAN EnumMore; - PRECTL ClipRect; + RECTL* ClipRect; RECT_ENUM RectEnum; ULONG Pixel = Brush->iSolidColor; LONG delta; @@ -123,14 +123,14 @@ NWtoSE(PSURFOBJ OutputObj, PSURFGDI OutputGDI, PCLIPOBJ Clip, } static void FASTCALL -SWtoNE(PSURFOBJ OutputObj, PSURFGDI OutputGDI, PCLIPOBJ Clip, - PBRUSHOBJ Brush, LONG x, LONG y, LONG deltax, LONG deltay, - PPOINTL Translate) +SWtoNE(SURFOBJ* OutputObj, SURFGDI* OutputGDI, CLIPOBJ* Clip, + BRUSHOBJ* Brush, LONG x, LONG y, LONG deltax, LONG deltay, + POINTL* Translate) { int i; int error; BOOLEAN EnumMore; - PRECTL ClipRect; + RECTL* ClipRect; RECT_ENUM RectEnum; ULONG Pixel = Brush->iSolidColor; LONG delta; @@ -192,14 +192,14 @@ SWtoNE(PSURFOBJ OutputObj, PSURFGDI OutputGDI, PCLIPOBJ Clip, } static void FASTCALL -NEtoSW(PSURFOBJ OutputObj, PSURFGDI OutputGDI, PCLIPOBJ Clip, - PBRUSHOBJ Brush, LONG x, LONG y, LONG deltax, LONG deltay, - PPOINTL Translate) +NEtoSW(SURFOBJ* OutputObj, SURFGDI* OutputGDI, CLIPOBJ* Clip, + BRUSHOBJ* Brush, LONG x, LONG y, LONG deltax, LONG deltay, + POINTL* Translate) { int i; int error; BOOLEAN EnumMore; - PRECTL ClipRect; + RECTL* ClipRect; RECT_ENUM RectEnum; ULONG Pixel = Brush->iSolidColor; LONG delta; @@ -261,14 +261,14 @@ NEtoSW(PSURFOBJ OutputObj, PSURFGDI OutputGDI, PCLIPOBJ Clip, } static void FASTCALL -SEtoNW(PSURFOBJ OutputObj, PSURFGDI OutputGDI, PCLIPOBJ Clip, - PBRUSHOBJ Brush, LONG x, LONG y, LONG deltax, LONG deltay, - PPOINTL Translate) +SEtoNW(SURFOBJ* OutputObj, SURFGDI* OutputGDI, CLIPOBJ* Clip, + BRUSHOBJ* Brush, LONG x, LONG y, LONG deltax, LONG deltay, + POINTL* Translate) { int i; int error; BOOLEAN EnumMore; - PRECTL ClipRect; + RECTL* ClipRect; RECT_ENUM RectEnum; ULONG Pixel = Brush->iSolidColor; LONG delta; @@ -553,10 +553,10 @@ IntEngPolyline(SURFOBJ *DestSurf, //Draw the Polyline with a call to IntEngLineTo for each segment. for (i = 1; i < dCount; i++) { - rect.left = MIN(pt[i-1].x, pt[i].x); - rect.top = MIN(pt[i-1].y, pt[i].y); - rect.right = MAX(pt[i-1].x, pt[i].x); - rect.bottom = MAX(pt[i-1].y, pt[i].y); + rect.left = min(pt[i-1].x, pt[i].x); + rect.top = min(pt[i-1].y, pt[i].y); + rect.right = max(pt[i-1].x, pt[i].x); + rect.bottom = max(pt[i-1].y, pt[i].y); ret = IntEngLineTo(DestSurf, Clip, Brush, diff --git a/reactos/subsys/win32k/eng/surface.c b/reactos/subsys/win32k/eng/surface.c index 1991cdc3331..52f27aae73a 100644 --- a/reactos/subsys/win32k/eng/surface.c +++ b/reactos/subsys/win32k/eng/surface.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: surface.c,v 1.25 2003/08/28 12:35:59 gvg Exp $ +/* $Id: surface.c,v 1.26 2003/10/30 08:56:38 gvg Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -81,25 +81,25 @@ ULONG FASTCALL BitmapFormat(WORD Bits, DWORD Compression) } } -static VOID Dummy_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c) +static VOID Dummy_PutPixel(SURFOBJ* SurfObj, LONG x, LONG y, ULONG c) { return; } -static VOID Dummy_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c) +static VOID Dummy_HLine(SURFOBJ* SurfObj, LONG x1, LONG x2, LONG y, ULONG c) { return; } -static VOID Dummy_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c) +static VOID Dummy_VLine(SURFOBJ* SurfObj, LONG x, LONG y1, LONG y2, ULONG c) { return; } static BOOLEAN Dummy_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, SURFGDI *DestGDI, SURFGDI *SourceGDI, - PRECTL DestRect, POINTL *SourcePoint, - PBRUSHOBJ BrushObj, POINTL* BrushOrign, + RECTL* DestRect, POINTL *SourcePoint, + BRUSHOBJ* BrushObj, POINTL* BrushOrign, XLATEOBJ *ColorTranslation, ULONG Rop4) { return FALSE; @@ -156,7 +156,7 @@ EngCreateDeviceBitmap(IN DHSURF dhsurf, NewBitmap = EngCreateBitmap(Size, DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(Format)), Format, 0, NULL); SurfObj = (PVOID)AccessUserObject((ULONG)NewBitmap); - SurfObj->dhpdev = dhsurf; + SurfObj->dhsurf = dhsurf; return NewBitmap; } @@ -244,7 +244,7 @@ EngCreateDeviceSurface(IN DHSURF dhsurf, SurfGDI->BitsPerPixel = BitsPerFormat(Format); SurfObj->dhsurf = dhsurf; - SurfObj->hsurf = dhsurf; // FIXME: Is this correct?? + SurfObj->hsurf = (HSURF) dhsurf; // FIXME: Is this correct?? SurfObj->sizlBitmap = Size; SurfObj->iBitmapFormat = Format; SurfObj->lDelta = DIB_GetDIBWidthBytes(Size.cx, BitsPerFormat(Format)); diff --git a/reactos/subsys/win32k/include/paint.h b/reactos/subsys/win32k/include/paint.h index ca0fcabe148..dd187ba52a2 100644 --- a/reactos/subsys/win32k/include/paint.h +++ b/reactos/subsys/win32k/include/paint.h @@ -1,7 +1,7 @@ #ifndef __WIN32K_PAINT_H #define __WIN32K_PAINT_H -BOOL STDCALL FillSolid (PSURFOBJ Surface, PRECTL Dimensions, ULONG iColor); -BOOL STDCALL FillPolygon ( PDC dc, PSURFOBJ SurfObj, PBRUSHOBJ BrushObj, MIX RopMode, CONST PPOINT Points, INT Count, RECTL BoundRect ); +BOOL STDCALL FillSolid (SURFOBJ* Surface, RECTL* Dimensions, ULONG iColor); +BOOL STDCALL FillPolygon ( DC* dc, SURFOBJ* SurfObj, BRUSHOBJ* BrushObj, MIX RopMode, CONST PPOINT Points, INT Count, RECTL BoundRect ); #endif /* __WIN32K_PAINT_H */ diff --git a/reactos/subsys/win32k/include/palette.h b/reactos/subsys/win32k/include/palette.h index 7811a32554f..84970cf0174 100644 --- a/reactos/subsys/win32k/include/palette.h +++ b/reactos/subsys/win32k/include/palette.h @@ -37,7 +37,7 @@ HPALETTE FASTCALL PALETTE_AllocPalette(ULONG Mode, HPALETTE FASTCALL PALETTE_Init (VOID); VOID FASTCALL PALETTE_ValidateFlags (PALETTEENTRY* lpPalE, INT size); -INT STDCALL PALETTE_SetMapping(PPALOBJ palPtr, UINT uStart, UINT uNum, BOOL mapOnly); +INT STDCALL PALETTE_SetMapping(PALOBJ* palPtr, UINT uStart, UINT uNum, BOOL mapOnly); INT FASTCALL PALETTE_ToPhysical (PDC dc, COLORREF color); PPALETTEENTRY FASTCALL ReturnSystemPalette (VOID);