Changeset 1833

Timestamp:

Jul 14, 2015, 1:07:26 AM (10 years ago)

Author:

Gregg Young

Message:

A correct (I hope as always) fix for the direct edits. I don't need to reallocate pci-pszFileName or repoint pci->pszDisplayName because updatecnritems does it for me. I also got the tree container to update without using removecnritems. Ticket [557]

Location:

trunk/dll

Files:

• common.c (modified) (2 diffs)
• misc.c (modified) (4 diffs)

trunk/dll/common.c

@@ -33 +33 @@
   14 Sep 09 SHL Blink thread LEDs while threads working
   17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
-  12 Jul 15 GKY Fix CN_REALLOCPSZ file name editing code to: 1) Actually reallocate the buffer.
-                2) Point pci->pszDisplayName into the new buffer 3) Eliminate the possibility
-                of updating the container before CN_ENDEDIT is called. 4) Only call RemoveCnrItems
+  13 Jul 15 GKY Fix CN_REALLOCPSZ file name editing code to: 1) Eliminate the possibility of
+                updating the container before CN_ENDEDIT is called. 2) Don't call RemoveCnrItems
                 for tree container and collector.
 
@@ -875 +874 @@
       }
       else if (mp2) {
-        if ((INT) mp1 == -1) {
-          PCNRITEM pci = (PCNRITEM) mp2;
-          RemoveCnrItems(hwnd, pci, 1, CMA_FREE | CMA_INVALIDATE);
-        }
-        else {
-          Broadcast(WinQueryAnchorBlock(hwnd),
-                    dcd->hwndParent, UM_UPDATERECORD, mp2, MPVOID);
-          xfree(mp2, pszSrcFile, __LINE__);
-        }
+        Broadcast(WinQueryAnchorBlock(hwnd),
+                  dcd->hwndParent, UM_UPDATERECORD, mp2, MPVOID);
+        xfree(mp2, pszSrcFile, __LINE__);
       }
     }

trunk/dll/misc.c

@@ -72 +72 @@
   12 Nov 11 GKY Fixed HelpViewer's failure to open help files and subsequent failure with files with spaces.
   28 Jun 14 GKY Fix errors identified with CPPCheck
-  12 Jul 15 GKY Fix CN_REALLOCPSZ file name editing code to: 1) Actually reallocate the buffer.
-                2) Point pci->pszDisplayName into the new buffer 3) Eliminate the possibility
-                of updating the container before CN_ENDEDIT is called. 4) Only call RemoveCnrItems
+  12 Jul 15 GKY Fix CN_REALLOCPSZ file name editing code to: 1) Eliminate the possibility of
+                updating the container before CN_ENDEDIT is called. 2) Don't call RemoveCnrItems
                 for tree container and collector.
 
@@ -979 +978 @@
             Runtime_Error(pszSrcFile, __LINE__, "bad name");
           else {
-            DIRCNRDATA *dcd;
-            FILEFINDBUF4L ffb;
-            HDIR hDir = HDIR_CREATE;
-            ULONG nm = 1;
-            CHAR *p;
-
             if (DosQueryPathInfo(testname, //Why does this return 0 when the file doesn't exist?
                                  FIL_QUERYFULLNAME, // No new directory creation?
@@ -993 +986 @@
                                  oldname, sizeof(oldname)))
               strcpy(oldname, pci->pszFileName);
-            psz = xrealloc(pci->pszFileName, sizeof(oldname), pszSrcFile, __LINE__);
-            if (psz)
-              pci->pszFileName = psz;
-            else {
-              xfree(pci->pszFileName, pszSrcFile, __LINE__);
-              pci->pszFileName = NullStr;
-              return FALSE; // out of memory
-            }
-            if (!dcd)    // Point pci->pszDisplayName into the realloc pci->pszFileName
-              dcd = INSTDATA(hwnd);
-            rc = xDosFindFirst(pci->pszFileName,
-                               &hDir,
-                               FILE_NORMAL | FILE_DIRECTORY |
-                               FILE_ARCHIVED | FILE_READONLY |
-                               FILE_HIDDEN | FILE_SYSTEM,
-                               &ffb, sizeof(ffb), &nm, FIL_QUERYEASIZEL);
-            if (!rc) {  // file exists
-              DosFindClose(hDir);
-              if (dcd->type == DIR_FRAME || dcd->type == TREE_FRAME) {
-                p = strrchr(pci->pszFileName, '\\');
-                if (!p) {
-                  p = strrchr(pci->pszFileName, ':');
-                  if (!p)
-                    p = pci->pszFileName;
-                  else
-                    p++;
-                }
-                else if ((dcd && dcd->type == TREE_FRAME) ||
-                         !(ffb.attrFile & FILE_DIRECTORY) || !*(p + 1))
-                  p++;
-                if (!*p)
-                  p = pci->pszFileName;
-              }
-              else
-                p = pci->pszFileName;
-              pci->pszDisplayName = p;
-            }
-            else
-              return FALSE; // nothing to rename
             WinSetWindowText(hwndMLE, oldname);
             if (strcmp(oldname, newname)) { 
@@ -1076 +1030 @@
             free(filename);
         }
-        if (dcd && (dcd->type == TREE_FRAME || dcd->type == COLLECTOR_FRAME))
-          PostMsg(hwnd, UM_FIXEDITNAME, MPFROMLONG(-1), MPFROMP(pci));
         filename = xstrdup(newname, pszSrcFile, __LINE__);
         if (filename) {