Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for bug #138.

Browse source 
svn path=/trunk/; revision=7516
This commit is contained in:
Filip Navara 2004-01-08 20:59:42 +00:00
parent 8f41100a91
commit 9384f583e0
1 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

48
reactos/subsys/win32k/dib/dib24bpp.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: dib24bpp.c,v 1.15 2003/12/08 18:05:30 fireball Exp $ */ /* $Id: dib24bpp.c,v 1.16 2004/01/08 20:59:42 navaraf Exp $ */
#undef WIN32_LEAN_AND_MEAN #undef WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <stdlib.h> #include <stdlib.h>
@ -30,31 +30,30 @@
VOID VOID
DIB_24BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c) DIB_24BPP_PutPixel(PSURFOBJ SurfObj, LONG x, LONG y, ULONG c)
{ {
PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; PBYTE addr = SurfObj->pvScan0 + (y * SurfObj->lDelta) + (x << 1) + x;
PRGBTRIPLE addr = (PRGBTRIPLE)byteaddr + x; *(PUSHORT)(addr) = c & 0xFFFF;
*(addr + 2) = (c >> 16) & 0xFF;
*(PULONG)(addr) = c;
} }
ULONG ULONG
DIB_24BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y) DIB_24BPP_GetPixel(PSURFOBJ SurfObj, LONG x, LONG y)
{ {
PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; PBYTE addr = SurfObj->pvScan0 + y * SurfObj->lDelta + (x << 1) + x;
PRGBTRIPLE addr = (PRGBTRIPLE)byteaddr + x; return *(PUSHORT)(addr) + (*(addr + 2) << 16);
return *(PULONG)(addr) & 0x00ffffff;
} }
VOID VOID
DIB_24BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c) DIB_24BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
{ {
PBYTE byteaddr = SurfObj->pvScan0 + y * SurfObj->lDelta; PBYTE addr = SurfObj->pvScan0 + y * SurfObj->lDelta + (x1 << 1) + x1;
PRGBTRIPLE addr = (PRGBTRIPLE)byteaddr + x1;
LONG cx = x1; LONG cx = x1;
c &= 0xFFFFFF;
while(cx < x2) { while(cx < x2) {
*(PULONG)(addr) = c; *(PUSHORT)(addr) = c & 0xFFFF;
++addr; addr += 2;
*(addr) = c >> 16;
addr += 1;
++cx; ++cx;
} }
} }
@ -62,16 +61,15 @@ DIB_24BPP_HLine(PSURFOBJ SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
VOID VOID
DIB_24BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c) DIB_24BPP_VLine(PSURFOBJ SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
{ {
PBYTE byteaddr = SurfObj->pvScan0 + y1 * SurfObj->lDelta; PBYTE addr = SurfObj->pvScan0 + y1 * SurfObj->lDelta + (x << 1) + x;
PRGBTRIPLE addr = (PRGBTRIPLE)byteaddr + x;
LONG lDelta = SurfObj->lDelta; LONG lDelta = SurfObj->lDelta;
byteaddr = (PBYTE)addr; c &= 0xFFFFFF;
while(y1++ < y2) { while(y1++ < y2) {
*(PULONG)(addr) = c; *(PUSHORT)(addr) = c & 0xFFFF;
*(addr + 2) = c >> 16;
byteaddr += lDelta; addr += lDelta;
addr = (PRGBTRIPLE)byteaddr;
} }
} }
@ -255,7 +253,7 @@ DIB_24BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
{ {
LONG i, j, sx, sy; LONG i, j, sx, sy;
ULONG Dest, Source, Pattern; ULONG Dest, Source, Pattern;
PULONG DestBits; PBYTE DestBits;
BOOL UsesSource = ((Rop4 & 0xCC0000) >> 2) != (Rop4 & 0x330000); BOOL UsesSource = ((Rop4 & 0xCC0000) >> 2) != (Rop4 & 0x330000);
BOOL UsesPattern = ((Rop4 & 0xF00000) >> 4) != (Rop4 & 0x0F0000); BOOL UsesPattern = ((Rop4 & 0xF00000) >> 4) != (Rop4 & 0x0F0000);
@ -270,10 +268,10 @@ DIB_24BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
for (j = DestRect->top; j < DestRect->bottom; j++) for (j = DestRect->top; j < DestRect->bottom; j++)
{ {
sx = SourcePoint->x; sx = SourcePoint->x;
DestBits = (PULONG)(DestSurf->pvScan0 + 3 * DestRect->left + j * DestSurf->lDelta); DestBits = (PBYTE)(DestSurf->pvScan0 + 3 * DestRect->left + j * DestSurf->lDelta);
for (i=DestRect->left; i<DestRect->right; i++, DestBits++) for (i=DestRect->left; i<DestRect->right; i++, DestBits+=3)
{ {
Dest = *DestBits & 0x00ffffff; Dest = *(PUSHORT)(DestBits) + (*(DestBits + 2) << 16);
if (UsesSource) if (UsesSource)
{ {
Source = DIB_GetSource(SourceSurf, SourceGDI, sx + (i - DestRect->left), sy, ColorTranslation) & 0x00ffffff; Source = DIB_GetSource(SourceSurf, SourceGDI, sx + (i - DestRect->left), sy, ColorTranslation) & 0x00ffffff;
@ -284,8 +282,8 @@ DIB_24BPP_BitBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf,
Pattern = Brush->iSolidColor; Pattern = Brush->iSolidColor;
} }
Dest = DIB_DoRop(Rop4, Dest, Source, Pattern); Dest = DIB_DoRop(Rop4, Dest, Source, Pattern);
*(PBYTE)DestBits = Dest & 0xff; *(PUSHORT)(DestBits) = Dest & 0xFFFF;
*(PWORD)(DestBits + 1) = Dest >> 8; *(DestBits + 2) = Dest >> 16;
} }
sy++; sy++;
} }