Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
259837a1
Commit
259837a1
authored
Sep 09, 2016
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Sep 12, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdiplus: Implement GdipGetMetafileHeaderFromMetafile.
Signed-off-by:
Vincent Povirk
<
vincent@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
37697789
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
16 deletions
+28
-16
metafile.c
dlls/gdiplus/metafile.c
+16
-4
image.c
dlls/gdiplus/tests/image.c
+12
-12
No files found.
dlls/gdiplus/metafile.c
View file @
259837a1
...
@@ -1667,17 +1667,29 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileDestPointI(GpGraphics *graphics,
...
@@ -1667,17 +1667,29 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileDestPointI(GpGraphics *graphics,
GpStatus
WINGDIPAPI
GdipGetMetafileHeaderFromMetafile
(
GpMetafile
*
metafile
,
GpStatus
WINGDIPAPI
GdipGetMetafileHeaderFromMetafile
(
GpMetafile
*
metafile
,
MetafileHeader
*
header
)
MetafileHeader
*
header
)
{
{
static
int
call
s
;
GpStatus
statu
s
;
TRACE
(
"(%p, %p)
\n
"
,
metafile
,
header
);
TRACE
(
"(%p, %p)
\n
"
,
metafile
,
header
);
if
(
!
metafile
||
!
header
)
if
(
!
metafile
||
!
header
)
return
InvalidParameter
;
return
InvalidParameter
;
if
(
!
(
calls
++
))
if
(
metafile
->
hemf
)
FIXME
(
"not implemented
\n
"
);
{
status
=
GdipGetMetafileHeaderFromEmf
(
metafile
->
hemf
,
header
);
if
(
status
!=
Ok
)
return
status
;
}
else
{
memset
(
header
,
0
,
sizeof
(
*
header
));
header
->
Version
=
0xdbc01002
;
}
memset
(
header
,
0
,
sizeof
(
MetafileHeader
));
header
->
Type
=
metafile
->
metafile_type
;
header
->
DpiX
=
metafile
->
image
.
xres
;
header
->
DpiY
=
metafile
->
image
.
yres
;
header
->
Width
=
gdip_round
(
metafile
->
bounds
.
Width
);
header
->
Height
=
gdip_round
(
metafile
->
bounds
.
Height
);
return
Ok
;
return
Ok
;
}
}
...
...
dlls/gdiplus/tests/image.c
View file @
259837a1
...
@@ -1465,17 +1465,17 @@ static void test_loadwmf(void)
...
@@ -1465,17 +1465,17 @@ static void test_loadwmf(void)
expect
(
Ok
,
stat
);
expect
(
Ok
,
stat
);
if
(
stat
==
Ok
)
if
(
stat
==
Ok
)
{
{
todo_wine
expect
(
MetafileTypeWmfPlaceable
,
header
.
Type
);
expect
(
MetafileTypeWmfPlaceable
,
header
.
Type
);
todo_wine
expect
(
sizeof
(
wmfimage
)
-
sizeof
(
WmfPlaceableFileHeader
),
header
.
Size
);
todo_wine
expect
(
sizeof
(
wmfimage
)
-
sizeof
(
WmfPlaceableFileHeader
),
header
.
Size
);
todo_wine
expect
(
0x300
,
header
.
Version
);
todo_wine
expect
(
0x300
,
header
.
Version
);
expect
(
0
,
header
.
EmfPlusFlags
);
expect
(
0
,
header
.
EmfPlusFlags
);
todo_wine
expectf
(
1440
.
0
,
header
.
DpiX
);
expectf
(
1440
.
0
,
header
.
DpiX
);
todo_wine
expectf
(
1440
.
0
,
header
.
DpiY
);
expectf
(
1440
.
0
,
header
.
DpiY
);
expect
(
0
,
header
.
X
);
expect
(
0
,
header
.
X
);
expect
(
0
,
header
.
Y
);
expect
(
0
,
header
.
Y
);
todo_wine
expect
(
320
,
header
.
Width
);
expect
(
320
,
header
.
Width
);
todo_wine
expect
(
320
,
header
.
Height
);
expect
(
320
,
header
.
Height
);
todo_wine
expect
(
1
,
U
(
header
).
WmfHeader
.
mtType
);
expect
(
1
,
U
(
header
).
WmfHeader
.
mtType
);
expect
(
0
,
header
.
EmfPlusHeaderSize
);
expect
(
0
,
header
.
EmfPlusHeaderSize
);
expect
(
0
,
header
.
LogicalDpiX
);
expect
(
0
,
header
.
LogicalDpiX
);
expect
(
0
,
header
.
LogicalDpiY
);
expect
(
0
,
header
.
LogicalDpiY
);
...
@@ -1523,17 +1523,17 @@ static void test_createfromwmf(void)
...
@@ -1523,17 +1523,17 @@ static void test_createfromwmf(void)
expect
(
Ok
,
stat
);
expect
(
Ok
,
stat
);
if
(
stat
==
Ok
)
if
(
stat
==
Ok
)
{
{
todo_wine
expect
(
MetafileTypeWmfPlaceable
,
header
.
Type
);
expect
(
MetafileTypeWmfPlaceable
,
header
.
Type
);
todo_wine
expect
(
sizeof
(
wmfimage
)
-
sizeof
(
WmfPlaceableFileHeader
),
header
.
Size
);
todo_wine
expect
(
sizeof
(
wmfimage
)
-
sizeof
(
WmfPlaceableFileHeader
),
header
.
Size
);
todo_wine
expect
(
0x300
,
header
.
Version
);
todo_wine
expect
(
0x300
,
header
.
Version
);
expect
(
0
,
header
.
EmfPlusFlags
);
expect
(
0
,
header
.
EmfPlusFlags
);
todo_wine
expectf
(
1440
.
0
,
header
.
DpiX
);
expectf
(
1440
.
0
,
header
.
DpiX
);
todo_wine
expectf
(
1440
.
0
,
header
.
DpiY
);
expectf
(
1440
.
0
,
header
.
DpiY
);
expect
(
0
,
header
.
X
);
expect
(
0
,
header
.
X
);
expect
(
0
,
header
.
Y
);
expect
(
0
,
header
.
Y
);
todo_wine
expect
(
320
,
header
.
Width
);
expect
(
320
,
header
.
Width
);
todo_wine
expect
(
320
,
header
.
Height
);
expect
(
320
,
header
.
Height
);
todo_wine
expect
(
1
,
U
(
header
).
WmfHeader
.
mtType
);
expect
(
1
,
U
(
header
).
WmfHeader
.
mtType
);
expect
(
0
,
header
.
EmfPlusHeaderSize
);
expect
(
0
,
header
.
EmfPlusHeaderSize
);
expect
(
0
,
header
.
LogicalDpiX
);
expect
(
0
,
header
.
LogicalDpiX
);
expect
(
0
,
header
.
LogicalDpiY
);
expect
(
0
,
header
.
LogicalDpiY
);
...
...
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