From 312ea8e72cd9c7d762168270863c416d2b31fbf9 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Wed, 13 May 2020 18:36:46 +0200 Subject: [PATCH] notepad: Use int for point size value. Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- programs/notepad/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index fee15ce6a34..3f046f19d19 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -215,7 +215,8 @@ static VOID NOTEPAD_LoadSettingFromRegistry(void) if(RegOpenKeyW(HKEY_CURRENT_USER, notepad_reg_key, &hkey) == ERROR_SUCCESS) { WORD data_helper[MAX_PATH]; - DWORD type, data, size; + DWORD type, size; + int point_size; #define QUERY_NOTEPAD_REG(hkey, value_name, ret) do { DWORD type, data; DWORD size = sizeof(DWORD); if(RegQueryValueExW(hkey, value_name, 0, &type, (LPBYTE)&data, &size) == ERROR_SUCCESS) if(type == REG_DWORD) ret = data; } while(0) QUERY_NOTEPAD_REG(hkey, value_fWrap, Globals.bWrapLongLines); @@ -244,10 +245,10 @@ static VOID NOTEPAD_LoadSettingFromRegistry(void) main_rect.bottom = main_rect.top + dy; size = sizeof(DWORD); - if(RegQueryValueExW(hkey, value_iPointSize, 0, &type, (LPBYTE)&data, &size) == ERROR_SUCCESS) + if(RegQueryValueExW(hkey, value_iPointSize, 0, &type, (LPBYTE)&point_size, &size) == ERROR_SUCCESS) if(type == REG_DWORD) /* The value is stored as 10 * twips */ - Globals.lfFont.lfHeight = -MulDiv(abs(data), get_dpi(), 720); + Globals.lfFont.lfHeight = -MulDiv(abs(point_size), get_dpi(), 720); size = sizeof(Globals.lfFont.lfFaceName); if(RegQueryValueExW(hkey, value_lfFaceName, 0, &type, (LPBYTE)&data_helper, &size) == ERROR_SUCCESS)