From a9be5303eb09d67f4ee4b994b11852901be1ba44 Mon Sep 17 00:00:00 2001 From: Jason Filby Date: Sun, 1 Jul 2001 14:34:45 +0000 Subject: [PATCH] Fixed warnings svn path=/trunk/; revision=2024 --- reactos/subsys/win32k/dib/dib.h | 24 ++++++++++++------------ reactos/subsys/win32k/dib/dib24bpp.c | 16 ++++++++-------- reactos/subsys/win32k/dib/dib4bpp.c | 10 +++++----- reactos/subsys/win32k/eng/lineto.c | 14 +++++++------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/reactos/subsys/win32k/dib/dib.h b/reactos/subsys/win32k/dib/dib.h index f59ca4af097..30916d957d0 100644 --- a/reactos/subsys/win32k/dib/dib.h +++ b/reactos/subsys/win32k/dib/dib.h @@ -1,17 +1,17 @@ static unsigned char notmask[2] = { 0x0f, 0xf0 }; static unsigned char altnotmask[2] = { 0xf0, 0x0f }; -typedef VOID (*PFN_DIB_PutPixel)(SURFOBJ *, LONG, LONG, ULONG); -typedef ULONG (*PFN_DIB_GetPixel)(SURFOBJ *, LONG, LONG); -typedef VOID (*PFN_DIB_HLine) (SURFOBJ *, LONG, LONG, LONG, ULONG); -typedef VOID (*PFN_DIB_VLine) (SURFOBJ *, LONG, LONG, LONG, ULONG); +typedef VOID (*PFN_DIB_PutPixel)(PSURFOBJ, LONG, LONG, ULONG); +typedef ULONG (*PFN_DIB_GetPixel)(PSURFOBJ, LONG, LONG); +typedef VOID (*PFN_DIB_HLine) (PSURFOBJ, LONG, LONG, LONG, ULONG); +typedef VOID (*PFN_DIB_VLine) (PSURFOBJ, LONG, LONG, LONG, ULONG); -VOID DIB_4BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, BYTE c); -BYTE DIB_4BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y); -VOID DIB_4BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, BYTE c); -VOID DIB_4BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, BYTE c); +PFN_DIB_PutPixel DIB_4BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c); +PFN_DIB_GetPixel DIB_4BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y); +PFN_DIB_HLine DIB_4BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c); +PFN_DIB_VLine DIB_4BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c); -VOID DIB_24BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, RGBTRIPLE c); -RGBTRIPLE DIB_24BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y); -VOID DIB_24BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, RGBTRIPLE c); -VOID DIB_24BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, RGBTRIPLE c); +PFN_DIB_PutPixel DIB_24BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c); +PFN_DIB_GetPixel DIB_24BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y); +PFN_DIB_HLine DIB_24BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c); +PFN_DIB_VLine DIB_24BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c); diff --git a/reactos/subsys/win32k/dib/dib24bpp.c b/reactos/subsys/win32k/dib/dib24bpp.c index c6350d4c72e..e4f6ec1163a 100644 --- a/reactos/subsys/win32k/dib/dib24bpp.c +++ b/reactos/subsys/win32k/dib/dib24bpp.c @@ -8,36 +8,36 @@ #include "../eng/objects.h" #include "dib.h" -VOID DIB_24BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, RGBTRIPLE c) +PFN_DIB_PutPixel DIB_24BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c) { PBYTE byteaddr = SurfObj->pvBits + y * SurfObj->lDelta; PRGBTRIPLE addr = (PRGBTRIPLE)byteaddr + x; - *addr = c; + *(PULONG)(addr) = c; } -RGBTRIPLE DIB_24BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y) +PFN_DIB_GetPixel DIB_24BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y) { PBYTE byteaddr = SurfObj->pvBits + y * SurfObj->lDelta; PRGBTRIPLE addr = (PRGBTRIPLE)byteaddr + x; - return *addr; + return (PFN_DIB_GetPixel)(*(PULONG)(addr)); } -VOID DIB_24BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, RGBTRIPLE c) +PFN_DIB_HLine DIB_24BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c) { PBYTE byteaddr = SurfObj->pvBits + y * SurfObj->lDelta; PRGBTRIPLE addr = (PRGBTRIPLE)byteaddr + x1; LONG cx = x1; while(cx <= x2) { - *addr = c; + *(PULONG)(addr) = c; ++addr; ++cx; } } -VOID DIB_24BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, RGBTRIPLE c) +PFN_DIB_VLine DIB_24BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c) { PBYTE byteaddr = SurfObj->pvBits + y1 * SurfObj->lDelta; PRGBTRIPLE addr = (PRGBTRIPLE)byteaddr + x; @@ -45,7 +45,7 @@ VOID DIB_24BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, RGBTRIPLE c) byteaddr = (PBYTE)addr; while(y1++ <= y2) { - *addr = c; + *(PULONG)(addr) = c; byteaddr += lDelta; addr = (PRGBTRIPLE)byteaddr; diff --git a/reactos/subsys/win32k/dib/dib4bpp.c b/reactos/subsys/win32k/dib/dib4bpp.c index f321516fa84..7b5f707e8a3 100644 --- a/reactos/subsys/win32k/dib/dib4bpp.c +++ b/reactos/subsys/win32k/dib/dib4bpp.c @@ -8,7 +8,7 @@ #include "../eng/objects.h" #include "dib.h" -VOID DIB_4BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, BYTE c) +PFN_DIB_PutPixel DIB_4BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c) { unsigned char *vp; unsigned char mask; @@ -18,14 +18,14 @@ VOID DIB_4BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, BYTE c) *addr = (*addr & notmask[x&1]) | (c << ((1-(x&1))<<2)); } -BYTE DIB_4BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y) +PFN_DIB_GetPixel DIB_4BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y) { PBYTE addr = SurfObj->pvBits; - return (addr[(x>>1) + y * SurfObj->lDelta] >> ((1-(x&1))<<2) ) & 0x0f; + return (PFN_DIB_GetPixel)((addr[(x>>1) + y * SurfObj->lDelta] >> ((1-(x&1))<<2) ) & 0x0f); } -VOID DIB_4BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, BYTE c) +PFN_DIB_HLine DIB_4BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c) { PBYTE addr = SurfObj->pvBits + (x1>>1) + y * SurfObj->lDelta; LONG cx = x1; @@ -38,7 +38,7 @@ VOID DIB_4BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, BYTE c) } } -VOID DIB_4BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, BYTE c) +PFN_DIB_VLine DIB_4BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c) { PBYTE addr = SurfObj->pvBits; int lDelta = SurfObj->lDelta; diff --git a/reactos/subsys/win32k/eng/lineto.c b/reactos/subsys/win32k/eng/lineto.c index f48b1be8e89..432d1ebc511 100644 --- a/reactos/subsys/win32k/eng/lineto.c +++ b/reactos/subsys/win32k/eng/lineto.c @@ -32,15 +32,15 @@ BOOL EngLineTo(SURFOBJ *Surface, CLIPOBJ *Clip, BRUSHOBJ *Brush, switch(BitsPerFormat(Surface->iBitmapFormat)) { case 4: - DIB_PutPixel = DIB_4BPP_PutPixel; - DIB_HLine = DIB_4BPP_HLine; - DIB_VLine = DIB_4BPP_VLine; + DIB_PutPixel = (PFN_DIB_PutPixel)DIB_4BPP_PutPixel; + DIB_HLine = (PFN_DIB_HLine)DIB_4BPP_HLine; + DIB_VLine = (PFN_DIB_VLine)DIB_4BPP_VLine; break; case 24: - DIB_PutPixel = DIB_24BPP_PutPixel; - DIB_HLine = DIB_24BPP_HLine; - DIB_VLine = DIB_24BPP_VLine; + DIB_PutPixel = (PFN_DIB_PutPixel)DIB_24BPP_PutPixel; + DIB_HLine = (PFN_DIB_HLine)DIB_24BPP_HLine; + DIB_VLine = (PFN_DIB_VLine)DIB_24BPP_VLine; break; default: @@ -52,7 +52,6 @@ BOOL EngLineTo(SURFOBJ *Surface, CLIPOBJ *Clip, BRUSHOBJ *Brush, } // FIXME: Implement clipping - x=x1; y=y1; deltax=x2-x1; @@ -120,5 +119,6 @@ BOOL EngLineTo(SURFOBJ *Surface, CLIPOBJ *Clip, BRUSHOBJ *Brush, } MouseSafetyOnDrawEnd(Surface, SurfGDI); + return TRUE; }