Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Johnny Cai
wine
Commits
e8a1a232
Commit
e8a1a232
authored
22 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
A few fixes in ExtSelectClipRgn metafile functions.
parent
284bcfcf
Loading
Loading
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/gdi/enhmfdrv/dc.c
+9
-4
9 additions, 4 deletions
dlls/gdi/enhmfdrv/dc.c
dlls/gdi/enhmfdrv/graphics.c
+3
-3
3 additions, 3 deletions
dlls/gdi/enhmfdrv/graphics.c
dlls/gdi/mfdrv/graphics.c
+8
-9
8 additions, 9 deletions
dlls/gdi/mfdrv/graphics.c
with
20 additions
and
16 deletions
dlls/gdi/enhmfdrv/dc.c
+
9
−
4
View file @
e8a1a232
...
...
@@ -134,11 +134,16 @@ INT EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode )
DWORD
size
,
rgnsize
;
BOOL
ret
;
rgnsize
=
GetRegionData
(
hrgn
,
0
,
NULL
);
size
=
rgnsize
+
sizeof
(
*
emr
)
-
1
;
if
(
!
hrgn
)
{
if
(
mode
!=
RGN_COPY
)
return
ERROR
;
rgnsize
=
0
;
}
else
rgnsize
=
GetRegionData
(
hrgn
,
0
,
NULL
);
size
=
rgnsize
+
offsetof
(
EMREXTSELECTCLIPRGN
,
RgnData
);
emr
=
HeapAlloc
(
GetProcessHeap
(),
0
,
size
);
GetRegionData
(
hrgn
,
rgnsize
,
(
RGNDATA
*
)
&
emr
->
RgnData
);
if
(
rgnsize
)
GetRegionData
(
hrgn
,
rgnsize
,
(
RGNDATA
*
)
&
emr
->
RgnData
);
emr
->
emr
.
iType
=
EMR_EXTSELECTCLIPRGN
;
emr
->
emr
.
nSize
=
size
;
...
...
This diff is collapsed.
Click to expand it.
dlls/gdi/enhmfdrv/graphics.c
+
3
−
3
View file @
e8a1a232
...
...
@@ -490,7 +490,7 @@ BOOL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush )
if
(
!
index
)
return
FALSE
;
rgnsize
=
GetRegionData
(
hrgn
,
0
,
NULL
);
size
=
rgnsize
+
size
of
(
EMRFILLRGN
)
-
1
;
size
=
rgnsize
+
offset
of
(
EMRFILLRGN
,
RgnData
)
;
emr
=
HeapAlloc
(
GetProcessHeap
(),
0
,
size
);
GetRegionData
(
hrgn
,
rgnsize
,
(
RGNDATA
*
)
&
emr
->
RgnData
);
...
...
@@ -523,7 +523,7 @@ BOOL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, INT heig
if
(
!
index
)
return
FALSE
;
rgnsize
=
GetRegionData
(
hrgn
,
0
,
NULL
);
size
=
rgnsize
+
size
of
(
EMRFRAMERGN
)
-
1
;
size
=
rgnsize
+
offset
of
(
EMRFRAMERGN
,
RgnData
)
;
emr
=
HeapAlloc
(
GetProcessHeap
(),
0
,
size
);
GetRegionData
(
hrgn
,
rgnsize
,
(
RGNDATA
*
)
&
emr
->
RgnData
);
...
...
@@ -559,7 +559,7 @@ static BOOL EMFDRV_PaintInvertRgn( PHYSDEV dev, HRGN hrgn, DWORD iType )
rgnsize
=
GetRegionData
(
hrgn
,
0
,
NULL
);
size
=
rgnsize
+
size
of
(
EMRINVERTRGN
)
-
1
;
size
=
rgnsize
+
offset
of
(
EMRINVERTRGN
,
RgnData
)
;
emr
=
HeapAlloc
(
GetProcessHeap
(),
0
,
size
);
GetRegionData
(
hrgn
,
rgnsize
,
(
RGNDATA
*
)
&
emr
->
RgnData
);
...
...
This diff is collapsed.
Click to expand it.
dlls/gdi/mfdrv/graphics.c
+
8
−
9
View file @
e8a1a232
...
...
@@ -237,7 +237,7 @@ static INT16 MFDRV_CreateRegion(PHYSDEV dev, HRGN hrgn)
WORD
*
Param
,
*
StartBand
;
BOOL
ret
;
len
=
GetRegionData
(
hrgn
,
0
,
NULL
);
if
(
!
(
len
=
GetRegionData
(
hrgn
,
0
,
NULL
)
))
return
-
1
;
if
(
!
(
rgndata
=
HeapAlloc
(
GetProcessHeap
(),
0
,
len
))
)
{
WARN
(
"Can't alloc rgndata buffer
\n
"
);
return
-
1
;
...
...
@@ -376,16 +376,15 @@ MFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT x, INT y )
INT
MFDRV_ExtSelectClipRgn
(
PHYSDEV
dev
,
HRGN
hrgn
,
INT
mode
)
{
INT16
iRgn
;
INT
ret
;
if
(
mode
!=
RGN_COPY
)
{
FIXME
(
"mode %d not supported
\n
"
,
mode
);
return
ERROR
;
}
if
(
mode
!=
RGN_COPY
)
return
ERROR
;
if
(
!
hrgn
)
return
NULLREGION
;
iRgn
=
MFDRV_CreateRegion
(
dev
,
hrgn
);
if
(
iRgn
==
-
1
)
return
ERROR
;
return
MFDRV_MetaParam1
(
dev
,
META_SELECTCLIPREGION
,
iRgn
)
?
SIMPLEREGION
:
ERROR
;
if
(
iRgn
==
-
1
)
return
ERROR
;
ret
=
MFDRV_MetaParam1
(
dev
,
META_SELECTCLIPREGION
,
iRgn
)
?
NULLREGION
:
ERROR
;
MFDRV_MetaParam1
(
dev
,
META_DELETEOBJECT
,
iRgn
);
return
ret
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment