Changeset 1102 for trunk/dll/dircnrs.c

Timestamp:

08/02/08 22:29:35 (4 months ago)

Author:

gyoung

Message:

Make the variable passed to treecnr UM_RESCAN a pointer to a temp variable every where to avoid freeing pci->pszFileName or dcd->directory early

Files:

• trunk/dll/dircnrs.c (modified) (4 diffs)

trunk/dll/dircnrs.c

@@ -46 +46 @@
   20 Jul 08 GKY Add save/append filename to clipboard.
                 Change menu wording to make these easier to find
+  02 Aug 08 GKY Always pass temp variable point to treecnr UM_SHOWME to avoid
+                freeing dcd->directory early
 
 ***********************************************************************/
@@ -781 +783 @@
       }
       if (fSwitchTree && hwndTree) {
+        PSZ pszTempDir = xstrdup(dcd->directory, pszSrcFile, __LINE__);
+
         if (hwndMain) {
-          if (TopWindow(hwndMain, (HWND) 0) == dcd->hwndFrame)
-            WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(dcd->directory), MPVOID);
-        }
-        else
-          WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(dcd->directory), MPVOID);
+          if (TopWindow(hwndMain, (HWND) 0) == dcd->hwndFrame && pszTempDir)
+            if (!WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
+              free(pszTempDir);
+        }
+        else {
+          if (pszTempDir)
+            if (!WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
+              free(pszTempDir);
+        }
       }
       dcd->firsttree = FALSE;
@@ -1334 +1342 @@
       LastDir = hwnd;
       PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
-      if (fSwitchTreeOnFocus && hwndTree && dcd && *dcd->directory)
-        WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(dcd->directory), MPVOID);
+      if (fSwitchTreeOnFocus && hwndTree && dcd && *dcd->directory) {
+        PSZ pszTempDir = xstrdup(dcd->directory, pszSrcFile, __LINE__);
+
+        if (pszTempDir) {
+          if (!WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
+            free(pszTempDir);
+        }
+      }
     }
     break;
@@ -1843 +1857 @@
 
       case IDM_FINDINTREE:
-        if (hwndTree)
-          WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(dcd->directory),
-                     MPFROMLONG(1L));
+        if (hwndTree) {
+          PSZ pszTempDir = xstrdup(dcd->directory, pszSrcFile, __LINE__);
+
+          if (pszTempDir) {
+            if (!WinSendMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir),
+                            MPFROMLONG(1L)))
+              free(pszTempDir);
+          }
+        }
         break;