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
06b23138
Commit
06b23138
authored
May 21, 2011
by
Vincent Povirk
Committed by
Alexandre Julliard
May 23, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdiplus: Remove is_emfplus field from test structure, as it's redundant.
parent
11248262
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
12 deletions
+4
-12
metafile.c
dlls/gdiplus/tests/metafile.c
+4
-12
No files found.
dlls/gdiplus/tests/metafile.c
View file @
06b23138
...
@@ -29,7 +29,6 @@ typedef struct emfplus_record
...
@@ -29,7 +29,6 @@ typedef struct emfplus_record
{
{
ULONG
todo
;
ULONG
todo
;
ULONG
record_type
;
ULONG
record_type
;
int
is_emfplus
;
}
emfplus_record
;
}
emfplus_record
;
typedef
struct
emfplus_check_state
typedef
struct
emfplus_check_state
...
@@ -44,10 +43,6 @@ static void check_record(int count, const char *desc, const struct emfplus_recor
...
@@ -44,10 +43,6 @@ static void check_record(int count, const char *desc, const struct emfplus_recor
ok
(
expected
->
record_type
==
actual
->
record_type
,
ok
(
expected
->
record_type
==
actual
->
record_type
,
"%s.%i: Expected record type 0x%x, got 0x%x
\n
"
,
desc
,
count
,
"%s.%i: Expected record type 0x%x, got 0x%x
\n
"
,
desc
,
count
,
expected
->
record_type
,
actual
->
record_type
);
expected
->
record_type
,
actual
->
record_type
);
ok
(
expected
->
is_emfplus
==
actual
->
is_emfplus
,
"%s.%i: Expected is_emfplus %i, got %i
\n
"
,
desc
,
count
,
expected
->
record_type
,
actual
->
record_type
);
}
}
typedef
struct
EmfPlusRecordHeader
typedef
struct
EmfPlusRecordHeader
...
@@ -89,7 +84,6 @@ static int CALLBACK enum_emf_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETAR
...
@@ -89,7 +84,6 @@ static int CALLBACK enum_emf_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETAR
{
{
actual
.
todo
=
0
;
actual
.
todo
=
0
;
actual
.
record_type
=
record
->
Type
;
actual
.
record_type
=
record
->
Type
;
actual
.
is_emfplus
=
1
;
check_record
(
state
->
count
,
state
->
desc
,
&
state
->
expected
[
state
->
count
],
&
actual
);
check_record
(
state
->
count
,
state
->
desc
,
&
state
->
expected
[
state
->
count
],
&
actual
);
...
@@ -113,7 +107,6 @@ static int CALLBACK enum_emf_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETAR
...
@@ -113,7 +107,6 @@ static int CALLBACK enum_emf_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETAR
{
{
actual
.
todo
=
0
;
actual
.
todo
=
0
;
actual
.
record_type
=
lpEMFR
->
iType
;
actual
.
record_type
=
lpEMFR
->
iType
;
actual
.
is_emfplus
=
0
;
check_record
(
state
->
count
,
state
->
desc
,
&
state
->
expected
[
state
->
count
],
&
actual
);
check_record
(
state
->
count
,
state
->
desc
,
&
state
->
expected
[
state
->
count
],
&
actual
);
...
@@ -148,7 +141,6 @@ static BOOL CALLBACK enum_metafile_proc(EmfPlusRecordType record_type, unsigned
...
@@ -148,7 +141,6 @@ static BOOL CALLBACK enum_metafile_proc(EmfPlusRecordType record_type, unsigned
actual
.
todo
=
0
;
actual
.
todo
=
0
;
actual
.
record_type
=
record_type
;
actual
.
record_type
=
record_type
;
actual
.
is_emfplus
=
((
record_type
&
GDIP_EMFPLUS_RECORD_BASE
)
==
GDIP_EMFPLUS_RECORD_BASE
);
if
(
dataSize
==
0
)
if
(
dataSize
==
0
)
ok
(
pStr
==
NULL
,
"non-NULL pStr
\n
"
);
ok
(
pStr
==
NULL
,
"non-NULL pStr
\n
"
);
...
@@ -196,10 +188,10 @@ static void check_metafile(GpMetafile *metafile, const emfplus_record *expected,
...
@@ -196,10 +188,10 @@ static void check_metafile(GpMetafile *metafile, const emfplus_record *expected,
}
}
static
const
emfplus_record
empty_records
[]
=
{
static
const
emfplus_record
empty_records
[]
=
{
{
0
,
EMR_HEADER
,
0
},
{
0
,
EMR_HEADER
},
{
0
,
EmfPlusRecordTypeHeader
,
1
},
{
0
,
EmfPlusRecordTypeHeader
},
{
0
,
EmfPlusRecordTypeEndOfFile
,
1
},
{
0
,
EmfPlusRecordTypeEndOfFile
},
{
0
,
EMR_EOF
,
0
},
{
0
,
EMR_EOF
},
{
0
}
{
0
}
};
};
...
...
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