Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K] Fix brain-fail of mine

Browse source 
Copying e.g. (2;2);(6;6) to (0;0);(4;4) also needs to have an intermediate buffer.
This commit is contained in:
Jérôme Gardou 2021-03-31 16:55:30 +02:00
parent 30886e74f2
commit 40f7e86347
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
win32ss/gdi/dib/dib1bpp.c
View file

@ -69,6 +69,7 @@ DIB_1BPP_BitBltSrcCopy_From1BPP (
LONG Width = RECTL_lGetWidth(DestRect);
BOOLEAN XorBit = !!XLATEOBJ_iXlate(pxlo, 0);
BOOLEAN Overlap = FALSE;
BYTE *DstStart, *DstEnd, *SrcStart, *SrcEnd;
/* Make sure this is as expected */
ASSERT(DestRect->left >= 0);
@ -78,34 +79,30 @@ DIB_1BPP_BitBltSrcCopy_From1BPP (
/*
* Check if we need to allocate a buffer for our operation.
* NB: if we're not mirroring, we're doing a memmove-like operation, so this is always fine.
*/
if (bTopToBottom || bLeftToRight)
DstStart = (BYTE*)DestSurf->pvScan0 + DestRect->top * DestSurf->lDelta + DestRect->left / 8;
DstEnd = (BYTE*)DestSurf->pvScan0 + (DestRect->bottom - 1) * DestSurf->lDelta + (DestRect->right) / 8;
SrcStart = (BYTE*)SourceSurf->pvScan0 + SourcePoint->y * SourceSurf->lDelta + SourcePoint->x / 8;
SrcEnd = (BYTE*)SourceSurf->pvScan0 + (SourcePoint->y + Height - 1) * SourceSurf->lDelta + (SourcePoint->x + Width) / 8;
/* Beware of bitmaps with negative pitch! */
if (DstStart > DstEnd)
{
BYTE* DstStart = (BYTE*)DestSurf->pvScan0 + DestRect->top * DestSurf->lDelta + DestRect->left / 8;
BYTE* DstEnd = (BYTE*)DestSurf->pvScan0 + (DestRect->bottom - 1) * DestSurf->lDelta + (DestRect->right) / 8;
BYTE* SrcStart = (BYTE*)SourceSurf->pvScan0 + SourcePoint->y * SourceSurf->lDelta + SourcePoint->x / 8;
BYTE* SrcEnd = (BYTE*)SourceSurf->pvScan0 + (SourcePoint->y + Height - 1) * SourceSurf->lDelta + (SourcePoint->x + Width) / 8;
/* Beware of bitmaps with negative pitch! */
if (DstStart > DstEnd)
{
BYTE* tmp = DstStart;
DstStart = DstEnd;
DstEnd = tmp;
}
if (SrcStart > SrcEnd)
{
BYTE* tmp = SrcStart;
SrcStart = SrcEnd;
SrcEnd = tmp;
}
/* We allocate a new buffer when the two buffers overlap */
Overlap = ((SrcStart >= DstStart) && (SrcStart < DstEnd)) || ((SrcEnd >= DstStart) && (SrcEnd < DstEnd));
BYTE* tmp = DstStart;
DstStart = DstEnd;
DstEnd = tmp;
}
if (SrcStart > SrcEnd)
{
BYTE* tmp = SrcStart;
SrcStart = SrcEnd;
SrcEnd = tmp;
}
/* We allocate a new buffer when the two buffers overlap */
Overlap = ((SrcStart >= DstStart) && (SrcStart < DstEnd)) || ((SrcEnd >= DstStart) && (SrcEnd < DstEnd));
if (!Overlap)
{
LONG y;