Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-06 02:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some more wine test for NtGdiGetDIBits

Browse source 
FIxed so we can now create BITMAPCOREHEADER bitmap (Bugs in NtGdiGetDIBits did stop create of it) 



svn path=/trunk/; revision=23892
This commit is contained in:
Magnus Olsen 2006-09-02 23:58:53 +00:00
parent 7aa07b393c
commit 00f50dd922
1 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -401,10 +401,14 @@ NtGdiGetDIBits(HDC hDC,
{ {
BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info;
coreheader->bcWidth =BitmapObj->SurfObj.sizlBitmap.cx; coreheader->bcWidth =BitmapObj->SurfObj.sizlBitmap.cx;
coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy;
coreheader->bcPlanes = 1; coreheader->bcPlanes = 1;
coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat);
Result = BitmapObj->SurfObj.sizlBitmap.cy;
coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy;
if (BitmapObj->SurfObj.lDelta > 0)
coreheader->bcHeight = -coreheader->bcHeight;
Result = BitmapObj->SurfObj.sizlBitmap.cy;
} }
if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER))
@ -457,12 +461,28 @@ NtGdiGetDIBits(HDC hDC,
ScanLines = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); ScanLines = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan);
DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx; DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx;
DestSize.cy = ScanLines; DestSize.cy = ScanLines;
DestBitmap = EngCreateBitmap(
DestSize, DIB_GetDIBWidthBytes(DestSize.cx, DestBitmap = NULL;
Info->bmiHeader.biBitCount), if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER))
BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), {
0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, DestBitmap = EngCreateBitmap( DestSize,
Bits); DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount),
BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression),
0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN,
Bits);
}
if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER))
{
BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info;
DestBitmap = EngCreateBitmap( DestSize,
DIB_GetDIBWidthBytes(DestSize.cx, coreheader->bcBitCount),
BitmapFormat(coreheader->bcBitCount, BI_RGB),
0 < coreheader->bcHeight ? 0 : BMF_TOPDOWN,
Bits);
}
if(DestBitmap == NULL) if(DestBitmap == NULL)
{ {
@ -504,7 +524,7 @@ NtGdiGetDIBits(HDC hDC,
} }
if (Usage == DIB_PAL_COLORS) if (Usage == DIB_PAL_COLORS)
{ {
DbgPrint("GetDIBits with DIB_PAL_COLORS isn't implemented yet."); DPRINT1("GetDIBits with DIB_PAL_COLORS isn't implemented yet.");
} }
} }