Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
ba73cac9
Commit
ba73cac9
authored
Nov 05, 2006
by
Mike McCormack
Committed by
Alexandre Julliard
Nov 06, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comctl32: Fix an Nx1 in ImageList_DrawIndirect().
parent
4e5f56a8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
imagelist.c
dlls/comctl32/imagelist.c
+8
-6
No files found.
dlls/comctl32/imagelist.c
View file @
ba73cac9
...
...
@@ -1209,7 +1209,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
BitBlt
(
hBlendMaskDC
,
0
,
0
,
cx
,
cy
,
hMaskListDC
,
pt
.
x
,
pt
.
y
,
0x220326
);
/* NOTSRCAND */
BitBlt
(
hBlendMaskDC
,
0
,
0
,
cx
,
cy
,
hBlendMaskDC
,
0
,
0
,
NOTSRCCOPY
);
}
/* now apply blend to the current image given the BlendMask */
if
(
clrBlend
==
CLR_DEFAULT
)
clrBlend
=
GetSysColor
(
COLOR_HIGHLIGHT
);
else
if
(
clrBlend
==
CLR_NONE
)
clrBlend
=
GetTextColor
(
pimldp
->
hdcDst
);
...
...
@@ -1224,10 +1224,12 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
if
(
(
nOvlIdx
>=
1
)
&&
(
nOvlIdx
<=
MAX_OVERLAYIMAGE
))
{
nOvlIdx
=
himl
->
nOvlIdx
[
nOvlIdx
-
1
];
if
((
nOvlIdx
>=
0
)
&&
(
nOvlIdx
<
himl
->
cCurImage
))
{
const
INT
ox
=
himl
->
cx
*
nOvlIdx
+
pimldp
->
xBitmap
;
POINT
ptOvl
;
imagelist_point_from_index
(
himl
,
nOvlIdx
,
&
ptOvl
);
ptOvl
.
x
+=
pimldp
->
xBitmap
;
if
(
himl
->
hbmMask
&&
!
(
fStyle
&
ILD_IMAGE
))
BitBlt
(
hImageDC
,
0
,
0
,
cx
,
cy
,
hMaskListDC
,
ox
,
pt
.
x
,
SRCAND
);
BitBlt
(
hImageDC
,
0
,
0
,
cx
,
cy
,
hImageListDC
,
ox
,
pt
.
y
,
SRCPAINT
);
BitBlt
(
hImageDC
,
0
,
0
,
cx
,
cy
,
hMaskListDC
,
ptOvl
.
x
,
ptOvl
.
y
,
SRCAND
);
BitBlt
(
hImageDC
,
0
,
0
,
cx
,
cy
,
hImageListDC
,
ptOvl
.
x
,
ptOvl
.
y
,
SRCPAINT
);
}
}
...
...
@@ -1239,7 +1241,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
if
(
fStyle
&
ILD_PRESERVEALPHA
)
FIXME
(
"ILD_PRESERVEALPHA: unimplemented!
\n
"
);
if
(
fStyle
&
ILD_SCALE
)
FIXME
(
"ILD_SCALE: unimplemented!
\n
"
);
if
(
fStyle
&
ILD_DPISCALE
)
FIXME
(
"ILD_DPISCALE: unimplemented!
\n
"
);
/* now copy the image to the screen */
dwRop
=
SRCCOPY
;
if
(
himl
->
hbmMask
&&
bIsTransparent
)
{
...
...
@@ -1254,7 +1256,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
BitBlt
(
pimldp
->
hdcDst
,
pimldp
->
x
,
pimldp
->
y
,
cx
,
cy
,
hImageDC
,
0
,
0
,
dwRop
);
bResult
=
TRUE
;
end:
end:
/* cleanup the mess */
SetBkColor
(
hImageDC
,
oldImageBk
);
SetTextColor
(
hImageDC
,
oldImageFg
);
...
...
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