Rolf Kalbermatter : notepad: Fix a possible rounding error when storing the font point size to the registry .

Alexandre Julliard julliard at wine.codeweavers.com
Mon Apr 2 06:23:06 CDT 2007


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

Author: Rolf Kalbermatter <r.kalbermatter at hccnet.nl>
Date:   Sun Apr  1 16:23:31 2007 +0200

notepad: Fix a possible rounding error when storing the font point size to the registry.

---

 programs/notepad/main.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/programs/notepad/main.c b/programs/notepad/main.c
index 0f5d3d2..6bd6ed8 100644
--- a/programs/notepad/main.c
+++ b/programs/notepad/main.c
@@ -144,7 +144,8 @@ static VOID NOTEPAD_SaveSettingToRegistry(void)
         SET_NOTEPAD_REG(hkey, value_iMarginRight,     Globals.iMarginRight);
 #undef SET_NOTEPAD_REG
 
-        data = (DWORD)(abs(Globals.lfFont.lfHeight) * 72 / get_dpi() * 10); /* method of native notepad.exe */
+        /* Store the current value as 10 * twips */
+        data = MulDiv(abs(Globals.lfFont.lfHeight), 720 , get_dpi());
         RegSetValueEx(hkey, value_iPointSize, 0, REG_DWORD, (LPBYTE)&data, sizeof(DWORD));
 
         RegSetValueEx(hkey, value_lfFaceName, 0, REG_SZ, (LPBYTE)&Globals.lfFont.lfFaceName,
@@ -239,7 +240,8 @@ static VOID NOTEPAD_LoadSettingFromRegistry(void)
         size = sizeof(DWORD);
         if(RegQueryValueEx(hkey, value_iPointSize, 0, &type, (LPBYTE)&data, &size) == ERROR_SUCCESS)
             if(type == REG_DWORD)
-                Globals.lfFont.lfHeight = (LONG)(-abs(data / 10 * get_dpi() / 72)); /* method of native notepad.exe */
+                /* The value is stored as 10 * twips */
+                Globals.lfFont.lfHeight = -MulDiv(abs(data), get_dpi(), 720);
 
         size = sizeof(Globals.lfFont.lfFaceName);
         if(RegQueryValueEx(hkey, value_lfFaceName, 0, &type, (LPBYTE)&data_helper, &size) == ERROR_SUCCESS)




More information about the wine-cvs mailing list