[4/4] user32: SystemParametersInfo(SPI_GETNONCLIENTMETRICS) should return real font names.
Dmitry Timoshkov
dmitry at baikal.ru
Fri Jul 17 04:23:24 CDT 2015
Gtk+/Pango depend on this.
Part2 of the fix for bug 19289.
---
dlls/user32/sysparams.c | 20 ++++++++++++++++++++
dlls/user32/tests/sysparams.c | 5 -----
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
index 79396ae..1f76241 100644
--- a/dlls/user32/sysparams.c
+++ b/dlls/user32/sysparams.c
@@ -621,6 +621,20 @@ static inline int get_display_dpi(void)
return display_dpi;
}
+static INT CALLBACK real_fontname_proc(const LOGFONTW *lf, const TEXTMETRICW *ntm, DWORD type, LPARAM lparam)
+{
+ const ENUMLOGFONTW *elf = (const ENUMLOGFONTW *)lf;
+ LOGFONTW *lfW = (LOGFONTW *)lparam;
+
+ lstrcpynW(lfW->lfFaceName, elf->elfFullName, LF_FACESIZE);
+ return 0;
+}
+
+static void get_real_fontname(LOGFONTW *lf)
+{
+ EnumFontFamiliesExW(get_display_dc(), lf, real_fontname_proc, (LPARAM)lf, 0);
+}
+
/* adjust some of the raw values found in the registry */
static void normalize_nonclientmetrics( NONCLIENTMETRICSW *pncm)
{
@@ -633,10 +647,16 @@ static void normalize_nonclientmetrics( NONCLIENTMETRICSW *pncm)
/* adjust some heights to the corresponding font */
get_text_metr_size( get_display_dc(), &pncm->lfMenuFont, &tm, NULL);
pncm->iMenuHeight = max( pncm->iMenuHeight, 2 + tm.tmHeight + tm.tmExternalLeading );
+ get_real_fontname( &pncm->lfMenuFont );
get_text_metr_size( get_display_dc(), &pncm->lfCaptionFont, &tm, NULL);
pncm->iCaptionHeight = max( pncm->iCaptionHeight, 2 + tm.tmHeight);
+ get_real_fontname( &pncm->lfCaptionFont );
get_text_metr_size( get_display_dc(), &pncm->lfSmCaptionFont, &tm, NULL);
pncm->iSmCaptionHeight = max( pncm->iSmCaptionHeight, 2 + tm.tmHeight);
+ get_real_fontname( &pncm->lfSmCaptionFont );
+
+ get_real_fontname( &pncm->lfStatusFont );
+ get_real_fontname( &pncm->lfMessageFont );
}
static BOOL CALLBACK enum_monitors( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp )
diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c
index dabecdb..1ee8920 100644
--- a/dlls/user32/tests/sysparams.c
+++ b/dlls/user32/tests/sysparams.c
@@ -2709,15 +2709,10 @@ static void test_GetSystemMetrics( void)
return;
}
-todo_wine
ok(is_font_enumerated(ncm.lfCaptionFont.lfFaceName), "font %s should be enumerated\n", ncm.lfCaptionFont.lfFaceName);
-todo_wine
ok(is_font_enumerated(ncm.lfSmCaptionFont.lfFaceName), "font %s should be enumerated\n", ncm.lfSmCaptionFont.lfFaceName);
-todo_wine
ok(is_font_enumerated(ncm.lfMenuFont.lfFaceName), "font %s should be enumerated\n", ncm.lfMenuFont.lfFaceName);
-todo_wine
ok(is_font_enumerated(ncm.lfStatusFont.lfFaceName), "font %s should be enumerated\n", ncm.lfStatusFont.lfFaceName);
-todo_wine
ok(is_font_enumerated(ncm.lfMessageFont.lfFaceName), "font %s should be enumerated\n", ncm.lfMessageFont.lfFaceName);
/* CaptionWidth from the registry may have different value of iCaptionWidth
--
2.4.5
More information about the wine-patches
mailing list