Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-14 07:44:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Use hack to prevent Explorer crash.

Browse source 
svn path=/trunk/; revision=26554
This commit is contained in:
Dmitry Gorbachev 2007-04-28 04:10:33 +00:00
parent 4b61211e6d
commit d36cd41e29
1 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -396,23 +396,23 @@ NtGdiGetDIBits(HDC hDC,
} }
if (Bits == NULL) if (Bits == NULL)
{ {
if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER))
{ {
BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info;
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; coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy;
if (BitmapObj->SurfObj.lDelta > 0) if (BitmapObj->SurfObj.lDelta > 0)
coreheader->bcHeight = -coreheader->bcHeight; coreheader->bcHeight = -coreheader->bcHeight;
Result = BitmapObj->SurfObj.sizlBitmap.cy;
}
if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) Result = BitmapObj->SurfObj.sizlBitmap.cy;
{ }
if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER))
{
Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx; Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx;
Info->bmiHeader.biHeight = BitmapObj->SurfObj.sizlBitmap.cy; Info->bmiHeader.biHeight = BitmapObj->SurfObj.sizlBitmap.cy;
/* Report negtive height for top-down bitmaps. */ /* Report negtive height for top-down bitmaps. */
@ -453,7 +453,7 @@ NtGdiGetDIBits(HDC hDC,
else else
{ {
if (StartScan > BitmapObj->SurfObj.sizlBitmap.cy) if (StartScan > BitmapObj->SurfObj.sizlBitmap.cy)
{ {
Result = 0; Result = 0;
} }
else else
@ -462,34 +462,34 @@ NtGdiGetDIBits(HDC hDC,
DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx; DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx;
DestSize.cy = ScanLines; DestSize.cy = ScanLines;
DestBitmap = NULL; DestBitmap = NULL;
if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER))
{ {
DestBitmap = EngCreateBitmap( DestSize, DestBitmap = EngCreateBitmap(DestSize,
DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), /* DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), */
BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), DestSize.cx * (Info->bmiHeader.biBitCount >> 3), /* HACK */
0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression),
Bits); 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN,
} Bits);
}
if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER))
{ {
BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info;
DestBitmap = EngCreateBitmap( DestSize, DestBitmap = EngCreateBitmap(DestSize,
DIB_GetDIBWidthBytes(DestSize.cx, coreheader->bcBitCount), DIB_GetDIBWidthBytes(DestSize.cx, coreheader->bcBitCount),
BitmapFormat(coreheader->bcBitCount, BI_RGB), BitmapFormat(coreheader->bcBitCount, BI_RGB),
0 < coreheader->bcHeight ? 0 : BMF_TOPDOWN, 0 < coreheader->bcHeight ? 0 : BMF_TOPDOWN,
Bits); Bits);
} }
if(DestBitmap == NULL) if(DestBitmap == NULL)
{ {
BITMAPOBJ_UnlockBitmap(BitmapObj); BITMAPOBJ_UnlockBitmap(BitmapObj);
return 0; return 0;
} }
DestSurfObj = EngLockSurface((HSURF)DestBitmap); DestSurfObj = EngLockSurface((HSURF)DestBitmap);
SourcePalette = PALETTE_LockPalette(hSourcePalette); SourcePalette = PALETTE_LockPalette(hSourcePalette);