ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-03 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fix BITMAP_GetObject()

Browse Source 
- NtGdiExtGetObjectW: return 0 if IntGdiGetObject returns 0

svn path=/trunk/; revision=26485
This commit is contained in:
Timo Kreuzer
2007-04-24 19:01:52 +00:00
parent 8ce4938620
commit adf530ab36
2 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/subsystems/win32/win32k/objects/bitmaps.c
+19 -20
View File
@@ -1566,14 +1566,6 @@ INT STDCALL
BITMAP_GetObject(BITMAPOBJ * bmp, INT Count, LPVOID buffer)
{
if ((UINT)Count < sizeof(BITMAP)) return 0;
if( buffer == NULL )
{
if ((UINT)Count < sizeof(DIBSECTION))
{
return sizeof(BITMAP);
}
return sizeof(DIBSECTION);
}
if(bmp->dib)
{
@@ -1585,23 +1577,30 @@ BITMAP_GetObject(BITMAPOBJ * bmp, INT Count, LPVOID buffer)
{
Count = sizeof(DIBSECTION);
}
memcpy(buffer, bmp->dib, Count);
if (buffer)
{
memcpy(buffer, bmp->dib, Count);
}
return Count;
}
else
{
BITMAP Bitmap;
Count = sizeof(BITMAP);
Bitmap.bmType = 0;
Bitmap.bmWidth = bmp->SurfObj.sizlBitmap.cx;
Bitmap.bmHeight = bmp->SurfObj.sizlBitmap.cy;
Bitmap.bmWidthBytes = abs(bmp->SurfObj.lDelta);
Bitmap.bmPlanes = 1;
Bitmap.bmBitsPixel = BitsPerFormat(bmp->SurfObj.iBitmapFormat);
//Bitmap.bmBits = bmp->SurfObj.pvBits;
Bitmap.bmBits = NULL; /* not set accoring wine test confirm in win2k */
memcpy(buffer, &Bitmap, Count);
if (buffer)
{
BITMAP Bitmap;
Count = sizeof(BITMAP);
Bitmap.bmType = 0;
Bitmap.bmWidth = bmp->SurfObj.sizlBitmap.cx;
Bitmap.bmHeight = bmp->SurfObj.sizlBitmap.cy;
Bitmap.bmWidthBytes = abs(bmp->SurfObj.lDelta);
Bitmap.bmPlanes = 1;
Bitmap.bmBitsPixel = BitsPerFormat(bmp->SurfObj.iBitmapFormat);
//Bitmap.bmBits = bmp->SurfObj.pvBits;
Bitmap.bmBits = NULL; /* not set accoring wine test confirm in win2k */
memcpy(buffer, &Bitmap, Count);
}
return Count;
}
}
reactos/subsystems/win32/win32k/objects/dc.c
+4
View File
@@ -1832,6 +1832,10 @@ NtGdiExtGetObjectW(HANDLE hGdiObj, INT cbCount, LPVOID lpUnsafeBuf)
}
RetCount = IntGdiGetObject(hGdiObj, cbCount, NULL);
if (!RetCount)
{
return 0;
}
if ((UINT)cbCount > RetCount)
{
cbCount = RetCount;