Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:56:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

GetDIBits: destination height may be smaller than the source height, so the image size should always be calculated. Removed the hack in the bit copy phase that addressed the wrong bits buffer size.

Browse source 
This allows CopyImage to work, this can be seen in taskbar icons 1-4 for example.
Fixes two gdi32 winetests. Bugs #2225 and #3082 for more info.
Tested: QEMU VGA/8/16/24bpp, VMWare Server VMWare Driver 8/16/32bpp, VMWare Server ReactOS VBE Driver 8/16/32bpp

svn path=/trunk/; revision=36608
This commit is contained in:
Gregor Schneider 2008-10-01 10:49:10 +00:00
parent 163d36ceea
commit dc3e3e8ef0
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
reactos/subsystems/win32/win32k/objects/dibobj.c
View file

@ -552,7 +552,8 @@ NtGdiGetDIBitsInternal(HDC hDC,
coreheader->bcWidth = BitmapObj->SurfObj.sizlBitmap.cx; coreheader->bcWidth = BitmapObj->SurfObj.sizlBitmap.cx;
coreheader->bcPlanes = 1; coreheader->bcPlanes = 1;
coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat);
coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy; /* Resulting height may be smaller than original height */
coreheader->bcHeight = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan);
if (BitmapObj->SurfObj.lDelta > 0) if (BitmapObj->SurfObj.lDelta > 0)
coreheader->bcHeight = -coreheader->bcHeight; coreheader->bcHeight = -coreheader->bcHeight;
@ -563,7 +564,8 @@ NtGdiGetDIBitsInternal(HDC hDC,
ProbeForWrite(Info, sizeof(BITMAPINFO), 1); ProbeForWrite(Info, sizeof(BITMAPINFO), 1);
Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx; Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx;
Info->bmiHeader.biHeight = BitmapObj->SurfObj.sizlBitmap.cy; /* Resulting height may be smaller than original height */
Info->bmiHeader.biHeight = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan);
/* Report negtive height for top-down bitmaps. */ /* Report negtive height for top-down bitmaps. */
if (BitmapObj->SurfObj.lDelta > 0) if (BitmapObj->SurfObj.lDelta > 0)
Info->bmiHeader.biHeight = -Info->bmiHeader.biHeight; Info->bmiHeader.biHeight = -Info->bmiHeader.biHeight;
@ -594,8 +596,9 @@ NtGdiGetDIBitsInternal(HDC hDC,
Info->bmiHeader.biCompression = BI_PNG; Info->bmiHeader.biCompression = BI_PNG;
break; break;
} }
/* Image size has to be calculated */
Info->bmiHeader.biSizeImage = BitmapObj->SurfObj.cjBits; Info->bmiHeader.biSizeImage = DIB_GetDIBWidthBytes(Info->bmiHeader.biWidth,
Info->bmiHeader.biBitCount) * Info->bmiHeader.biHeight;
Info->bmiHeader.biXPelsPerMeter = 0; /* FIXME */ Info->bmiHeader.biXPelsPerMeter = 0; /* FIXME */
Info->bmiHeader.biYPelsPerMeter = 0; /* FIXME */ Info->bmiHeader.biYPelsPerMeter = 0; /* FIXME */
Info->bmiHeader.biClrUsed = 0; Info->bmiHeader.biClrUsed = 0;
@ -707,8 +710,7 @@ NtGdiGetDIBitsInternal(HDC hDC,
if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER))
{ {
hDestBitmap = EngCreateBitmap(DestSize, hDestBitmap = EngCreateBitmap(DestSize,
/* DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), */ DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount),
DestSize.cx * (Info->bmiHeader.biBitCount >> 3), /* HACK */
BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression),
0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN,
Bits); Bits);