Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-fonts
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
Aleksandr Isakov
wine-fonts
Commits
e767a607
Commit
e767a607
authored
Jul 29, 2016
by
Huw Davies
Committed by
Alexandre Julliard
Jul 29, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Access a few more properties directly from the DC in the path driver.
Signed-off-by:
Huw Davies
<
huw@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
377010dc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
9 deletions
+15
-9
path.c
dlls/gdi32/path.c
+15
-9
No files found.
dlls/gdi32/path.c
View file @
e767a607
...
...
@@ -702,7 +702,7 @@ HRGN WINAPI PathToRegion(HDC hdc)
dc
->
path
=
NULL
;
if
(
path
)
{
ret
=
path_to_region
(
path
,
GetPolyFillMode
(
hdc
)
);
ret
=
path_to_region
(
path
,
dc
->
polyFillMode
);
free_gdi_path
(
path
);
}
}
...
...
@@ -873,10 +873,12 @@ BOOL PATH_RestorePath( DC *dst, DC *src )
static
BOOL
pathdrv_MoveTo
(
PHYSDEV
dev
,
INT
x
,
INT
y
)
{
struct
path_physdev
*
physdev
=
get_path_physdev
(
dev
);
DC
*
dc
=
get_physdev_dc
(
dev
);
physdev
->
path
->
newStroke
=
TRUE
;
physdev
->
path
->
pos
.
x
=
x
;
physdev
->
path
->
pos
.
y
=
y
;
LPtoDP
(
physdev
->
dev
.
h
dc
,
&
physdev
->
path
->
pos
,
1
);
lp_to_dp
(
dc
,
&
physdev
->
path
->
pos
,
1
);
return
TRUE
;
}
...
...
@@ -1137,7 +1139,7 @@ static BOOL PATH_Arc( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2,
}
/* In GM_COMPATIBLE, don't include bottom and right edges */
if
(
GetGraphicsMode
(
dev
->
hdc
)
==
GM_COMPATIBLE
)
if
(
dc
->
GraphicsMode
==
GM_COMPATIBLE
)
{
corners
[
1
].
x
--
;
corners
[
1
].
y
--
;
...
...
@@ -1225,8 +1227,9 @@ static BOOL pathdrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT eSt
static
BOOL
pathdrv_Arc
(
PHYSDEV
dev
,
INT
left
,
INT
top
,
INT
right
,
INT
bottom
,
INT
xstart
,
INT
ystart
,
INT
xend
,
INT
yend
)
{
DC
*
dc
=
get_physdev_dc
(
dev
);
return
PATH_Arc
(
dev
,
left
,
top
,
right
,
bottom
,
xstart
,
ystart
,
xend
,
yend
,
GetArcDirection
(
dev
->
hdc
)
,
0
);
dc
->
ArcDirection
,
0
);
}
...
...
@@ -1236,8 +1239,9 @@ static BOOL pathdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
static
BOOL
pathdrv_ArcTo
(
PHYSDEV
dev
,
INT
left
,
INT
top
,
INT
right
,
INT
bottom
,
INT
xstart
,
INT
ystart
,
INT
xend
,
INT
yend
)
{
DC
*
dc
=
get_physdev_dc
(
dev
);
return
PATH_Arc
(
dev
,
left
,
top
,
right
,
bottom
,
xstart
,
ystart
,
xend
,
yend
,
GetArcDirection
(
dev
->
hdc
)
,
-
1
);
dc
->
ArcDirection
,
-
1
);
}
...
...
@@ -1247,8 +1251,9 @@ static BOOL pathdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom
static
BOOL
pathdrv_Chord
(
PHYSDEV
dev
,
INT
left
,
INT
top
,
INT
right
,
INT
bottom
,
INT
xstart
,
INT
ystart
,
INT
xend
,
INT
yend
)
{
DC
*
dc
=
get_physdev_dc
(
dev
);
return
PATH_Arc
(
dev
,
left
,
top
,
right
,
bottom
,
xstart
,
ystart
,
xend
,
yend
,
GetArcDirection
(
dev
->
hdc
)
,
1
);
dc
->
ArcDirection
,
1
);
}
...
...
@@ -1258,8 +1263,9 @@ static BOOL pathdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom
static
BOOL
pathdrv_Pie
(
PHYSDEV
dev
,
INT
left
,
INT
top
,
INT
right
,
INT
bottom
,
INT
xstart
,
INT
ystart
,
INT
xend
,
INT
yend
)
{
DC
*
dc
=
get_physdev_dc
(
dev
);
return
PATH_Arc
(
dev
,
left
,
top
,
right
,
bottom
,
xstart
,
ystart
,
xend
,
yend
,
GetArcDirection
(
dev
->
hdc
)
,
2
);
dc
->
ArcDirection
,
2
);
}
...
...
@@ -1311,7 +1317,7 @@ static BOOL pathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types,
case
PT_MOVETO
:
path
->
newStroke
=
TRUE
;
path
->
pos
=
pts
[
i
];
LPtoDP
(
dev
->
h
dc
,
&
path
->
pos
,
1
);
lp_to_dp
(
dc
,
&
path
->
pos
,
1
);
lastmove
=
path
->
count
;
break
;
case
PT_LINETO
:
...
...
@@ -2022,7 +2028,7 @@ BOOL nulldrv_BeginPath( PHYSDEV dev )
physdev
=
get_path_physdev
(
find_dc_driver
(
dc
,
&
path_driver
));
physdev
->
path
=
path
;
path
->
pos
=
dc
->
cur_pos
;
LPtoDP
(
dev
->
h
dc
,
&
path
->
pos
,
1
);
lp_to_dp
(
dc
,
&
path
->
pos
,
1
);
if
(
dc
->
path
)
free_gdi_path
(
dc
->
path
);
dc
->
path
=
NULL
;
return
TRUE
;
...
...
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