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
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
Torge Matthies
wine
Commits
5b90101e
Commit
5b90101e
authored
15 years ago
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
15 years ago
Browse files
Options
Downloads
Patches
Plain Diff
user32/tests: Use symbol charset when creating Marlett font.
parent
2858f67a
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/user32/tests/combo.c
+18
-14
18 additions, 14 deletions
dlls/user32/tests/combo.c
with
18 additions
and
14 deletions
dlls/user32/tests/combo.c
+
18
−
14
View file @
5b90101e
...
...
@@ -94,28 +94,29 @@ static void test_setitemheight(DWORD style)
static
void
test_setfont
(
DWORD
style
)
{
HWND
hCombo
=
build_combo
(
style
);
HFONT
hFont1
=
CreateFont
(
10
,
0
,
0
,
0
,
FW_DONTCARE
,
FALSE
,
FALSE
,
FALSE
,
ANSI_CHARSET
,
OUT_DEFAULT_PRECIS
,
CLIP_DEFAULT_PRECIS
,
DEFAULT_QUALITY
,
DEFAULT_PITCH
|
FF_DONTCARE
,
"Marlett"
);
HFONT
hFont2
=
CreateFont
(
8
,
0
,
0
,
0
,
FW_DONTCARE
,
FALSE
,
FALSE
,
FALSE
,
ANSI_CHARSET
,
OUT_DEFAULT_PRECIS
,
CLIP_DEFAULT_PRECIS
,
DEFAULT_QUALITY
,
DEFAULT_PITCH
|
FF_DONTCARE
,
"Marlett"
);
HWND
hCombo
;
HFONT
hFont1
,
hFont2
;
RECT
r
;
int
i
;
if
(
!
is_font_installed
(
"Marlett"
))
{
skip
(
"Marlett font not available
\n
"
);
return
;
}
trace
(
"Style %x
\n
"
,
style
);
hCombo
=
build_combo
(
style
);
hFont1
=
CreateFont
(
10
,
0
,
0
,
0
,
FW_DONTCARE
,
FALSE
,
FALSE
,
FALSE
,
SYMBOL_CHARSET
,
OUT_DEFAULT_PRECIS
,
CLIP_DEFAULT_PRECIS
,
DEFAULT_QUALITY
,
DEFAULT_PITCH
|
FF_DONTCARE
,
"Marlett"
);
hFont2
=
CreateFont
(
8
,
0
,
0
,
0
,
FW_DONTCARE
,
FALSE
,
FALSE
,
FALSE
,
SYMBOL_CHARSET
,
OUT_DEFAULT_PRECIS
,
CLIP_DEFAULT_PRECIS
,
DEFAULT_QUALITY
,
DEFAULT_PITCH
|
FF_DONTCARE
,
"Marlett"
);
GetClientRect
(
hCombo
,
&
r
);
expect_rect
(
r
,
0
,
0
,
100
,
24
);
SendMessageA
(
hCombo
,
CB_GETDROPPEDCONTROLRECT
,
0
,
(
LPARAM
)
&
r
);
MapWindowPoints
(
HWND_DESKTOP
,
hMainWnd
,
(
LPPOINT
)
&
r
,
2
);
todo_wine
expect_rect
(
r
,
5
,
5
,
105
,
105
);
if
(
!
is_font_installed
(
"Marlett"
))
{
skip
(
"Marlett font not available
\n
"
);
DestroyWindow
(
hCombo
);
DeleteObject
(
hFont1
);
DeleteObject
(
hFont2
);
return
;
}
if
(
font_height
(
hFont1
)
==
10
&&
font_height
(
hFont2
)
==
8
)
{
SendMessage
(
hCombo
,
WM_SETFONT
,
(
WPARAM
)
hFont1
,
FALSE
);
...
...
@@ -140,11 +141,14 @@ static void test_setfont(DWORD style)
todo_wine
expect_rect
(
r
,
5
,
5
,
105
,
99
);
}
else
skip
(
"Invalid Marlett font heights
\n
"
);
{
ok
(
0
,
"Expected Marlett font heights 10/8, got %d/%d
\n
"
,
font_height
(
hFont1
),
font_height
(
hFont2
));
}
for
(
i
=
1
;
i
<
30
;
i
++
)
{
HFONT
hFont
=
CreateFont
(
i
,
0
,
0
,
0
,
FW_DONTCARE
,
FALSE
,
FALSE
,
FALSE
,
ANSI
_CHARSET
,
OUT_DEFAULT_PRECIS
,
CLIP_DEFAULT_PRECIS
,
DEFAULT_QUALITY
,
DEFAULT_PITCH
|
FF_DONTCARE
,
"Marlett"
);
HFONT
hFont
=
CreateFont
(
i
,
0
,
0
,
0
,
FW_DONTCARE
,
FALSE
,
FALSE
,
FALSE
,
SYMBOL
_CHARSET
,
OUT_DEFAULT_PRECIS
,
CLIP_DEFAULT_PRECIS
,
DEFAULT_QUALITY
,
DEFAULT_PITCH
|
FF_DONTCARE
,
"Marlett"
);
int
height
=
font_height
(
hFont
);
SendMessage
(
hCombo
,
WM_SETFONT
,
(
WPARAM
)
hFont
,
FALSE
);
...
...
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