Changeset 937 for trunk/dll/misc.c

Timestamp:

Jan 21, 2008, 9:30:20 PM (18 years ago)

Author:

Gregg Young

Message:

Fix for subject display corruption with the if else statements included this time

File:

• trunk/dll/misc.c (modified) (2 diffs)

trunk/dll/misc.c

@@ -721 +721 @@
           retlen = WinQueryWindowText(hwndMLE, sizeof(szSubject), szSubject);
           szSubject[retlen + 1] = 0;
-          bstrip(szSubject);
-          pci->pszSubject = xrealloc(pci->pszSubject, retlen + 1, pszSrcFile, __LINE__);
-          WinSetWindowText(hwndMLE, szSubject);
-          pci->pszSubject = xstrdup(szSubject, pszSrcFile, __LINE__);
+          bstrip(szSubject);
+          if (pci->pszSubject != NullStr)
+            pci->pszSubject = xrealloc(pci->pszSubject, retlen + 1, pszSrcFile, __LINE__);
+          else
+            pci->pszSubject = xstrdup(szSubject, pszSrcFile, __LINE__);
           len = strlen(szSubject);
           if (len)
@@ -772 +773 @@
           retlen = WinQueryWindowText(hwndMLE, sizeof(longname), longname);
           longname[retlen + 1] = 0;
-          chop_at_crnl(longname);
-          pci->pszLongName = xrealloc(pci->pszLongName, retlen + 1, pszSrcFile, __LINE__);
+          chop_at_crnl(longname);
+          bstrip(longname);
           WinSetWindowText(hwndMLE, longname);
-          pci->pszLongName = xstrdup(longname, pszSrcFile, __LINE__);
-          //pci->pszFileName = xrealloc(pci->pszFileName, retlen + 1, pszSrcFile, __LINE__);
+          if (pci->pszLongName != NullStr)
+            pci->pszLongName = xrealloc(pci->pszLongName, retlen + 1, pszSrcFile, __LINE__);
+          else
+            pci->pszLongName = xstrdup(longname, pszSrcFile, __LINE__);
           return (MRESULT) WriteLongName(pci->pszFileName, longname);
         }