From 7140da34edaa688e9b48bf92a117ae5887265500 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 30 May 2015 10:15:48 +0000 Subject: [PATCH] [NOTEPAD] Fix loading font settings. By Lee Schroeder. CORE-9074 svn path=/trunk/; revision=67962 --- reactos/base/applications/notepad/settings.c | 22 +++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/reactos/base/applications/notepad/settings.c b/reactos/base/applications/notepad/settings.c index 5391440bade..301d9e80bf9 100644 --- a/reactos/base/applications/notepad/settings.c +++ b/reactos/base/applications/notepad/settings.c @@ -162,11 +162,31 @@ void NOTEPAD_LoadSettingsFromRegistry(void) if (dwPointSize != 0) Globals.lfFont.lfHeight = HeightFromPointSize(dwPointSize); + else + Globals.lfFont.lfHeight = HeightFromPointSize(100); RegCloseKey(hKey); } + else + { + /* If no settings are found in the registry, then use default values */ + Globals.lfFont.lfCharSet = 163; + Globals.lfFont.lfClipPrecision = 2; + Globals.lfFont.lfEscapement = 0; + _tcscpy(Globals.lfFont.lfFaceName, _T("Arial")); + Globals.lfFont.lfItalic = 0; + Globals.lfFont.lfOrientation = 0; + Globals.lfFont.lfOutPrecision = 3; + Globals.lfFont.lfPitchAndFamily = 34; + Globals.lfFont.lfQuality = 1; + Globals.lfFont.lfStrikeOut = 0; + Globals.lfFont.lfUnderline = 0; + Globals.lfFont.lfWeight = 400; + Globals.lfFont.lfHeight = HeightFromPointSize(100); + } hFont = CreateFontIndirect(&Globals.lfFont); + SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)hFont, (LPARAM)TRUE); if (hFont) { if (Globals.hFont) @@ -199,7 +219,7 @@ void NOTEPAD_SaveSettingsToRegistry(void) GetWindowRect(Globals.hMainWnd, &Globals.main_rect); if (RegCreateKeyEx(HKEY_CURRENT_USER, s_szRegistryKey, - 0, NULL, 0, KEY_ALL_ACCESS, NULL, + 0, NULL, 0, KEY_SET_VALUE, NULL, &hKey, &dwDisposition) == ERROR_SUCCESS) { SaveDword(hKey, _T("lfCharSet"), Globals.lfFont.lfCharSet);