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
9f526030
Commit
9f526030
authored
Dec 22, 2015
by
Nikolay Sivov
Committed by
Alexandre Julliard
Dec 22, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comdlg32/fontdlg: Fix string format for sizes added to listbox.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
daaa0834
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
fontdlg.c
dlls/comdlg32/fontdlg.c
+4
-5
No files found.
dlls/comdlg32/fontdlg.c
View file @
9f526030
...
...
@@ -51,6 +51,7 @@ static const WCHAR strWineFontData[] = {'_','_','W','I','N','E','_','F','O','N',
static
const
WCHAR
strWineFontData_a
[]
=
{
'_'
,
'_'
,
'W'
,
'I'
,
'N'
,
'E'
,
'_'
,
'F'
,
'O'
,
'N'
,
'T'
,
'D'
,
'L'
,
'G'
,
'D'
,
'A'
,
'T'
,
'A'
,
'_'
,
'A'
,
0
};
static
const
WCHAR
chooseFontW
[]
=
{
'C'
,
'H'
,
'O'
,
'O'
,
'S'
,
'E'
,
'_'
,
'F'
,
'O'
,
'N'
,
'T'
,
0
};
static
const
WCHAR
fontsizefmtW
[]
=
{
'%'
,
'd'
,
0
};
/* image list with TrueType bitmaps and more */
static
HIMAGELIST
himlTT
=
0
;
...
...
@@ -417,16 +418,15 @@ static BOOL AddFontSizeToCombo3(HWND hwnd, UINT h, const CHOOSEFONTW *lpcf)
{
int
j
;
WCHAR
buffer
[
20
];
static
const
WCHAR
strFormat
[]
=
{
'%'
,
'2'
,
'd'
,
0
};
if
(
(
!
(
lpcf
->
Flags
&
CF_LIMITSIZE
))
||
((
lpcf
->
Flags
&
CF_LIMITSIZE
)
&&
(
h
>=
lpcf
->
nSizeMin
)
&&
(
h
<=
lpcf
->
nSizeMax
)))
{
wsprintfW
(
buffer
,
strFormat
,
h
);
sprintfW
(
buffer
,
fontsizefmtW
,
h
);
j
=
SendMessageW
(
hwnd
,
CB_FINDSTRINGEXACT
,
-
1
,
(
LPARAM
)
buffer
);
if
(
j
==
CB_ERR
)
{
j
=
SendMessageW
(
hwnd
,
CB_
ADDSTRING
,
0
,
(
LPARAM
)
buffer
);
j
=
SendMessageW
(
hwnd
,
CB_
INSERTSTRING
,
-
1
,
(
LPARAM
)
buffer
);
if
(
j
!=
CB_ERR
)
j
=
SendMessageW
(
hwnd
,
CB_SETITEMDATA
,
j
,
h
);
if
(
j
==
CB_ERR
)
return
TRUE
;
}
...
...
@@ -534,7 +534,6 @@ static INT AddFontStyle( const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *
static
void
CFn_FitFontSize
(
HWND
hDlg
,
int
points
)
{
static
const
WCHAR
fmtW
[]
=
{
'%'
,
'd'
,
0
};
WCHAR
buffW
[
16
];
int
i
,
n
;
...
...
@@ -554,7 +553,7 @@ static void CFn_FitFontSize( HWND hDlg, int points)
}
/* no default matching size, set text manually */
sprintfW
(
buffW
,
fmtW
,
points
);
sprintfW
(
buffW
,
f
ontsizef
mtW
,
points
);
SetDlgItemTextW
(
hDlg
,
cmb3
,
buffW
);
}
...
...
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