Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-12 23:55:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert my last change

Browse source 
1. it break vmware drv, for it align each bitmap row it create
2. diffent behoirs in diffent vm
this did show we have more serius bug to fix before we can apply correct fix.

svn path=/trunk/; revision=33783
This commit is contained in:
Magnus Olsen 2008-05-31 12:17:25 +00:00
parent 9ae5fa0777
commit de95e30718
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -665,9 +665,7 @@ NtGdiGetDIBitsInternal(HDC hDC,
}
else
{
ScanLines = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan);
DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx;
DestSize.cy = ScanLines;
@ -688,9 +686,9 @@ NtGdiGetDIBitsInternal(HDC hDC,
if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER))
{
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),
0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN,
Bits);
@ -1220,12 +1218,7 @@ DIB_CreateDIBSection(
*/
INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth)
{
/* http://www.osronline.com/DDKx/graphics/gdifncs_9pgn.htm say it must be exacly
* number of byte to next scanline in the bitmap
*/
UINT bytes = ((UINT)(abs(width)) * (UINT)depth) >> 3;
// FIXME : this is wrong return (width * depth + 31) & ~31) >> 3;
return (INT)bytes;
return ((width * depth + 31) & ~31) >> 3;
}
/***********************************************************************