Michael Stefaniuc : notepad: Use the ARRAY_SIZE() macro if we already have it.

[Alexandre Julliard]

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

Author: Michael Stefaniuc <mstefani(a)redhat.de>
Date:   Wed May 27 23:49:13 2009 +0200

notepad: Use the ARRAY_SIZE() macro if we already have it.

---

 programs/notepad/dialog.c |    2 +-
 programs/notepad/main.c   |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c
index 761705b..d7354e7 100644
--- a/programs/notepad/dialog.c
+++ b/programs/notepad/dialog.c
@@ -257,7 +257,7 @@ void DoOpenFile(LPCWSTR szFileName)
     SetFocus(Globals.hEdit);
     
     /*  If the file starts with .LOG, add a time/date at the end and set cursor after */
-    if (GetWindowTextW(Globals.hEdit, log, sizeof(log)/sizeof(log[0])) && !lstrcmpW(log, dotlog))
+    if (GetWindowTextW(Globals.hEdit, log, ARRAY_SIZE(log)) && !lstrcmpW(log, dotlog))
     {
 	static const WCHAR lfW[] = { '\r','\n',0 };
         SendMessageW(Globals.hEdit, EM_SETSEL, GetWindowTextLengthW(Globals.hEdit), -1);
diff --git a/programs/notepad/main.c b/programs/notepad/main.c
index 57018ce..c195668 100644
--- a/programs/notepad/main.c
+++ b/programs/notepad/main.c
@@ -203,10 +203,10 @@ static VOID NOTEPAD_LoadSettingFromRegistry(void)
     Globals.lfFont.lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE;
     lstrcpyW(Globals.lfFont.lfFaceName, systemW);
 
-    LoadStringW(Globals.hInstance, STRING_PAGESETUP_HEADERVALUE, Globals.szHeader,
-                sizeof(Globals.szHeader) / sizeof(Globals.szHeader[0]));
-    LoadStringW(Globals.hInstance, STRING_PAGESETUP_FOOTERVALUE, Globals.szFooter,
-                sizeof(Globals.szFooter) / sizeof(Globals.szFooter[0]));
+    LoadStringW(Globals.hInstance, STRING_PAGESETUP_HEADERVALUE,
+                Globals.szHeader, ARRAY_SIZE(Globals.szHeader));
+    LoadStringW(Globals.hInstance, STRING_PAGESETUP_FOOTERVALUE,
+                Globals.szFooter, ARRAY_SIZE(Globals.szFooter));
 
     if(RegOpenKeyW(HKEY_CURRENT_USER, notepad_reg_key, &hkey) == ERROR_SUCCESS)
     {