Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-29 22:58:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert base changes. The original test case was wrong

Browse source 
svn path=/trunk/; revision=26421
This commit is contained in:
Ged Murphy 2007-04-19 09:33:53 +00:00
parent 8d7099f9ac
commit 38945890be
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1564,18 +1564,24 @@ BITMAP_GetObject(BITMAPOBJ * bmp, INT Count, LPVOID buffer)
if( buffer == NULL ) return sizeof(BITMAP);
if (Count < sizeof(BITMAP)) return 0;
Count = sizeof(BITMAP);
if(bmp->dib)
{
if(Count < (INT) sizeof(DIBSECTION))
{
if (Count > (INT) sizeof(BITMAP)) Count = sizeof(BITMAP);
}
else
{
if (Count > (INT) sizeof(DIBSECTION)) Count = sizeof(DIBSECTION);
}
memcpy(buffer, bmp->dib, Count);
/* Windows returns bytes copied, not DIBSECTION size */
return Count;
}
else
{
BITMAP Bitmap;
if (Count > (INT) sizeof(BITMAP)) Count = sizeof(BITMAP);
Bitmap.bmType = 0;
Bitmap.bmWidth = bmp->SurfObj.sizlBitmap.cx;
Bitmap.bmHeight = bmp->SurfObj.sizlBitmap.cy;