- Fix newest Wine bitmap gdi32 crosstest.

svn path=/trunk/; revision=37375
This commit is contained in:
James Tabor 2008-11-15 15:20:14 +00:00
parent f1d7651421
commit 5a3ad75437

View file

@ -188,9 +188,10 @@ ConvertBitmapInfo(
* description).
*/
if (BitmapInfo->bmiHeader.biSize != sizeof(BITMAPCOREHEADER) &&
if ( !BitmapInfo ||
(BitmapInfo->bmiHeader.biSize != sizeof(BITMAPCOREHEADER) &&
(BitmapInfo->bmiHeader.biSize < sizeof(BITMAPINFOHEADER) ||
BitmapInfo->bmiHeader.biSize > sizeof(BITMAPV5HEADER)))
BitmapInfo->bmiHeader.biSize > sizeof(BITMAPV5HEADER))))
{
return NULL;
}