Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
3a263a87
Commit
3a263a87
authored
Apr 21, 2010
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Fix handling of bitmap header size for V4/V5 bitmaps.
parent
50500d1a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
26 deletions
+7
-26
cursoricon.c
dlls/user32/cursoricon.c
+7
-26
No files found.
dlls/user32/cursoricon.c
View file @
3a263a87
...
...
@@ -320,7 +320,7 @@ static int bitmap_info_size( const BITMAPINFO * info, WORD coloruse )
if
(
!
colors
&&
(
info
->
bmiHeader
.
biBitCount
<=
8
))
colors
=
1
<<
info
->
bmiHeader
.
biBitCount
;
if
(
info
->
bmiHeader
.
biCompression
==
BI_BITFIELDS
)
masks
=
3
;
return
sizeof
(
BITMAPINFOHEADER
)
+
masks
*
sizeof
(
DWORD
)
+
colors
*
return
info
->
bmiHeader
.
biSize
+
masks
*
sizeof
(
DWORD
)
+
colors
*
((
coloruse
==
DIB_RGB_COLORS
)
?
sizeof
(
RGBQUAD
)
:
sizeof
(
WORD
));
}
}
...
...
@@ -380,19 +380,10 @@ static BOOL is_dib_monochrome( const BITMAPINFO* info )
*
* Get the info from a bitmap header.
* Return 1 for INFOHEADER, 0 for COREHEADER,
* 4 for V4HEADER, 5 for V5HEADER, -1 for error.
*/
static
int
DIB_GetBitmapInfo
(
const
BITMAPINFOHEADER
*
header
,
LONG
*
width
,
LONG
*
height
,
WORD
*
bpp
,
DWORD
*
compr
)
{
if
(
header
->
biSize
==
sizeof
(
BITMAPINFOHEADER
))
{
*
width
=
header
->
biWidth
;
*
height
=
header
->
biHeight
;
*
bpp
=
header
->
biBitCount
;
*
compr
=
header
->
biCompression
;
return
1
;
}
if
(
header
->
biSize
==
sizeof
(
BITMAPCOREHEADER
))
{
const
BITMAPCOREHEADER
*
core
=
(
const
BITMAPCOREHEADER
*
)
header
;
...
...
@@ -402,23 +393,13 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width,
*
compr
=
0
;
return
0
;
}
if
(
header
->
biSize
==
sizeof
(
BITMAPV4
HEADER
))
else
if
(
header
->
biSize
>=
sizeof
(
BITMAPINFO
HEADER
))
{
const
BITMAPV4HEADER
*
v4hdr
=
(
const
BITMAPV4HEADER
*
)
header
;
*
width
=
v4hdr
->
bV4Width
;
*
height
=
v4hdr
->
bV4Height
;
*
bpp
=
v4hdr
->
bV4BitCount
;
*
compr
=
v4hdr
->
bV4V4Compression
;
return
4
;
}
if
(
header
->
biSize
==
sizeof
(
BITMAPV5HEADER
))
{
const
BITMAPV5HEADER
*
v5hdr
=
(
const
BITMAPV5HEADER
*
)
header
;
*
width
=
v5hdr
->
bV5Width
;
*
height
=
v5hdr
->
bV5Height
;
*
bpp
=
v5hdr
->
bV5BitCount
;
*
compr
=
v5hdr
->
bV5Compression
;
return
5
;
*
width
=
header
->
biWidth
;
*
height
=
header
->
biHeight
;
*
bpp
=
header
->
biBitCount
;
*
compr
=
header
->
biCompression
;
return
1
;
}
ERR
(
"(%d): unknown/wrong size for header
\n
"
,
header
->
biSize
);
return
-
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment