Changeset 1456 for trunk/dll/collect.c

Timestamp:

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

Author:

Steven Levine

Message:

Avoid crash on Ctrl-g from collector window

File:

• trunk/dll/collect.c (modified) (8 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,