Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 01:25:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[GDI32]

Browse source 
- Protect SetDIBitsToDevice with seh and track it. This is for vbrun60spXX. Code fix ups and cleanup.

svn path=/trunk/; revision=51009
This commit is contained in:
James Tabor 2011-03-10 13:45:09 +00:00
parent 729ce068d8
commit ebe3986eb9
3 changed files with 53 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/win32/gdi32/include/gdi32p.h
View file

@ -279,7 +279,6 @@ WINAPI
GdiSetLastError( DWORD dwErrCode ); GdiSetLastError( DWORD dwErrCode );
DWORD WINAPI GdiGetCodePage(HDC); DWORD WINAPI GdiGetCodePage(HDC);
UINT FASTCALL DIB_BitmapBitsSize( CONST BITMAPINFO* );
int int
WINAPI WINAPI

116
reactos/dll/win32/gdi32/objects/bitmap.c
View file

@ -3,6 +3,9 @@
#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
// From Yuan, ScanLineSize = (Width * bitcount + 31)/32
#define WIDTH_BYTES_ALIGN32(cx, bpp) ((((cx) * (bpp) + 31) & ~31) >> 3)
/* /*
* DIB_BitmapInfoSize * DIB_BitmapInfoSize
* *
@ -41,30 +44,6 @@ INT FASTCALL DIB_BitmapInfoSize(const BITMAPINFO * info, WORD coloruse)
UINT UINT
FASTCALL FASTCALL
DIB_BitmapMaxBitsSize( PBITMAPINFO Info, UINT ScanLines ) DIB_BitmapMaxBitsSize( PBITMAPINFO Info, UINT ScanLines )
{
UINT MaxBits = 0;
if (!Info) return 0;
if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER))
{
PBITMAPCOREHEADER Core = (PBITMAPCOREHEADER)Info;
MaxBits = Core->bcBitCount * Core->bcPlanes * Core->bcWidth;
}
else /* assume BITMAPINFOHEADER */
{
if ((Info->bmiHeader.biCompression) && (Info->bmiHeader.biCompression != BI_BITFIELDS))
return Info->bmiHeader.biSizeImage;
// Planes are over looked by Yuan. I guess assumed always 1.
MaxBits = Info->bmiHeader.biBitCount * Info->bmiHeader.biPlanes * Info->bmiHeader.biWidth;
}
MaxBits = ((MaxBits + 31) & ~31 ) / 8; // From Yuan, ScanLineSize = (Width * bitcount + 31)/32
return (MaxBits * ScanLines); // ret the full Size.
}
UINT
FASTCALL
DIB_BitmapBitsSize( CONST BITMAPINFO* Info )
{ {
UINT Ret; UINT Ret;
@ -73,22 +52,22 @@ DIB_BitmapBitsSize( CONST BITMAPINFO* Info )
if ( Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) if ( Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER))
{ {
PBITMAPCOREHEADER Core = (PBITMAPCOREHEADER)Info; PBITMAPCOREHEADER Core = (PBITMAPCOREHEADER)Info;
Ret = Core->bcHeight * Ret = WIDTH_BYTES_ALIGN32(Core->bcWidth * Core->bcPlanes, Core->bcBitCount) * ScanLines;
((Core->bcWidth * Core->bcPlanes * Core->bcBitCount + 31) & ~31 ) / 8;
} }
else /* assume BITMAPINFOHEADER */ else /* assume BITMAPINFOHEADER */
{ {
if ((Info->bmiHeader.biCompression) && if (!(Info->bmiHeader.biCompression) || (Info->bmiHeader.biCompression == BI_BITFIELDS))
(Info->bmiHeader.biCompression != BI_BITFIELDS)) {
return Info->bmiHeader.biSizeImage; Ret = WIDTH_BYTES_ALIGN32(Info->bmiHeader.biWidth * Info->bmiHeader.biPlanes, Info->bmiHeader.biBitCount) * ScanLines;
// Make Height positive always.... }
Ret = abs(Info->bmiHeader.biHeight) * else
((Info->bmiHeader.biWidth * Info->bmiHeader.biPlanes * Info->bmiHeader.biBitCount + 31) & ~31 ) / 8; {
Ret = Info->bmiHeader.biSizeImage;
}
} }
return Ret; return Ret;
} }
/* /*
* DIB_GetBitmapInfo is complete copy of wine cvs 2/9-2006 * DIB_GetBitmapInfo is complete copy of wine cvs 2/9-2006
* from file dib.c from gdi32.dll or orginal version * from file dib.c from gdi32.dll or orginal version
@ -161,39 +140,27 @@ int
WINAPI WINAPI
GdiGetBitmapBitsSize(BITMAPINFO *lpbmi) GdiGetBitmapBitsSize(BITMAPINFO *lpbmi)
{ {
int retSize; UINT Ret;
if (lpbmi->bmiHeader.biSize == FIELD_OFFSET(BITMAPINFOHEADER, biPlanes)) if (!lpbmi) return 0;
if ( lpbmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER))
{ {
/* Calc the bits Size and align it*/ PBITMAPCOREHEADER Core = (PBITMAPCOREHEADER)lpbmi;
retSize = HIWORD(lpbmi->bmiHeader.biWidth) * ((LOWORD(lpbmi->bmiHeader.biWidth) * Ret = WIDTH_BYTES_ALIGN32(Core->bcWidth * Core->bcPlanes, Core->bcBitCount) * Core->bcHeight;
LOWORD(lpbmi->bmiHeader.biHeight) * HIWORD(lpbmi->bmiHeader.biHeight) + 31)
& -32) / 8;
} }
else else /* assume BITMAPINFOHEADER */
{ {
if ( (lpbmi->bmiHeader.biCompression == BI_BITFIELDS) || if (!(lpbmi->bmiHeader.biCompression) || (lpbmi->bmiHeader.biCompression == BI_BITFIELDS))
(lpbmi->bmiHeader.biCompression == BI_RGB))
{ {
if (lpbmi->bmiHeader.biHeight >=0 ) Ret = WIDTH_BYTES_ALIGN32(lpbmi->bmiHeader.biWidth * lpbmi->bmiHeader.biPlanes, lpbmi->bmiHeader.biBitCount) * abs(lpbmi->bmiHeader.biHeight);
{
/* Calc the bits Size and align it*/
retSize = lpbmi->bmiHeader.biHeight * ((lpbmi->bmiHeader.biWidth *
lpbmi->bmiHeader.biPlanes * lpbmi->bmiHeader.biBitCount + 31) & -32) / 8;
}
else
{
/* Make height postiive if it negitve then calc the bits Size and align it*/
retSize = (-lpbmi->bmiHeader.biHeight) * ((lpbmi->bmiHeader.biWidth *
lpbmi->bmiHeader.biPlanes * lpbmi->bmiHeader.biBitCount + 31) & -32) / 8;
}
} }
else else
{ {
retSize = lpbmi->bmiHeader.biSizeImage; Ret = lpbmi->bmiHeader.biSizeImage;
} }
} }
return retSize; return Ret;
} }
/* /*
@ -316,7 +283,7 @@ StretchBlt(
} }
/* /*
* @unimplemented * @implemented
*/ */
HBITMAP WINAPI HBITMAP WINAPI
CreateBitmap(INT Width, CreateBitmap(INT Width,
@ -325,7 +292,6 @@ CreateBitmap(INT Width,
UINT BitsPixel, UINT BitsPixel,
CONST VOID* pUnsafeBits) CONST VOID* pUnsafeBits)
{ {
/* FIXME some part should be done in user mode */
if (Width && Height) if (Width && Height)
{ {
return NtGdiCreateBitmap(Width, Height, Planes, BitsPixel, (LPBYTE) pUnsafeBits); return NtGdiCreateBitmap(Width, Height, Planes, BitsPixel, (LPBYTE) pUnsafeBits);
@ -493,7 +459,7 @@ CreateDIBitmap( HDC hDC,
{ {
_SEH2_TRY _SEH2_TRY
{ {
cjBmpScanSize = DIB_BitmapBitsSize(Data); cjBmpScanSize = GdiGetBitmapBitsSize((BITMAPINFO *)Data);
CalculateColorTableSize(&Data->bmiHeader, &ColorUse, &InfoSize); CalculateColorTableSize(&Data->bmiHeader, &ColorUse, &InfoSize);
InfoSize += Data->bmiHeader.biSize; InfoSize += Data->bmiHeader.biSize;
} }
@ -566,9 +532,9 @@ SetDIBits(HDC hDC,
} }
} }
hDCc = NtGdiGetDCforBitmap(hBitmap); hDCc = NtGdiGetDCforBitmap(hBitmap); // hDC can be NULL, so, get it from the bitmap.
SavehDC = hDCc; SavehDC = hDCc;
if ( !hDCc ) if ( !hDCc ) // No DC associated with bitmap, Clone or Create one.
{ {
nhDC = CreateCompatibleDC(hDC); nhDC = CreateCompatibleDC(hDC);
if ( !nhDC ) return 0; if ( !nhDC ) return 0;
@ -648,6 +614,7 @@ SetDIBitsToDevice(
UINT ConvertedInfoSize; UINT ConvertedInfoSize;
INT LinesCopied = 0; INT LinesCopied = 0;
UINT cjBmpScanSize = 0; UINT cjBmpScanSize = 0;
BOOL Hit = FALSE;
PVOID pvSafeBits = (PVOID)Bits; PVOID pvSafeBits = (PVOID)Bits;
if ( !ScanLines || !lpbmi || !Bits ) if ( !ScanLines || !lpbmi || !Bits )
@ -711,7 +678,26 @@ SetDIBitsToDevice(
{ {
pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize);
if (pvSafeBits) if (pvSafeBits)
RtlCopyMemory( pvSafeBits, Bits, cjBmpScanSize); {
_SEH2_TRY
{
RtlCopyMemory( pvSafeBits, Bits, cjBmpScanSize);
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
Hit = TRUE;
}
_SEH2_END
if (Hit)
{
// We don't die, we continue on with a allocated safe pointer to kernel
// space.....
DPRINT1("SetDIBitsToDevice fail to read BitMapInfo: %x or Bits: %x & Size: %d\n",pConvertedInfo,Bits,cjBmpScanSize);
}
DPRINT("SetDIBitsToDevice Allocate Bits %d!!!\n", cjBmpScanSize);
}
} }
if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr))
@ -720,7 +706,8 @@ SetDIBitsToDevice(
return 0; return 0;
} }
/* /*
if ( !pDc_Attr || if ( !pDc_Attr || // DC is Public
ColorUse == DIB_PAL_COLORS ||
((pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) && ((pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) &&
(pConvertedInfo->bmiHeader.biCompression == BI_JPEG || (pConvertedInfo->bmiHeader.biCompression == BI_JPEG ||
pConvertedInfo->bmiHeader.biCompression == BI_PNG )) )*/ pConvertedInfo->bmiHeader.biCompression == BI_PNG )) )*/
@ -833,7 +820,7 @@ StretchDIBits(HDC hdc,
return 0; return 0;
} }
cjBmpScanSize = DIB_BitmapBitsSize((LPBITMAPINFO)pConvertedInfo); cjBmpScanSize = GdiGetBitmapBitsSize((BITMAPINFO *)pConvertedInfo);
if ( lpBits ) if ( lpBits )
{ {
@ -867,6 +854,7 @@ StretchDIBits(HDC hdc,
} }
/* /*
if ( !pDc_Attr || if ( !pDc_Attr ||
iUsage == DIB_PAL_COLORS ||
((pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) && ((pConvertedInfo->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) &&
(pConvertedInfo->bmiHeader.biCompression == BI_JPEG || (pConvertedInfo->bmiHeader.biCompression == BI_JPEG ||
pConvertedInfo->bmiHeader.biCompression == BI_PNG )) )*/ pConvertedInfo->bmiHeader.biCompression == BI_PNG )) )*/

2
reactos/dll/win32/gdi32/objects/utils.c
View file

@ -214,7 +214,7 @@ ConvertBitmapInfo(
if (FollowedByData) if (FollowedByData)
{ {
DataSize = DIB_BitmapBitsSize((PBITMAPINFO)BitmapInfo ); DataSize = GdiGetBitmapBitsSize((PBITMAPINFO)BitmapInfo );
} }
/* /*