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
f5bffe0e
Commit
f5bffe0e
authored
Jul 13, 2016
by
Huw Davies
Committed by
Alexandre Julliard
Jul 14, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Use the get_mono_dc_colors() helper.
Signed-off-by:
Huw Davies
<
huw@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
1ca4fc09
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
9 deletions
+3
-9
bitblt.c
dlls/gdi32/bitblt.c
+1
-1
dib.c
dlls/gdi32/dib.c
+1
-8
gdi_private.h
dlls/gdi32/gdi_private.h
+1
-0
No files found.
dlls/gdi32/bitblt.c
View file @
f5bffe0e
...
...
@@ -222,7 +222,7 @@ static DWORD blend_bits( const BITMAPINFO *src_info, const struct gdi_image_bits
}
/* helper to retrieve either both colors or only the background color for monochrome blits */
static
void
get_mono_dc_colors
(
HDC
hdc
,
BITMAPINFO
*
info
,
int
count
)
void
get_mono_dc_colors
(
HDC
hdc
,
BITMAPINFO
*
info
,
int
count
)
{
RGBQUAD
*
colors
=
info
->
bmiColors
;
COLORREF
color
=
GetBkColor
(
hdc
);
...
...
dlls/gdi32/dib.c
View file @
f5bffe0e
...
...
@@ -581,14 +581,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he
if
(
dst_info
->
bmiHeader
.
biBitCount
==
1
&&
!
dst_colors
)
{
if
(
src_info
->
bmiHeader
.
biBitCount
>
1
)
{
COLORREF
color
=
GetBkColor
(
dev
->
hdc
);
dst_info
->
bmiColors
[
0
].
rgbRed
=
GetRValue
(
color
);
dst_info
->
bmiColors
[
0
].
rgbGreen
=
GetGValue
(
color
);
dst_info
->
bmiColors
[
0
].
rgbBlue
=
GetBValue
(
color
);
dst_info
->
bmiColors
[
0
].
rgbReserved
=
0
;
dst_info
->
bmiHeader
.
biClrUsed
=
1
;
}
get_mono_dc_colors
(
dev
->
hdc
,
dst_info
,
1
);
else
{
memcpy
(
dst_info
->
bmiColors
,
src_info
->
bmiColors
,
2
*
sizeof
(
dst_info
->
bmiColors
[
0
])
);
...
...
dlls/gdi32/gdi_private.h
View file @
f5bffe0e
...
...
@@ -205,6 +205,7 @@ extern BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_c
extern
DWORD
stretch_bits
(
const
BITMAPINFO
*
src_info
,
struct
bitblt_coords
*
src
,
BITMAPINFO
*
dst_info
,
struct
bitblt_coords
*
dst
,
struct
gdi_image_bits
*
bits
,
int
mode
)
DECLSPEC_HIDDEN
;
extern
void
get_mono_dc_colors
(
HDC
hdc
,
BITMAPINFO
*
info
,
int
count
)
DECLSPEC_HIDDEN
;
/* brush.c */
extern
BOOL
store_brush_pattern
(
LOGBRUSH
*
brush
,
struct
brush_pattern
*
pattern
)
DECLSPEC_HIDDEN
;
...
...
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