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
d9811e69
Commit
d9811e69
authored
Feb 12, 2009
by
Huw Davies
Committed by
Alexandre Julliard
Feb 12, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32/tests: Use the ANSI text metrics so the tests work on win9x.
parent
aaefb75f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
font.c
dlls/gdi32/tests/font.c
+10
-10
No files found.
dlls/gdi32/tests/font.c
View file @
d9811e69
...
@@ -2019,10 +2019,10 @@ typedef struct
...
@@ -2019,10 +2019,10 @@ typedef struct
((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24))
((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24))
#define MS_OS2_TAG MS_MAKE_TAG('O','S','/','2')
#define MS_OS2_TAG MS_MAKE_TAG('O','S','/','2')
static
void
expect_ff
(
const
TEXTMETRIC
W
*
tmW
,
const
TT_OS2_V2
*
os2
,
WORD
family
,
const
char
*
name
)
static
void
expect_ff
(
const
TEXTMETRIC
A
*
tmA
,
const
TT_OS2_V2
*
os2
,
WORD
family
,
const
char
*
name
)
{
{
ok
((
tm
W
->
tmPitchAndFamily
&
0xf0
)
==
family
,
"%s: expected family %02x got %02x. panose %d-%d-%d-%d-...
\n
"
,
ok
((
tm
A
->
tmPitchAndFamily
&
0xf0
)
==
family
,
"%s: expected family %02x got %02x. panose %d-%d-%d-%d-...
\n
"
,
name
,
family
,
tm
W
->
tmPitchAndFamily
,
os2
->
panose
.
bFamilyType
,
os2
->
panose
.
bSerifStyle
,
name
,
family
,
tm
A
->
tmPitchAndFamily
,
os2
->
panose
.
bFamilyType
,
os2
->
panose
.
bSerifStyle
,
os2
->
panose
.
bWeight
,
os2
->
panose
.
bProportion
);
os2
->
panose
.
bWeight
,
os2
->
panose
.
bProportion
);
}
}
...
@@ -2146,9 +2146,9 @@ static void test_text_metrics(const LOGFONTA *lf)
...
@@ -2146,9 +2146,9 @@ static void test_text_metrics(const LOGFONTA *lf)
case
PAN_FAMILY_TEXT_DISPLAY
:
case
PAN_FAMILY_TEXT_DISPLAY
:
case
PAN_FAMILY_PICTORIAL
:
case
PAN_FAMILY_PICTORIAL
:
default:
default:
if
((
tm
W
.
tmPitchAndFamily
&
1
)
==
0
)
/* fixed */
if
((
tm
A
.
tmPitchAndFamily
&
1
)
==
0
)
/* fixed */
{
{
expect_ff
(
&
tm
W
,
&
tt_os2
,
FF_MODERN
,
font_name
);
expect_ff
(
&
tm
A
,
&
tt_os2
,
FF_MODERN
,
font_name
);
break
;
break
;
}
}
switch
(
tt_os2
.
panose
.
bSerifStyle
)
switch
(
tt_os2
.
panose
.
bSerifStyle
)
...
@@ -2156,7 +2156,7 @@ static void test_text_metrics(const LOGFONTA *lf)
...
@@ -2156,7 +2156,7 @@ static void test_text_metrics(const LOGFONTA *lf)
case
PAN_ANY
:
case
PAN_ANY
:
case
PAN_NO_FIT
:
case
PAN_NO_FIT
:
default:
default:
expect_ff
(
&
tm
W
,
&
tt_os2
,
FF_DONTCARE
,
font_name
);
expect_ff
(
&
tm
A
,
&
tt_os2
,
FF_DONTCARE
,
font_name
);
break
;
break
;
case
PAN_SERIF_COVE
:
case
PAN_SERIF_COVE
:
...
@@ -2168,7 +2168,7 @@ static void test_text_metrics(const LOGFONTA *lf)
...
@@ -2168,7 +2168,7 @@ static void test_text_metrics(const LOGFONTA *lf)
case
PAN_SERIF_BONE
:
case
PAN_SERIF_BONE
:
case
PAN_SERIF_EXAGGERATED
:
case
PAN_SERIF_EXAGGERATED
:
case
PAN_SERIF_TRIANGLE
:
case
PAN_SERIF_TRIANGLE
:
expect_ff
(
&
tm
W
,
&
tt_os2
,
FF_ROMAN
,
font_name
);
expect_ff
(
&
tm
A
,
&
tt_os2
,
FF_ROMAN
,
font_name
);
break
;
break
;
case
PAN_SERIF_NORMAL_SANS
:
case
PAN_SERIF_NORMAL_SANS
:
...
@@ -2176,17 +2176,17 @@ static void test_text_metrics(const LOGFONTA *lf)
...
@@ -2176,17 +2176,17 @@ static void test_text_metrics(const LOGFONTA *lf)
case
PAN_SERIF_PERP_SANS
:
case
PAN_SERIF_PERP_SANS
:
case
PAN_SERIF_FLARED
:
case
PAN_SERIF_FLARED
:
case
PAN_SERIF_ROUNDED
:
case
PAN_SERIF_ROUNDED
:
expect_ff
(
&
tm
W
,
&
tt_os2
,
FF_SWISS
,
font_name
);
expect_ff
(
&
tm
A
,
&
tt_os2
,
FF_SWISS
,
font_name
);
break
;
break
;
}
}
break
;
break
;
case
PAN_FAMILY_SCRIPT
:
case
PAN_FAMILY_SCRIPT
:
expect_ff
(
&
tm
W
,
&
tt_os2
,
FF_SCRIPT
,
font_name
);
expect_ff
(
&
tm
A
,
&
tt_os2
,
FF_SCRIPT
,
font_name
);
break
;
break
;
case
PAN_FAMILY_DECORATIVE
:
case
PAN_FAMILY_DECORATIVE
:
expect_ff
(
&
tm
W
,
&
tt_os2
,
FF_DECORATIVE
,
font_name
);
expect_ff
(
&
tm
A
,
&
tt_os2
,
FF_DECORATIVE
,
font_name
);
break
;
break
;
}
}
...
...
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