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
5ce743d5
Commit
5ce743d5
authored
Oct 20, 2019
by
Nikolay Sivov
Committed by
Alexandre Julliard
Oct 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
t2embed/tests: Fix some test failures on Win10.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f83d1414
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
9 deletions
+7
-9
t2embed.c
dlls/t2embed/tests/t2embed.c
+7
-9
No files found.
dlls/t2embed/tests/t2embed.c
View file @
5ce743d5
...
...
@@ -43,8 +43,10 @@ static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm
UINT
fsType
=
otm
.
otmfsType
&
0xf
;
ret
=
TTGetEmbeddingType
(
hdc
,
&
status
);
ok
(
ret
==
E_NONE
,
"got %d
\n
"
,
ret
);
ok
(
ret
==
E_NONE
||
ret
==
E_NOTATRUETYPEFONT
,
"Unexpected return value %#x.
\n
"
,
ret
);
if
(
ret
==
E_NONE
)
{
if
(
fsType
==
LICENSE_INSTALLABLE
)
expected
=
EMBED_INSTALLABLE
;
else
if
(
fsType
&
LICENSE_EDITABLE
)
...
...
@@ -57,6 +59,7 @@ static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm
ok
(
expected
==
status
,
"%s: status %d, expected %d, fsType %#x
\n
"
,
enumlf
->
elfLogFont
.
lfFaceName
,
status
,
expected
,
otm
.
otmfsType
);
}
}
else
{
status
=
0xdeadbeef
;
...
...
@@ -170,14 +173,6 @@ static void test_TTIsEmbeddingEnabled(void)
hdc
=
CreateCompatibleDC
(
0
);
ret
=
TTIsEmbeddingEnabled
(
hdc
,
NULL
);
ok
(
ret
==
E_ERRORACCESSINGFACENAME
,
"got %#x
\n
"
,
ret
);
status
=
123
;
ret
=
TTIsEmbeddingEnabled
(
hdc
,
&
status
);
ok
(
ret
==
E_ERRORACCESSINGFACENAME
,
"got %#x
\n
"
,
ret
);
ok
(
status
==
123
,
"got %u
\n
"
,
status
);
memset
(
&
logfont
,
0
,
sizeof
(
logfont
));
logfont
.
lfHeight
=
12
;
logfont
.
lfWeight
=
FW_NORMAL
;
...
...
@@ -187,6 +182,9 @@ static void test_TTIsEmbeddingEnabled(void)
old_font
=
SelectObject
(
hdc
,
hfont
);
ret
=
TTIsEmbeddingEnabled
(
hdc
,
NULL
);
ok
(
ret
==
E_PBENABLEDINVALID
,
"Unexpected return value %#x.
\n
"
,
ret
);
status
=
123
;
ret
=
TTIsEmbeddingEnabled
(
hdc
,
&
status
);
ok
(
ret
==
E_NONE
,
"got %#x
\n
"
,
ret
);
...
...
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