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
47b89a8f
Commit
47b89a8f
authored
Feb 14, 2013
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Feb 14, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: IntersectClipRect should update actual clipping region for a EMF DC.
parent
756736ae
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
dc.c
dlls/gdi32/enhmfdrv/dc.c
+5
-1
metafile.c
dlls/gdi32/tests/metafile.c
+0
-2
No files found.
dlls/gdi32/enhmfdrv/dc.c
View file @
47b89a8f
...
@@ -169,14 +169,18 @@ INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT botto
...
@@ -169,14 +169,18 @@ INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT botto
INT
EMFDRV_IntersectClipRect
(
PHYSDEV
dev
,
INT
left
,
INT
top
,
INT
right
,
INT
bottom
)
INT
EMFDRV_IntersectClipRect
(
PHYSDEV
dev
,
INT
left
,
INT
top
,
INT
right
,
INT
bottom
)
{
{
PHYSDEV
next
=
GET_NEXT_PHYSDEV
(
dev
,
pIntersectClipRect
);
EMRINTERSECTCLIPRECT
emr
;
EMRINTERSECTCLIPRECT
emr
;
BOOL
ret
;
emr
.
emr
.
iType
=
EMR_INTERSECTCLIPRECT
;
emr
.
emr
.
iType
=
EMR_INTERSECTCLIPRECT
;
emr
.
emr
.
nSize
=
sizeof
(
emr
);
emr
.
emr
.
nSize
=
sizeof
(
emr
);
emr
.
rclClip
.
left
=
left
;
emr
.
rclClip
.
left
=
left
;
emr
.
rclClip
.
top
=
top
;
emr
.
rclClip
.
top
=
top
;
emr
.
rclClip
.
right
=
right
;
emr
.
rclClip
.
right
=
right
;
emr
.
rclClip
.
bottom
=
bottom
;
emr
.
rclClip
.
bottom
=
bottom
;
return
EMFDRV_WriteRecord
(
dev
,
&
emr
.
emr
);
ret
=
EMFDRV_WriteRecord
(
dev
,
&
emr
.
emr
);
return
ret
?
next
->
funcs
->
pIntersectClipRect
(
next
,
left
,
top
,
right
,
bottom
)
:
ERROR
;
}
}
INT
EMFDRV_OffsetClipRgn
(
PHYSDEV
dev
,
INT
x
,
INT
y
)
INT
EMFDRV_OffsetClipRgn
(
PHYSDEV
dev
,
INT
x
,
INT
y
)
...
...
dlls/gdi32/tests/metafile.c
View file @
47b89a8f
...
@@ -2511,7 +2511,6 @@ static void test_emf_clipping(void)
...
@@ -2511,7 +2511,6 @@ static void test_emf_clipping(void)
rc_res
.
left
,
rc_res
.
top
,
rc_res
.
right
,
rc_res
.
bottom
);
rc_res
.
left
,
rc_res
.
top
,
rc_res
.
right
,
rc_res
.
bottom
);
ret
=
IntersectClipRect
(
hdc
,
0
,
0
,
100
,
100
);
ret
=
IntersectClipRect
(
hdc
,
0
,
0
,
100
,
100
);
todo_wine
ok
(
ret
==
SIMPLEREGION
||
broken
(
ret
==
COMPLEXREGION
)
/* XP */
,
"got %d
\n
"
,
ret
);
ok
(
ret
==
SIMPLEREGION
||
broken
(
ret
==
COMPLEXREGION
)
/* XP */
,
"got %d
\n
"
,
ret
);
if
(
ret
==
COMPLEXREGION
)
if
(
ret
==
COMPLEXREGION
)
{
{
...
@@ -2524,7 +2523,6 @@ todo_wine
...
@@ -2524,7 +2523,6 @@ todo_wine
SetRect
(
&
rc_res
,
-
1
,
-
1
,
-
1
,
-
1
);
SetRect
(
&
rc_res
,
-
1
,
-
1
,
-
1
,
-
1
);
ret
=
GetClipBox
(
hdc
,
&
rc_res
);
ret
=
GetClipBox
(
hdc
,
&
rc_res
);
ok
(
ret
==
SIMPLEREGION
,
"got %d
\n
"
,
ret
);
ok
(
ret
==
SIMPLEREGION
,
"got %d
\n
"
,
ret
);
todo_wine
ok
(
EqualRect
(
&
rc_res
,
&
rc
),
ok
(
EqualRect
(
&
rc_res
,
&
rc
),
"expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)
\n
"
,
"expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)
\n
"
,
rc
.
left
,
rc
.
top
,
rc
.
right
,
rc
.
bottom
,
rc
.
left
,
rc
.
top
,
rc
.
right
,
rc
.
bottom
,
...
...
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