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
cc743f8e
Commit
cc743f8e
authored
Dec 20, 2018
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Fix rendering of monochrome icons.
Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=46308
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
5a622342
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
18 deletions
+11
-18
olepicture.c
dlls/oleaut32/olepicture.c
+11
-18
No files found.
dlls/oleaut32/olepicture.c
View file @
cc743f8e
...
...
@@ -614,7 +614,6 @@ static void render_masked_bitmap(OLEPictureImpl *This, HDC hdc,
LONG
x
,
LONG
y
,
LONG
cx
,
LONG
cy
,
OLE_XPOS_HIMETRIC
xSrc
,
OLE_YPOS_HIMETRIC
ySrc
,
OLE_XSIZE_HIMETRIC
cxSrc
,
OLE_YSIZE_HIMETRIC
cySrc
,
HBITMAP
hbmMask
,
HBITMAP
hbmXor
)
{
HBITMAP
hbmpOld
;
HDC
hdcBmp
;
/* Set a mapping mode that maps bitmap pixels into HIMETRIC units.
...
...
@@ -630,32 +629,26 @@ static void render_masked_bitmap(OLEPictureImpl *This, HDC hdc,
if
(
hbmMask
)
{
HDC
hdcMask
=
CreateCompatibleDC
(
0
);
HBITMAP
hOldbm
=
SelectObject
(
hdcMask
,
hbmMask
);
hbmpOld
=
SelectObject
(
hdcBmp
,
hbmXor
);
SetMapMode
(
hdcMask
,
MM_ANISOTROPIC
);
SetWindowOrgEx
(
hdcMask
,
0
,
0
,
NULL
);
SetWindowExtEx
(
hdcMask
,
This
->
himetricWidth
,
This
->
himetricHeight
,
NULL
);
SetViewportOrgEx
(
hdcMask
,
0
,
This
->
origHeight
,
NULL
);
SetViewportExtEx
(
hdcMask
,
This
->
origWidth
,
-
This
->
origHeight
,
NULL
);
SetBkColor
(
hdc
,
RGB
(
255
,
255
,
255
));
SetTextColor
(
hdc
,
RGB
(
0
,
0
,
0
));
StretchBlt
(
hdc
,
x
,
y
,
cx
,
cy
,
hdcMask
,
xSrc
,
ySrc
,
cxSrc
,
cySrc
,
SRCAND
);
StretchBlt
(
hdc
,
x
,
y
,
cx
,
cy
,
hdcBmp
,
xSrc
,
ySrc
,
cxSrc
,
cySrc
,
SRCPAINT
);
SelectObject
(
hdcMask
,
hOldbm
);
DeleteDC
(
hdcMask
);
SelectObject
(
hdcBmp
,
hbmMask
);
StretchBlt
(
hdc
,
x
,
y
,
cx
,
cy
,
hdcBmp
,
xSrc
,
ySrc
,
cxSrc
,
cySrc
,
SRCAND
);
if
(
hbmXor
)
{
SelectObject
(
hdcBmp
,
hbmXor
);
StretchBlt
(
hdc
,
x
,
y
,
cx
,
cy
,
hdcBmp
,
xSrc
,
ySrc
,
cxSrc
,
cySrc
,
SRCPAINT
);
}
else
StretchBlt
(
hdc
,
x
,
y
,
cx
,
cy
,
hdcBmp
,
xSrc
,
ySrc
-
This
->
himetricHeight
,
cxSrc
,
cySrc
,
SRCPAINT
);
}
else
{
hbmpOld
=
SelectObject
(
hdcBmp
,
hbmXor
);
SelectObject
(
hdcBmp
,
hbmXor
);
StretchBlt
(
hdc
,
x
,
y
,
cx
,
cy
,
hdcBmp
,
xSrc
,
ySrc
,
cxSrc
,
cySrc
,
SRCCOPY
);
}
SelectObject
(
hdcBmp
,
hbmpOld
);
DeleteDC
(
hdcBmp
);
}
...
...
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