Changeset 945 for trunk/dll/misc.c

Timestamp:

Feb 10, 2008, 7:57:29 PM (18 years ago)

Author:

Gregg Young

Message:

Cleanup of direct edit of subjects and longname fix (ticket 210)

File:

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

trunk/dll/misc.c

@@ -719 +719 @@
           USHORT len;
           CHAR *eaval;
-          LONG retlen;
+          LONG retlen;
+          PSZ psz;
 
           retlen = WinQueryWindowText(hwndMLE, sizeof(szSubject), szSubject);
           szSubject[retlen + 1] = 0;
           bstrip(szSubject);
-          if (pci->pszSubject != NullStr)
-            pci->pszSubject = xrealloc(pci->pszSubject, retlen + 1, pszSrcFile, __LINE__);
+          if (pci->pszSubject != NullStr) {
+            if (retlen == 0) {
+              psz = pci->pszSubject;
+              pci->pszSubject = NullStr;
+              xfree(psz);
+            }
+            else
+              pci->pszSubject = xrealloc(pci->pszSubject, retlen + 1, pszSrcFile, __LINE__);
+          }
           else
-            pci->pszSubject = xstrdup(szSubject, pszSrcFile, __LINE__);
+            pci->pszSubject = xmalloc(retlen + 1, pszSrcFile, __LINE__);
           len = strlen(szSubject);
           if (len)
@@ -770 +778 @@
 
           CHAR longname[CCHMAXPATHCOMP];
-          LONG retlen;
+          LONG retlen;
+          PSZ psz;
 
           *longname = 0;
@@ -778 +787 @@
           bstrip(longname);
           WinSetWindowText(hwndMLE, longname);
-          if (pci->pszLongName != NullStr)
-            pci->pszLongName = xrealloc(pci->pszLongName, retlen + 1, pszSrcFile, __LINE__);
+          if (pci->pszLongName != NullStr) {
+            if (retlen == 0) {
+              psz = pci->pszLongName;
+              pci->pszLongName = NullStr;
+              xfree(psz);
+            }
+            else
+              pci->pszLongName = xrealloc(pci->pszLongName, retlen + 1, pszSrcFile, __LINE__);
+          }
           else
-            pci->pszLongName = xstrdup(longname, pszSrcFile, __LINE__);
+            pci->pszLongName = xmalloc(retlen + 1, pszSrcFile, __LINE__);
           return (MRESULT) WriteLongName(pci->pszFileName, longname);
         }