Another attempt to fix notepad windows - removed static buffers

nickgammon · Jan 20, 2018 · ed1aa5d · ed1aa5d
1 parent 86586c8
commit ed1aa5d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/Utilities.cpp b/Utilities.cpp
@@ -2602,7 +2602,7 @@ return (first[0] << 8) + first[1];
 // i18n (Internationalization) stuff
 
 // translate message (eg. "File cannot be opened") into locale-specific language     
-const char * TranslateGeneric (const char * sText, const char * sSection)
+CString TranslateGeneric (const char * sText, const char * sSection)
   {
   static bool bInTranslateGeneric = false;  // stop stack overflow if we are re-called
 
@@ -2656,7 +2656,7 @@ const char * TranslateGeneric (const char * sText, const char * sSection)
 /* valid flags in a format specification */
 #define FORMATFLAGS	"-+ #0"
 
-const char * TFormat (const char * sFormat, ...)
+CString TFormat (const char * sFormat, ...)
   {
 
   static bool bInTFormat = false;   // stop stack overflow if we are re-called

diff --git a/dialogs/cmdhist.cpp b/dialogs/cmdhist.cpp
@@ -243,7 +243,7 @@ CString str;
 
   // edit current input window
   CreateTextWindow ((LPCTSTR) str,     // command
-                    TFormat ("Notepad: %s", (LPCTSTR) m_pDoc->m_mush_name),     // title
+                    (LPCTSTR) TFormat ("Notepad: %s", (LPCTSTR) m_pDoc->m_mush_name),     // title
                     m_pDoc,   // document
                     m_pDoc->m_iUniqueDocumentNumber,      // document number
                     m_pDoc->m_input_font_name,

diff --git a/doc.cpp b/doc.cpp
@@ -5127,7 +5127,7 @@ CString strMessage;
 
   if (!strMessage.IsEmpty ())
     CreateTextWindow ((LPCTSTR) strMessage,
-                      TFormat ("Recall: %s",
+                      (LPCTSTR) TFormat ("Recall: %s",
                          (LPCTSTR) m_RecallFindInfo.m_strFindStringList.GetHead ()),
                       this,
                       m_iUniqueDocumentNumber,
@@ -5795,7 +5795,7 @@ CTextDocument * pTextDoc = NULL;
     } // end of having an existing notepad document
   else
     CreateTextWindow ("",     // contents
-                      TFormat ("Notepad: %s", (LPCTSTR) m_mush_name),     // title
+                      (LPCTSTR) TFormat ("Notepad: %s", (LPCTSTR) m_mush_name),     // title
                       this,   // document
                       m_iUniqueDocumentNumber,      // document number
                       m_input_font_name,

diff --git a/mushview.cpp b/mushview.cpp
@@ -5442,7 +5442,7 @@ CString strSelection;
 
   // edit current input window
   CreateTextWindow ((LPCTSTR) strSelection,     // contents
-                    TFormat ("Notepad: %s", (LPCTSTR) pDoc->m_mush_name),     // title
+                    (LPCTSTR) TFormat ("Notepad: %s", (LPCTSTR) pDoc->m_mush_name),     // title
                     pDoc,   // document
                     pDoc->m_iUniqueDocumentNumber,      // document number
                     pDoc->m_input_font_name,
@@ -5495,7 +5495,7 @@ CString strMessage;
                                 pDoc->m_strRecallLinePreamble);  // default preamble    
 
   CreateTextWindow ((LPCTSTR) strMessage,
-                    TFormat ("Recall: %s",
+                    (LPCTSTR) TFormat ("Recall: %s",
                        (LPCTSTR) strSelection),
                     pDoc,
                     pDoc->m_iUniqueDocumentNumber,

diff --git a/sendvw.cpp b/sendvw.cpp
@@ -2322,7 +2322,7 @@ CString strCurrent;
 
   // edit current input window
   CreateTextWindow ((LPCTSTR) strCurrent,     // selection
-                    TFormat ("Notepad: %s", (LPCTSTR) pDoc->m_mush_name),     // title
+                    (LPCTSTR) TFormat ("Notepad: %s", (LPCTSTR) pDoc->m_mush_name),     // title
                     pDoc,   // document
                     pDoc->m_iUniqueDocumentNumber,      // document number
                     pDoc->m_input_font_name,

diff --git a/stdafx.h b/stdafx.h
@@ -814,10 +814,10 @@ extern "C" const unsigned char _pcre_utf8_table4[];
 int UMessageBox (const char * sText, UINT nType = MB_OK, const char * = "MUSHclient");
 // translate lpszText and then call UMessageBox
 int TMessageBox (const char * sText, UINT nType = MB_OK);
-// translate text - result is statically allocated - do not attempt to modify or store it
-const char * TranslateGeneric (const char * sText, const char * sSection);
-// translate formatted text - result is statically allocated - do not attempt to modify or store it
-const char * TFormat (const char * sFormat, ...);
+// translate text
+CString TranslateGeneric (const char * sText, const char * sSection);
+// translate formatted text
+CString TFormat (const char * sFormat, ...);
 // translate a static string
 #define Translate(string) TranslateGeneric (string, "messages")
 // translate a date/time string