Changeset 756 for trunk/dll/misc.c

Timestamp:

Aug 4, 2007, 1:33:52 AM (18 years ago)

Author:

Gregg Young

Message:

Cleanup for ticket 138 & 24

File:

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

trunk/dll/misc.c

@@ -27 +27 @@
   23 Jul 07 SHL Sync with CNRITEM updates (ticket#24)
   31 Jul 07 SHL Clean up and report errors (ticket#24)
+  03 Aug 07 GKY Direct editting fixed (ticket#24)
 
 ***********************************************************************/
@@ -661 +662 @@
           !IsRoot(pci->pszFileName) &&
           !(pci->flags & RECFLAGS_ENV) && !(pci->flags & RECFLAGS_UNDERENV)) {
-        if (!pfi || pfi->offStruct == FIELDOFFSET(CNRITEM, pszFileName)) {
+        if (!pfi || pfi->offStruct == FIELDOFFSET(CNRITEM, pszDisplayName)) {
           PostMsg(hwnd, UM_FIXEDITNAME, MPFROMP(pci->pszFileName), MPVOID);
         }
@@ -695 +696 @@
           retlen = WinQueryWindowText(hwndMLE, sizeof(szSubject), szSubject);
           szSubject[retlen + 1] = 0;
-          chop_at_crnl(szSubject);
-          bstrip(szSubject);
+          //chop_at_crnl(szSubject);
+          bstrip(szSubject);
+          pci->pszSubject = xrealloc(pci->pszSubject, retlen + 1, pszSrcFile, __LINE__);
           WinSetWindowText(hwndMLE, szSubject);
           len = strlen(szSubject);
@@ -746 +748 @@
           retlen = WinQueryWindowText(hwndMLE, sizeof(longname), longname);
           longname[retlen + 1] = 0;
-          chop_at_crnl(longname);
+          //chop_at_crnl(longname);
+          pci->pszLongname = xrealloc(pci->pszLongname, retlen + 1, pszSrcFile, __LINE__);
           WinSetWindowText(hwndMLE, longname);
-          pci->pszFileName = xrealloc(pci->pszFileName, sizeof(longname), pszSrcFile, __LINE__);
+          pci->pszFileName = xrealloc(pci->pszFileName, retlen + 1, pszSrcFile, __LINE__);
           return (MRESULT) WriteLongName(pci->pszFileName, longname);
         }
-        else {
-          pci->pszFileName = pci->pszDisplayName;
-          WinQueryWindowText(hwndMLE, sizeof(szData), szData);
-          pci->pszFileName = xrealloc(pci->pszFileName, sizeof(szData), pszSrcFile, __LINE__);
+        else {
+          WinQueryWindowText(hwndMLE, sizeof(szData), szData);
           if (strchr(szData, '?') ||
               strchr(szData, '*') || IsRoot(pci->pszFileName))
@@ -769 +770 @@
                 return FALSE;
             if (DosQueryPathInfo(pci->pszFileName,
-                                 FIL_QUERYFULLNAME, szData, sizeof(szData)))
-              strcpy(szData, pci->pszFileName);
+                                 FIL_QUERYFULLNAME, szData, sizeof(szData))){
+              pci->pszFileName = xrealloc(pci->pszFileName, sizeof(szData), pszSrcFile, __LINE__);
+              strcpy(szData, pci->pszFileName);
+            }
             WinSetWindowText(hwndMLE, szData);
             if (strcmp(szData, testname)) {
@@ -815 +818 @@
                    MPFROMP(&pci),
                    MPFROM2SHORT(1, CMA_ERASE | CMA_TEXTCHANGED));
-        if (pfi && pfi->offStruct == FIELDOFFSET(CNRITEM, pszFileName))
+        if (pfi && pfi->offStruct == FIELDOFFSET(CNRITEM, pszDisplayName))
           PostMsg(hwnd, UM_SORTRECORD, MPVOID, MPVOID);
       }
@@ -821 +824 @@
         USHORT cmd = 0;
 
-        if (!pfi || pfi->offStruct == FIELDOFFSET(CNRITEM, pszFileName))
+        if (!pfi || pfi->offStruct == FIELDOFFSET(CNRITEM, pszDisplayName))
           cmd = IDM_SORTSMARTNAME;
         else if (pfi->offStruct == FIELDOFFSET(CNRITEM, cbFile))