Changeset 1456

Timestamp:

Sep 15, 2009, 9:13:40 AM (16 years ago)

Author:

Steven Levine

Message:

Avoid crash on Ctrl-g from collector window

Location:

trunk/dll

Files:

• collect.c (modified) (8 diffs)
• fm3dll2.h (modified) (1 diff)
• grep.c (modified) (1 diff)
• treecnr.c (modified) (2 diffs)

trunk/dll/collect.c

@@ -67 +67 @@
   06 Jun 09 GKY Add option to show file system type or drive label in tree
   12 Jul 09 GKY Add szFSType to FillInRecordFromFSA use to bypass EA scan and size formatting
-                for tree container
+                for tree container
   13 Jul 09 GKY Fixed double free of memory buffer in UM_COLLECTFROMFILE
+  15 Sep 09 SHL Use UM_GREP when passing pathname
 
 ***********************************************************************/
@@ -839 +840 @@
                 dcd->ullTotalBytes += FillInRecordFromFSA(dcd->hwndCnr, pci,
                                                           fullname,
-                                                          &fs4, FALSE, 0, dcd);
+                                                          &fs4, FALSE, NULL, dcd);
                 memset(&ri, 0, sizeof(RECORDINSERT));
                 ri.cb = sizeof(RECORDINSERT);
@@ -1341 +1342 @@
             }
             CommaFmtULL(tb, sizeof(tb), pci->cbFile + pci->easize, ' ');
-            if (!fMoreButtons) {
-              DateFormat(szDate, pci->date);
+            if (!fMoreButtons) {
+              DateFormat(szDate, pci->date);
               sprintf(s, " %s  %s %02u%s%02u%s%02u  [%s]  %s",
                       tb, szDate, pci->time.hours, TimeSeparator, pci->time.minutes,
@@ -1359 +1360 @@
           }
           if (fMoreButtons) {
-            WinSetWindowText(hwndName, pci->pszFileName);
-            DateFormat(szDate, pci->date);
+            WinSetWindowText(hwndName, pci->pszFileName);
+            DateFormat(szDate, pci->date);
             sprintf(s, "%s %02u%s%02u%s%02u",
                     szDate, pci->time.hours, TimeSeparator, pci->time.minutes,
@@ -1944 +1945 @@
 
       case IDM_GREP:
+      case UM_GREP:
         if (dcd->amextracted) {
           saymsg(MB_OK | MB_ICONASTERISK,
@@ -1956 +1958 @@
           if (GrepInfo) {
             GrepInfo->hwnd = &hwnd;
-            if (mp2)
+            if (msg == UM_GREP && mp2)
               GrepInfo->szGrepPath = mp2;
             if (WinDlgBox(HWND_DESKTOP, hwnd, GrepDlgProc,
@@ -2732 +2734 @@
                   }
                   CommaFmtULL(tb, sizeof(tb), pci->cbFile + pci->easize, ' ');
-                  if (!fMoreButtons) {
-                    DateFormat(szDate, pci->date);
+                  if (!fMoreButtons) {
+                    DateFormat(szDate, pci->date);
                     sprintf(s, " %s  %s %02u%s%02u%s%02u  [%s]  %s",
                             tb, szDate, pci->time.hours, TimeSeparator,
                             pci->time.minutes, TimeSeparator, pci->time.seconds,
-                            pci->pszDispAttr, p);
-                  }
+                            pci->pszDispAttr, p);
+                  }
                   else {
                     if (pci->cbFile + pci->easize > 1024)
@@ -2752 +2754 @@
                 }
                 if (fMoreButtons) {
-                  WinSetWindowText(hwndName, pci->pszFileName);
-                  DateFormat(szDate, pci->date);
+                  WinSetWindowText(hwndName, pci->pszFileName);
+                  DateFormat(szDate, pci->date);
                   sprintf(s, "%s %02u%s%02u%s%02u",
                           szDate, pci->time.hours, TimeSeparator, pci->time.minutes,

trunk/dll/fm3dll2.h

@@ -741 +741 @@
 #define UM_HIDENOTSELECTED  (WM_USER + 73)
 #define UM_FIRSTTIME        (WM_USER + 74)
-// #define UM_ACTIONSTATE      (WM_USER + 75)   // 13 Sep 09 SHL unused SHL
+#define UM_GREP             (WM_USER + 75)   // 15 Sep 09 SHL
 #define UM_FILLUSERLIST     (WM_USER + 75)
 #define UM_CONTAINERDIR     (WM_USER + 76)

trunk/dll/grep.c

@@ -528 +528 @@
           }
           DoAllSubdirs(grep, searchPath, TRUE, fle, numfls, pitdSleep, pitdReport);
-          // DosSleep(0); //26 Aug 07 GKY 1     // 07 Feb 08 SHL
         }
       }

trunk/dll/treecnr.c

@@ -76 +76 @@
   22 Jul 09 GKY Streamline scanning code for faster Tree rescans
   14 Sep 09 SHL Drop experimental code
+  15 Sep 09 SHL Use UM_GREP when passing pathname
 
 ***********************************************************************/
@@ -2703 +2704 @@
           if (pci && (INT) pci != -1)
             PostMsg(Collector, WM_COMMAND,
-                    MPFROM2SHORT(IDM_GREP, 0), MPFROMP(pci->pszFileName));
+                    MPFROM2SHORT(UM_GREP, 0), MPFROMP(pci->pszFileName));
           else
             PostMsg(Collector, WM_COMMAND,