Index: base/applications/notepad/dialog.c
===================================================================
--- base/applications/notepad/dialog.c	(revision 51010)
+++ base/applications/notepad/dialog.c	(working copy)
@@ -117,10 +117,10 @@
  */
 static void UpdateWindowCaption(void)
 {
-  TCHAR szCaption[MAX_STRING_LEN];
+  TCHAR szCaption[MAX_STRING_LEN] = _T("");
   TCHAR szNotepad[MAX_STRING_LEN];
 
-  LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad));
+  LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, MAX_STRING_LEN);
 
   if (Globals.szFileTitle[0] != '\0')
   {
@@ -128,7 +128,7 @@
   }
   else
   {
-      LoadString(Globals.hInstance, STRING_UNTITLED, szCaption, SIZEOF(szCaption));
+      LoadString(Globals.hInstance, STRING_UNTITLED, szCaption, MAX_STRING_LEN);
   }
   
   StringCchCat(szCaption, MAX_STRING_LEN, _T(" - "));
@@ -142,11 +142,11 @@
    TCHAR szResource[MAX_STRING_LEN];
 
    /* Load and format szMessage */
-   LoadString(Globals.hInstance, STRING_NOTFOUND, szResource, SIZEOF(szResource));
+   LoadString(Globals.hInstance, STRING_NOTFOUND, szResource, MAX_STRING_LEN);
    wsprintf(szMessage, szResource, szFileName);
 
    /* Load szCaption */
-   LoadString(Globals.hInstance, STRING_NOTEPAD,  szResource, SIZEOF(szResource));
+   LoadString(Globals.hInstance, STRING_NOTEPAD,  szResource, MAX_STRING_LEN);
 
    /* Display Modal Dialog */
    MessageBox(Globals.hMainWnd, szMessage, szResource, MB_ICONEXCLAMATION);
@@ -158,14 +158,14 @@
    TCHAR szResource[MAX_STRING_LEN];
    TCHAR szUntitled[MAX_STRING_LEN];
 
-   LoadString(Globals.hInstance, STRING_UNTITLED, szUntitled, SIZEOF(szUntitled));
+   LoadString(Globals.hInstance, STRING_UNTITLED, szUntitled, MAX_STRING_LEN);
 
    /* Load and format Message */
-   LoadString(Globals.hInstance, STRING_NOTSAVED, szResource, SIZEOF(szResource));
+   LoadString(Globals.hInstance, STRING_NOTSAVED, szResource, MAX_STRING_LEN);
    wsprintf(szMessage, szResource, szFileName[0] ? szFileName : szUntitled);
 
    /* Load Caption */
-   LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, SIZEOF(szResource));
+   LoadString(Globals.hInstance, STRING_NOTEPAD, szResource, MAX_STRING_LEN);
 
    /* Display modal */
    return MessageBox(Globals.hMainWnd, szMessage, szResource, MB_ICONEXCLAMATION|MB_YESNOCANCEL);