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
15fabcde
Commit
15fabcde
authored
Nov 14, 2011
by
Huw Davies
Committed by
Alexandre Julliard
Nov 14, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Keep track of the text pixel color.
parent
6a629710
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
1 deletion
+18
-1
dc.c
dlls/gdi32/dibdrv/dc.c
+15
-1
dibdrv.h
dlls/gdi32/dibdrv/dibdrv.h
+3
-0
No files found.
dlls/gdi32/dibdrv/dc.c
View file @
15fabcde
...
...
@@ -319,6 +319,7 @@ static void update_fg_colors( dibdrv_physdev *pdev )
{
pdev
->
pen_color
=
get_pixel_color
(
pdev
,
pdev
->
pen_colorref
,
TRUE
);
pdev
->
brush_color
=
get_pixel_color
(
pdev
,
pdev
->
brush_colorref
,
TRUE
);
pdev
->
text_color
=
get_pixel_color
(
pdev
,
GetTextColor
(
pdev
->
dev
.
hdc
),
TRUE
);
}
static
void
update_masks
(
dibdrv_physdev
*
pdev
,
INT
rop
)
...
...
@@ -518,6 +519,19 @@ static INT dibdrv_SetROP2( PHYSDEV dev, INT rop )
return
next
->
funcs
->
pSetROP2
(
next
,
rop
);
}
/***********************************************************************
* dibdrv_SetTextColor
*/
static
COLORREF
dibdrv_SetTextColor
(
PHYSDEV
dev
,
COLORREF
color
)
{
PHYSDEV
next
=
GET_NEXT_PHYSDEV
(
dev
,
pSetTextColor
);
dibdrv_physdev
*
pdev
=
get_dibdrv_pdev
(
dev
);
pdev
->
text_color
=
get_pixel_color
(
pdev
,
color
,
TRUE
);
return
next
->
funcs
->
pSetTextColor
(
next
,
color
);
}
const
struct
gdi_dc_funcs
dib_driver
=
{
NULL
,
/* pAbortDoc */
...
...
@@ -638,7 +652,7 @@ const struct gdi_dc_funcs dib_driver =
NULL
,
/* pSetStretchBltMode */
NULL
,
/* pSetTextAlign */
NULL
,
/* pSetTextCharacterExtra */
NULL
,
/* pSetTextColor */
dibdrv_SetTextColor
,
/* pSetTextColor */
NULL
,
/* pSetTextJustification */
NULL
,
/* pSetViewportExt */
NULL
,
/* pSetViewportOrg */
...
...
dlls/gdi32/dibdrv/dibdrv.h
View file @
15fabcde
...
...
@@ -97,6 +97,9 @@ typedef struct dibdrv_physdev
/* background */
DWORD
bkgnd_color
,
bkgnd_and
,
bkgnd_xor
;
/* text */
DWORD
text_color
;
}
dibdrv_physdev
;
#define DEFER_FORMAT 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