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
8ae156dc
Commit
8ae156dc
authored
May 12, 2011
by
Huw Davies
Committed by
Alexandre Julliard
May 13, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Initialise the pen pattern to an empty pattern for unpatterned pens.
parent
5a5eddfe
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
objects.c
dlls/gdi32/dibdrv/objects.c
+5
-3
No files found.
dlls/gdi32/dibdrv/objects.c
View file @
8ae156dc
...
...
@@ -819,8 +819,9 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end)
return
TRUE
;
}
static
const
dash_pattern
dash_patterns
[
4
]
=
static
const
dash_pattern
dash_patterns
[
5
]
=
{
{
0
,
{
0
},
0
},
/* PS_SOLID - a pseudo-pattern used to initialise unpatterned pens. */
{
2
,
{
18
,
6
},
24
},
/* PS_DASH */
{
2
,
{
3
,
3
},
6
},
/* PS_DOT */
{
4
,
{
9
,
6
,
3
,
6
},
24
},
/* PS_DASHDOT */
...
...
@@ -865,6 +866,8 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen )
pdev
->
pen_color
=
pdev
->
dib
.
funcs
->
colorref_to_pixel
(
&
pdev
->
dib
,
logpen
.
lopnColor
);
calc_and_xor_masks
(
GetROP2
(
dev
->
hdc
),
pdev
->
pen_color
,
&
pdev
->
pen_and
,
&
pdev
->
pen_xor
);
pdev
->
pen_pattern
=
dash_patterns
[
PS_SOLID
];
pdev
->
defer
|=
DEFER_PEN
;
style
=
logpen
.
lopnStyle
&
PS_STYLE_MASK
;
...
...
@@ -875,7 +878,6 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen )
if
(
logpen
.
lopnStyle
&
PS_GEOMETRIC
)
break
;
if
(
logpen
.
lopnWidth
.
x
>
1
)
break
;
pdev
->
pen_line
=
solid_pen_line
;
pdev
->
pen_pattern
.
count
=
0
;
pdev
->
defer
&=
~
DEFER_PEN
;
break
;
...
...
@@ -886,7 +888,7 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen )
if
(
logpen
.
lopnStyle
&
PS_GEOMETRIC
)
break
;
if
(
logpen
.
lopnWidth
.
x
>
1
)
break
;
pdev
->
pen_line
=
dashed_pen_line
;
pdev
->
pen_pattern
=
dash_patterns
[
style
-
PS_DASH
];
pdev
->
pen_pattern
=
dash_patterns
[
style
];
pdev
->
defer
&=
~
DEFER_PEN
;
break
;
...
...
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