projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f1d7651
)
- Fix newest Wine bitmap gdi32 crosstest.
author
James Tabor
<james.tabor@reactos.org>
Sat, 15 Nov 2008 15:20:14 +0000
(15:20 +0000)
committer
James Tabor
<james.tabor@reactos.org>
Sat, 15 Nov 2008 15:20:14 +0000
(15:20 +0000)
svn path=/trunk/; revision=37375
reactos/dll/win32/gdi32/objects/utils.c
patch
|
blob
|
history
diff --git
a/reactos/dll/win32/gdi32/objects/utils.c
b/reactos/dll/win32/gdi32/objects/utils.c
index
885cd9d
..
ee0ab1b
100644
(file)
--- a/
reactos/dll/win32/gdi32/objects/utils.c
+++ b/
reactos/dll/win32/gdi32/objects/utils.c
@@
-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;
}