Skip to content

W
wine-winehq
Commit 6ead654f authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

win32u: Simplify get_text_metr_size.

Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com>
parent d65f2492
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
dlls/win32u/sysparams.c
View file @ 6ead654f
...@@ -2743,14 +2743,13 @@ static LONG get_char_dimensions( HDC hdc, TEXTMETRICW *metric, LONG *height ) ...@@ -2743,14 +2743,13 @@ static LONG get_char_dimensions( HDC hdc, TEXTMETRICW *metric, LONG *height )
/* get text metrics and/or "average" char width of the specified logfont /* get text metrics and/or "average" char width of the specified logfont
* for the specified dc */ * for the specified dc */
static void get_text_metr_size( HDC hdc, LOGFONTW *plf, TEXTMETRICW *metric, UINT *psz) static void get_text_metr_size( HDC hdc, LOGFONTW *lf, TEXTMETRICW *metric, UINT *psz )
{ {
ENUMLOGFONTEXDVW exdv = { .elfEnumLogfontEx.elfLogFont = *plf };
HFONT hfont, hfontsav; HFONT hfont, hfontsav;
TEXTMETRICW tm; TEXTMETRICW tm;
UINT ret; UINT ret;
if (!metric) metric = &tm; if (!metric) metric = &tm;
hfont = NtGdiHfontCreate( &exdv, sizeof(exdv), 0, 0, NULL ); hfont = NtGdiHfontCreate( lf, sizeof(*lf), 0, 0, NULL );
if (!hfont || !(hfontsav = NtGdiSelectFont( hdc, hfont ))) if (!hfont || !(hfontsav = NtGdiSelectFont( hdc, hfont )))
{ {
metric->tmHeight = -1; metric->tmHeight = -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment