GitHub-Mirror/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos synced 2025-10-05 16:02:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

[NTGDI][GDI32] SAI Paint Tool regression fix (#8383)

Browse Source 
CORE-20336
Move some code in win32ss/gdi/ntgdi/dibobj.c into win32ss/gdi/gdi32/objects/bitmap.c.
Condition "YSrc = 0;" on "if (Height + YDest + 1 < ScanLines)" which fixes some gdi32:bitmap regressions.
This commit is contained in:
Doug Lyons
2025-09-27 02:01:57 -05:00
committed by GitHub
parent 435482912c
commit 34fce8a997
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
win32ss/gdi/gdi32/objects/bitmap.c
View File

@@ -982,6 +982,17 @@ SetDIBitsToDevice(
} }
} }
if (YDest >= 0)
{
ScanLines = min(abs(Height), ScanLines);
if (YSrc > 0)
{
ScanLines += YSrc;
if (Height + YDest + 1 < ScanLines)
YSrc = 0;
}
}
/* /*
if ( !pDc_Attr || // DC is Public if ( !pDc_Attr || // DC is Public
ColorUse == DIB_PAL_COLORS || ColorUse == DIB_PAL_COLORS ||

11
win32ss/gdi/ntgdi/dibobj.c
View File

@@ -528,16 +528,7 @@ NtGdiSetDIBitsToDeviceInternal(
bmi->bmiHeader.biBitCount, bmi->bmiHeader.biBitCount,
XSrc, YSrc, XDest, YDest); XSrc, YSrc, XDest, YDest);
if (YDest >= 0) if (YDest < 0)
{
ScanLines = min(abs(Height), ScanLines);
if (YSrc > 0)
{
ScanLines += YSrc;
YSrc = 0;
}
}
else
{ {
ScanLines = min(ScanLines, abs(bmi->bmiHeader.biHeight) - StartScan); ScanLines = min(ScanLines, abs(bmi->bmiHeader.biHeight) - StartScan);
} }