Alexandre Julliard : wordpad: Don't offer vertical fonts in the font dialog .

Alexandre Julliard julliard at winehq.org
Tue Jun 25 14:41:24 CDT 2013


Module: wine
Branch: master
Commit: fb6b0f93c2493aed23d17c27c05b7f64c7c66702
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fb6b0f93c2493aed23d17c27c05b7f64c7c66702

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 25 12:39:41 2013 +0200

wordpad: Don't offer vertical fonts in the font dialog.

---

 programs/wordpad/wordpad.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c
index 8a2afc4..8468148 100644
--- a/programs/wordpad/wordpad.c
+++ b/programs/wordpad/wordpad.c
@@ -576,7 +576,7 @@ static void dialog_choose_font(void)
     cf.lStructSize = sizeof(cf);
     cf.hwndOwner = hMainWnd;
     cf.lpLogFont = &lf;
-    cf.Flags = CF_SCREENFONTS | CF_NOSCRIPTSEL | CF_INITTOLOGFONTSTRUCT | CF_EFFECTS;
+    cf.Flags = CF_SCREENFONTS | CF_NOSCRIPTSEL | CF_INITTOLOGFONTSTRUCT | CF_EFFECTS | CF_NOVERTFONTS;
 
     ZeroMemory(&fmt, sizeof(fmt));
     fmt.cbSize = sizeof(fmt);
@@ -619,6 +619,8 @@ static int CALLBACK enum_font_proc(const LOGFONTW *lpelfe, const TEXTMETRICW *lp
 {
     HWND hListWnd = (HWND) lParam;
 
+    if (lpelfe->lfFaceName[0] == '@') return 1;  /* ignore vertical fonts */
+
     if(SendMessageW(hListWnd, CB_FINDSTRINGEXACT, -1, (LPARAM)lpelfe->lfFaceName) == CB_ERR)
     {
 




More information about the wine-cvs mailing list