[PATCH 2/2] user32/cursoricon: ignore reserved bytes in BMP fileheader
Wolfram Sang
wolfram at the-dreams.de
Sun Apr 25 18:13:37 CDT 2010
Tesbot results say this is the right thing to do:
https://testbot.winehq.org/JobDetails.pl?Key=1727
Signed-off-by: Wolfram Sang <wolfram at the-dreams.de>
---
dlls/user32/cursoricon.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c
index 7035c1b..0d74276 100644
--- a/dlls/user32/cursoricon.c
+++ b/dlls/user32/cursoricon.c
@@ -2486,9 +2486,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name,
if (!(ptr = map_fileW( name, NULL ))) return 0;
info = (BITMAPINFO *)(ptr + sizeof(BITMAPFILEHEADER));
bmfh = (BITMAPFILEHEADER *)ptr;
- if (!( bmfh->bfType == 0x4d42 /* 'BM' */ &&
- bmfh->bfReserved1 == 0 &&
- bmfh->bfReserved2 == 0))
+ if (bmfh->bfType != 0x4d42 /* 'BM' */)
{
WARN("Invalid/unsupported bitmap format!\n");
UnmapViewOfFile( ptr );
--
1.7.0
More information about the wine-patches
mailing list