Changeset 1471

Timestamp:

Oct 14, 2009, 1:43:04 AM (16 years ago)

Author:

Steven Levine

Message:

Remember last filter mask selection
Use Ctrl-click to select state or commonly used directory quicklist entry without activating.
Use Ctrl-click to select walk dialog user list entry without activating.
Avoid drivebar MB2 exception
Remember last seek and scan mask selection across runs
Avoid traps when changing tree container display style
Restore missing drives to drive list dropdown
Minor documentation updates

Location:

trunk/dll

Files:

• filldir.c (modified) (33 diffs)
• filter.c (modified) (22 diffs)
• flesh.c (modified) (13 diffs)
• grep.c (modified) (4 diffs)
• grep2.c (modified) (18 diffs)
• init.c (modified) (8 diffs)
• ipf/arclist.ipf (modified) (2 diffs)
• ipf/collect.ipf (modified) (2 diffs)
• ipf/fm3.ipf (modified) (6 diffs)
• ipf/walkem.ipf (modified) (3 diffs)
• key.c (modified) (1 diff)
• mainwnd.c (modified) (7 diffs)
• treecnr.c (modified) (2 diffs)
• walkem.c (modified) (4 diffs)

trunk/dll/filldir.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2008 Steven H. Levine
+  Copyright (c) 2001, 2009 Steven H. Levine
 
   10 Jan 04 SHL ProcessDirectory: avoid most large drive failures
@@ -79 +79 @@
   22 Jul 09 GKY Streamline scanning code for faster Tree rescans
   15 Sep 09 SHL Show rescan progress while filling container
+  26 Sep 09 SHL Add FreeCnrItemData debug code - do not let into the wild
+  13 Oct 09 SHL Avoid szDriver overflow in FillTreeCnr
+  13 Oct 09 SHL Restore missing drives in drive drop-down listbox; optimize updates
 
 ***********************************************************************/
@@ -99 +102 @@
 #include "info.h"                       // Data declaration(s)
 #include "newview.h"                    // Data declaration(s)
+#include "mainwnd.h"                    // hwndDrivelist
 #include "fm3str.h"
 #include "filldir.h"
@@ -141 +145 @@
   PCNRITEM      pci;
   HWND          hwndCnr;                // hwnd you want the message posted to
-  HWND          hwndDrivesList;
-  //BOOL        RamDrive;
 }
 STUBBYSCAN;
@@ -209 +211 @@
   HAB thab;
   HMQ hmq = (HMQ) 0;
-  BOOL ret;
+  BOOL ok;
 
   DosError(FERR_DISABLEHARDERR);
@@ -225 +227 @@
         IncrThreadUsage();
         priority_normal();
-        ret = Stubby(StubbyScan->hwndCnr, StubbyScan->pci);
-        if (ret == 1) {
+        ok = Stubby(StubbyScan->hwndCnr, StubbyScan->pci);
+        if (ok) {
           if (WinIsWindow((HAB)0, StubbyScan->hwndCnr)) {
             ULONG flags = driveflags[toupper(*StubbyScan->pci->pszFileName) - 'A'];
@@ -281 +283 @@
                          ProcessDir->partial,
                          ProcessDir->stopflag,
-                         ProcessDir->dcd,                       // Optional
+                         ProcessDir->dcd,               // Optional
                          ProcessDir->pulTotalFiles,     // Optional
                          ProcessDir->pullTotalBytes);   // Optional
@@ -532 +534 @@
   if (!*pffb->achName) {
     pci->pszFileName = xstrdup(pszDirectory, pszSrcFile, __LINE__);
-    //strcpy(pci->pszFileName, pszDirectory);
   }
   else {
@@ -880 +881 @@
 
   PSZ pszFileSpec;
-  //INT t;
   PFILEFINDBUF4L paffbFound;
   PFILEFINDBUF4L *papffbSelected;
@@ -895 +895 @@
   ULONG ulReturnFiles = 0;
   ULONGLONG ullReturnBytes = 0;
-  //PCH pchEndPath;
   APIRET rc;
   PCNRITEM pci;
@@ -925 +924 @@
 
   if (paffbFound && papffbSelected && pszFileSpec) {
-    //t = strlen(szDirBase);
     strcpy(pszFileSpec, szDirBase);
     AddBackslashToPath(pszFileSpec);
-    //pchEndPath = pszFileSpec + t;
-    //if (*(pchEndPath - 1) != '\\') {
-    //  memcpy(pchEndPath, "\\", 2);
-    //  pchEndPath++;
-    //}
     strcat(pszFileSpec, "*");
     DosError(FERR_DISABLEHARDERR);
@@ -946 +939 @@
                        FIL_QUERYEASIZEL);
     priority_normal();
-    pszFileSpec[strlen(pszFileSpec) - 1] = 0;     // Chop off wildcard
+    pszFileSpec[strlen(pszFileSpec) - 1] = 0;   // Chop off wildcard
     if (!rc) {
       do {
@@ -1098 +1091 @@
         else {
           // 04 Jan 08 SHL fixme like comp.c to handle less than ulSelCnt records
-          if (dcd && hwndStatus &&
+          if (hwndStatus && dcd &&
               dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent)) {
             WinSetWindowText(hwndStatus, GetPString(IDS_PLEASEWAITCOUNTINGTEXT));
@@ -1167 +1160 @@
     }
 
+    // 13 Oct 09 SHL fixme to be saymsg if ERROR_NOT_READY and first try on volume
     if (rc && rc != ERROR_NO_MORE_FILES) {
       Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
@@ -1231 +1225 @@
 } // FillDirCnr
 
+/**
+ * Fill tree container and drives list
+ * Offer to update command line options if not already done and not suppressed
+ */
+
 VOID FillTreeCnr(HWND hwndCnr, HWND hwndParent)
 {
-  ULONG ulCurDriveNum, ulDriveMap, numtoinsert = 0;
+  ULONG ulCurDriveNum;
+  ULONG ulDriveMap;
+  ULONG numtoinsert = 0;
   ULONG ulDriveType;
-  PCNRITEM pci, pciFirst = NULL, pciNext, pciParent = NULL;
-  INT x;// removable;
-  CHAR suggest[32];
-  CHAR szDrive[] = " :\\";
+  PCNRITEM pci, pciFirst = NULL;
+  PCNRITEM  pciNext;
+  PCNRITEM  pciParent = NULL;
+  UINT iDrvNum;
+  ULONG ulDriveMapMask;
+  CHAR szSuggest[32];                   // Suggested startup command line parameters
+  CHAR szDrive[CCHMAXPATH] = " :\\";    // 13 Oct 09 SHL
   CHAR szFSType[CCHMAXPATH];
   FILESTATUS4L fsa4;
   APIRET rc;
-  //BOOL drivesbuilt = FALSE;
   ULONG startdrive = 3;
+  HWND hwndDrivelist;
+
   static BOOL didonce;
+  static ULONG ulLastDriveMap;
 
   fDummy = TRUE;
-  *suggest = 0;
-  for (x = 0; x < 26; x++) {
-    driveflags[x] &= (DRIVE_IGNORE | DRIVE_NOPRESCAN | DRIVE_NOLOADICONS |
+  *szSuggest = 0;
+  for (iDrvNum = 0; iDrvNum < 26; iDrvNum++) {
+    driveflags[iDrvNum] &= (DRIVE_IGNORE | DRIVE_NOPRESCAN | DRIVE_NOLOADICONS |
                       DRIVE_NOLOADSUBJS | DRIVE_NOLOADLONGS |
                       DRIVE_INCLUDEFILES | DRIVE_SLOW | DRIVE_NOSTATS |
@@ -1276 +1282 @@
   }
 
-  // Calc number of drive items to create
-  for (x = 0; x < 26; x++) {
-    if ((ulDriveMap & (1L << x)) && !(driveflags[x] & DRIVE_IGNORE))
+  // Find drive list combobox if it exists
+  if (hwndParent) {
+    hwndDrivelist = WinWindowFromID(WinQueryWindow(hwndParent, QW_PARENT),
+                                    MAIN_DRIVELIST);
+  }
+  else
+    hwndDrivelist = NULLHANDLE;
+
+  // Calc number of top level drive tree items to create
+  for (iDrvNum = 0; iDrvNum < 26; iDrvNum++) {
+    if ((ulDriveMap & (1L << iDrvNum)) && ~driveflags[iDrvNum] & DRIVE_IGNORE)
       numtoinsert++;
   }
@@ -1297 +1311 @@
   // 04 Jan 08 SHL fixme like comp.c to handle less than ulSelCnt records
   pci = pciFirst;
-  for (x = 0; x < 26; x++) {
-    if ((ulDriveMap & (1L << x)) && !(driveflags[x] & DRIVE_IGNORE)) {
-
+  for (iDrvNum = 0; iDrvNum < 26; iDrvNum++) {
+    ulDriveMapMask = 1L << iDrvNum;
+    if (ulDriveMap & ulDriveMapMask && ~driveflags[iDrvNum] & DRIVE_IGNORE) {
       CHAR s[80];
       ULONG flags = 0;
       ULONG size = sizeof(ULONG);
       struct {
-              ULONG serial;
-              CHAR volumelength;
-              CHAR volumelabel[CCHMAXPATH];
-             } volser;
-
-      *szDrive = (CHAR)x + 'A';         // Build path spec
+        ULONG serial;
+        CHAR volumelength;
+        CHAR volumelabel[CCHMAXPATH];
+      } volser;
+
+      *szDrive = (CHAR)iDrvNum + 'A';   // Stuff drive letter - assume already have rest of path
 
       sprintf(s, "%c.DriveFlags", toupper(*szDrive));
       if (PrfQueryProfileData(fmprof, appname, s, &flags, &size)) {
-        driveflags[toupper(*szDrive) - 'A'] |= flags;
-      }
-
-      if (x > 1) {
+        driveflags[iDrvNum] |= flags;
+      }
+
+      if (iDrvNum > 1) {
         // Hard drive (2..N)
-        if (!(driveflags[x] & DRIVE_NOPRESCAN)) {
+        if (~driveflags[iDrvNum] & DRIVE_NOPRESCAN) {
           *szFSType = 0;
           ulDriveType = 0;
           memset(&volser, 0, sizeof(volser));
-          DriveFlagsOne(x, szFSType, &volser);
-          driveserial[x] = volser.serial;
+          DriveFlagsOne(iDrvNum, szFSType, &volser);
+          driveserial[iDrvNum] = volser.serial;
           memset(&fsa4, 0, sizeof(FILESTATUS4L));
-          if (!fVerifyOffChecked[x]) {
-            if (driveflags[x] & DRIVE_REMOVABLE)
-              driveflags[x] |= DRIVE_WRITEVERIFYOFF;
-            if (!(driveflags[x] & DRIVE_INVALID)) {
+          if (!fVerifyOffChecked[iDrvNum]) {
+            if (driveflags[iDrvNum] & DRIVE_REMOVABLE)
+              driveflags[iDrvNum] |= DRIVE_WRITEVERIFYOFF;
+            if (~driveflags[iDrvNum] & DRIVE_INVALID) {
               CHAR Key[80];
 
-              sprintf(Key, "%c.VerifyOffChecked", (CHAR) (x + 'A'));
-              fVerifyOffChecked[x] = TRUE;
-              PrfWriteProfileData(fmprof, appname, Key, &fVerifyOffChecked[x], sizeof(BOOL));
+              sprintf(Key, "%c.VerifyOffChecked", (CHAR) (iDrvNum + 'A'));
+              fVerifyOffChecked[iDrvNum] = TRUE;
+              PrfWriteProfileData(fmprof, appname, Key, &fVerifyOffChecked[iDrvNum], sizeof(BOOL));
             }
           }
@@ -1342 +1356 @@
             pci->rc.flRecordAttr |= (CRA_CURSORED | CRA_SELECTED);
 
-          if (!(driveflags[x] & DRIVE_REMOVABLE)) {
+          if (~driveflags[iDrvNum] & DRIVE_REMOVABLE) {
             // Fixed volume
             pci->attrFile |= FILE_DIRECTORY;
@@ -1358 +1372 @@
             if (rc && !didonce) {
               // Guess drive letter
-              if (!*suggest) {
-                *suggest = '/';
-                suggest[1] = 0;
+              if (!*szSuggest) {
+                *szSuggest = '/';
+                szSuggest[1] = 0;
               }
 
-              sprintf(suggest + strlen(suggest), "%c" , toupper(*szDrive));
+              sprintf(szSuggest + strlen(szSuggest), "%c" , toupper(*szDrive));
               pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-              if (fShowFSTypeInTree || fShowDriveLabelInTree) {
-                strcat(szDrive, " [");
-                strcat(szDrive, szFSType);
-                strcat(szDrive, "]");
-              }
+              if (fShowFSTypeInTree || fShowDriveLabelInTree)
+                sprintf(szDrive + strlen(szDrive), " [%s]", szFSType);
               pci->pszDisplayName = xstrdup(szDrive, pszSrcFile, __LINE__);
-              szDrive[3] = 0;
+              szDrive[3] = 0;           // Restore nul
               pci->rc.pszIcon = pci->pszDisplayName;
               pci->attrFile = FILE_DIRECTORY;
               pci->pszDispAttr = FileAttrToString(pci->attrFile);
-              driveserial[x] = -1;
+              driveserial[iDrvNum] = -1;
             }
             else
@@ -1383 +1394 @@
             // Removable volume
             pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-            if (fShowFSTypeInTree || fShowDriveLabelInTree) {
-              strcat(szDrive, " [");
-              strcat(szDrive, szFSType);
-              strcat(szDrive, "]");
-            }
+            if (fShowFSTypeInTree || fShowDriveLabelInTree)
+              sprintf(szDrive + strlen(szDrive), " [%s]", szFSType);
             pci->pszDisplayName = xstrdup(szDrive, pszSrcFile, __LINE__);
-            szDrive[3] = 0;
+            szDrive[3] = 0;             // Restore nul
             pci->rc.pszIcon = pci->pszDisplayName;
             pci->attrFile = FILE_DIRECTORY;
@@ -1404 +1412 @@
           pci->rc.hptrIcon = hptrDunno;
           pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-          if (fShowFSTypeInTree || fShowDriveLabelInTree) {
+          if (fShowFSTypeInTree || fShowDriveLabelInTree)
             strcat(szDrive, " [?]");
-          }
           pci->pszDisplayName = xstrdup(szDrive, pszSrcFile, __LINE__);
           szDrive[3] = 0;
@@ -1416 +1423 @@
           pci->attrFile = FILE_DIRECTORY;
           pci->pszDispAttr = FileAttrToString(pci->attrFile);
-          driveserial[x] = -1;
+          driveserial[iDrvNum] = -1;
         }
         }
@@ -1430 +1437 @@
         pci->attrFile = FILE_DIRECTORY;
         pci->pszDispAttr = FileAttrToString(pci->attrFile);
-        driveflags[x] |= (DRIVE_REMOVABLE | DRIVE_NOLONGNAMES);
-        driveserial[x] = -1;
+        driveflags[iDrvNum] |= (DRIVE_REMOVABLE | DRIVE_NOLONGNAMES);
+        driveserial[iDrvNum] = -1;
       }
       pci->rc.flRecordAttr |= CRA_RECORDREADONLY;
       pci = (PCNRITEM) pci->rc.preccNextRecord; // next rec
     }
-    else if (!(ulDriveMap & (1L << x)))
-      driveflags[x] |= DRIVE_INVALID;
+    else if (~ulDriveMap & ulDriveMapMask)
+      driveflags[iDrvNum] |= DRIVE_INVALID;
+
+    // 13 Oct 09 SHL
+    // Update drives list dropdown
+    if ((ulDriveMap ^ ulLastDriveMap) & ulDriveMapMask) {
+      if (ulDriveMap & ulDriveMapMask) {
+        WinSendMsg(hwndDrivelist,
+                   LM_INSERTITEM,
+                   MPFROM2SHORT(LIT_SORTASCENDING, 0),
+                   MPFROMP(szDrive));
+      }
+      else {
+        // Drive went away
+        SHORT sSelect = (SHORT)WinSendMsg(hwndDrivelist,
+                                          LM_SEARCHSTRING,
+                                          MPFROM2SHORT(0, LIT_FIRST),
+                                          MPFROMP(szDrive));
+        if (sSelect >= 0)
+          WinSendMsg(hwndDrivelist, LM_DELETEITEM, MPFROMSHORT(sSelect), MPVOID);
+      }
+    }
   } // for drives
 
-  //PostMsg(hwndMain, UM_BUILDDRIVEBAR, MPVOID, MPVOID);
-  //drivesbuilt = TRUE;
+  ulLastDriveMap = ulDriveMap;          // 13 Oct 09 SHL
 
   // insert the drives
@@ -1480 +1506 @@
                                   MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
     }
-  }
-
-  if (hwndParent) {
-    WinSendMsg(WinWindowFromID(WinQueryWindow(hwndParent, QW_PARENT),
-                               MAIN_DRIVELIST),
-               LM_DELETEALL, MPVOID, MPVOID);
   }
 
@@ -1566 +1586 @@
   {
     STUBBYSCAN *stubbyScan;
-    HWND hwndDrivesList = WinWindowFromID(WinQueryWindow(hwndParent, QW_PARENT),
-                                          MAIN_DRIVELIST);
 
     pci = (PCNRITEM) WinSendMsg(hwndCnr,
@@ -1579 +1597 @@
       stubbyScan->pci = pci;
       stubbyScan->hwndCnr = hwndCnr;
-      stubbyScan->hwndDrivesList = hwndDrivesList;
       pciNext = (PCNRITEM) WinSendMsg(hwndCnr,
                                       CM_QUERYRECORD,
@@ -1585 +1602 @@
                                       MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
       if (~pci->flags & RECFLAGS_ENV) {
-        ULONG drvNum = toupper(*pci->pszFileName) - 'A';        // 0..25
-        if (drvNum == ulCurDriveNum || drvNum >= 2) {
-          ULONG flags = driveflags[drvNum];     // Speed up
+        iDrvNum = toupper(*pci->pszFileName) - 'A';     // 0..25
+        if (iDrvNum == ulCurDriveNum || iDrvNum >= 2) {
+          // Hard drive or current drive
+          ULONG flags = driveflags[iDrvNum];    // Speed up
           if (~flags & DRIVE_INVALID &&
               ~flags & DRIVE_NOPRESCAN &&
@@ -1600 +1618 @@
               xfree(stubbyScan, pszSrcFile, __LINE__);
             }
-          } // if drive for scanning
-          else
-            WinSendMsg(hwndDrivesList,
-                       LM_INSERTITEM,
-                       MPFROM2SHORT(LIT_SORTASCENDING, 0),
-                       MPFROMP(pci->pszFileName));
+          } // if drive needs to be scanned
         }
         else {
+          // Diskette and not current drive
           WinSendMsg(hwndCnr,
                      CM_INVALIDATERECORD,
                      MPFROMP(&pci),
                      MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
-          WinSendMsg(hwndDrivesList,
-                     LM_INSERTITEM,
-                     MPFROM2SHORT(LIT_SORTASCENDING, 0),
-                     MPFROMP(pci->pszFileName));
         }
       }
@@ -1621 +1631 @@
     } // while
   }
-  if (hwndParent)
-    WinSendMsg(WinWindowFromID(WinQueryWindow(hwndParent, QW_PARENT),
-                               MAIN_DRIVELIST), LM_SELECTITEM,
-               MPFROM2SHORT(0, 0), MPFROMLONG(TRUE));
+
+  // 13 Oct 09 SHL
+  if (hwndDrivelist)
+    WinSendMsg(hwndDrivelist, LM_SELECTITEM, MPFROM2SHORT(0, 0), MPFROMLONG(TRUE));
 
   pci = (PCNRITEM) WinSendMsg(hwndCnr,
@@ -1668 +1678 @@
     BOOL includesyours = FALSE;
 
-    // 10 Jan 08 SHL fixme to understand fFirstTime
-    if (!fDontSuggestAgain &&(*suggest || (!(driveflags[1] & DRIVE_IGNORE) && fFirstTime))) {
+    // 10 Jan 08 SHL fixme to understand fFirstTime - looks obsolete to me - probably mean didonce?
+    if (!fDontSuggestAgain && (*szSuggest || ~driveflags[1] & DRIVE_IGNORE && fFirstTime)) {
       if (!DosDevConfig(&info, DEVINFO_FLOPPY) && info == 1) {
-        if (!*suggest) {
-          *suggest = '/';
-          suggest[1] = 0;
+        if (!*szSuggest) {
+          *szSuggest = '/';
+          szSuggest[1] = 0;
         }
         else
-          memmove(suggest + 2, suggest + 1, strlen(suggest));
-        suggest[1] = 'B';
-      }
-    }
-    if (*suggest) {
-      for (x = 2; x < 26; x++) {
-        if (driveflags[x] & DRIVE_IGNORE) {
+          memmove(szSuggest + 2, szSuggest + 1, strlen(szSuggest));
+        szSuggest[1] = 'B';
+      }
+    }
+    if (*szSuggest) {
+      for (iDrvNum = 2; iDrvNum < 26; iDrvNum++) {
+        if (driveflags[iDrvNum] & DRIVE_IGNORE) {
           includesyours = TRUE;
-          sprintf(suggest + strlen(suggest), "%c", (char)(x + 'A'));
+          sprintf(szSuggest + strlen(szSuggest), "%c", (char)(iDrvNum + 'A'));
         }
       }
-      strcat(suggest, " %*");
+      strcat(szSuggest, " %*");
       saymsg(MB_YESNOCANCEL | MB_ICONEXCLAMATION,
-             (hwndParent) ? hwndParent : hwndCnr,
+             hwndParent ? hwndParent : hwndCnr,
              GetPString(IDS_SUGGESTTITLETEXT),
              GetPString(IDS_SUGGEST1TEXT),
              (includesyours) ? GetPString(IDS_SUGGEST2TEXT) : NullStr,
-             suggest);
+             szSuggest);
       if (MBID_YES) {
         char s[64];
-
-        sprintf(s, "PARAMETERS=%s", suggest);
+        sprintf(s, "PARAMETERS=%s", szSuggest);
         WinCreateObject(WPProgram, "FM/2", s, FM3Folder, CO_UPDATEIFEXISTS);
         WinCreateObject(WPProgram,
@@ -1717 +1726 @@
         PrfWriteProfileData(fmprof, appname, "DontSuggestAgain", &fDontSuggestAgain, sizeof(BOOL));
       }
-    }
+    } // if suggest
   }
   didonce = TRUE;
@@ -1786 +1795 @@
   }
 
+#if 0 // 26 Sep 09 SHL debug dup free complaints
   if (!pci->pszFileName)
-    Runtime_Error(pszSrcFile, __LINE__, "FreeCnrItemData attempting free %p data twice", pci);
+    Runtime_Error(pszSrcFile, __LINE__, "FreeCnrItemData attempting to free %p data twice", pci);
   else {
     if (pci->pszFileName != NullStr)
@@ -1793 +1803 @@
     pci->pszFileName = NULL;            // Catch illegal references
   }
+#else
+  {
+    #define HIST_COUNT 50
+    static struct {
+      PCNRITEM pci;
+      PSZ pszFileName;
+    } history[HIST_COUNT];
+    static volatile UINT iHistNdx;
+    UINT i;
+
+    if (!pci->pszFileName) {
+      // Looks like pci was already freed
+      // Try to locate original file name in history buffer
+      for (i = 0; i < HIST_COUNT && pci != history[i].pci; i++) { }     // Scan
+      if (i < HIST_COUNT) {
+        Runtime_Error(pszSrcFile, __LINE__, "FreeCnrItemData attempting to free %p data twice, fileName was %.260s",
+                      pci, history[i].pszFileName);
+      } else {
+        Runtime_Error(pszSrcFile, __LINE__, "FreeCnrItemData attempting to free %p data twice", pci);
+      }
+    }
+    else {
+      PSZ psz;
+      PSZ *ppsz;
+      // Grab a history slot
+      // This should work well enoungh to prevent MT/SMP conflicts
+      for (;;) {
+        i = iHistNdx;
+        if (++i >= HIST_COUNT)
+          i = 0;
+        if (++iHistNdx >= HIST_COUNT)
+          iHistNdx = 0;
+        if (i == iHistNdx) break;
+      }
+      ppsz = &history[iHistNdx].pszFileName;
+      psz = *ppsz;
+      if (psz)
+        free(psz);
+      if (pci->pszFileName && pci->pszFileName != NullStr)
+        *ppsz = strdup(pci->pszFileName);
+      else
+        *ppsz = NULL;
+      history[iHistNdx].pci = pci;
+      if (pci->pszFileName != NullStr)
+        free(pci->pszFileName);
+      pci->pszFileName = NULL;          // Catch illegal references and dup free attempts
+    }
+  }
+
+
+#endif
 
   // 08 Sep 08 SHL Remove excess logic

trunk/dll/filter.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2008 Steven H.Levine
+  Copyright (c) 2004, 2009 Steven H.Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
@@ -19 +19 @@
   07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
+  28 Sep 09 SHL Remember last selected mask listbox entry
 
 ***********************************************************************/
@@ -39 +40 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
-#include "pathutil.h"                   // BldFullPathName
+#include "pathutil.h"                   // BldFullPathName
 #include "filter.h"
 #include "select.h"                     // SetMask
@@ -51 +52 @@
 #pragma data_seg(FILTER_DATA)
 
+static PCSZ PSCZ_FILTER_LASTMASK_SELECT = "Filter.LastMaskSelect";
+
 static PSZ pszSrcFile = __FILE__;
 
 #define MAXNUMMASKS 50
 
-typedef struct LINKMASKS
-{
+typedef struct LINKMASKS {
   CHAR *mask;
   struct LINKMASKS *next;
-}
-LINKMASKS;
+} LINKMASKS;
 
 static LINKMASKS *maskhead = NULL;
@@ -67 +68 @@
 static VOID save_masks(VOID);
 
+/**
+ * Filter callback
+ */
+
 INT APIENTRY Filter(PMINIRECORDCORE rmini, PVOID arg)
 {
-
-  MASK *mask = (MASK *) arg;
+  MASK *mask = (MASK *)arg;
   PCNRITEM r;
-  register INT x;
+  INT x;
   INT ret = FALSE;
   CHAR *file;
@@ -96 +100 @@
         || ((mask->antiattr & FILE_DIRECTORY)
             && !(r->attrFile & FILE_DIRECTORY)))
-        return FALSE;
+        return FALSE;
     if (*mask->szMask) {
       file = strrchr(r->pszFileName, '\\');
       if (!file)
-        file = strrchr(r->pszFileName, ':');
+        file = strrchr(r->pszFileName, ':');
       if (file)
-        file++;
+        file++;
       else
-        file = r->pszFileName;
+        file = r->pszFileName;
       if (mask->pszMasks[1]) {
-        for (x = 0; mask->pszMasks[x]; x++) {
-          if (*mask->pszMasks[x]) {
-            if (*mask->pszMasks[x] != '/') {
-              if (wildcard((strchr(mask->pszMasks[x], '\\') ||
-                            strchr(mask->pszMasks[x], ':')) ?
-                           r->pszFileName : file, mask->pszMasks[x], FALSE))
-                ret = TRUE;
-            }
-            else {
-              if (wildcard((strchr(mask->pszMasks[x], '\\') ||
-                            strchr(mask->pszMasks[x], ':')) ?
-                           r->pszFileName : file, mask->pszMasks[x] + 1,
-                           FALSE)) {
-                ret = FALSE;
-                break;
-              }
-            }
-          }
-        }
+        for (x = 0; mask->pszMasks[x]; x++) {
+          if (*mask->pszMasks[x]) {
+            if (*mask->pszMasks[x] != '/') {
+              if (wildcard((strchr(mask->pszMasks[x], '\\') ||
+                            strchr(mask->pszMasks[x], ':')) ?
+                           r->pszFileName : file, mask->pszMasks[x], FALSE))
+                ret = TRUE;
+            }
+            else {
+              if (wildcard((strchr(mask->pszMasks[x], '\\') ||
+                            strchr(mask->pszMasks[x], ':')) ?
+                           r->pszFileName : file, mask->pszMasks[x] + 1,
+                           FALSE)) {
+                ret = FALSE;
+                break;
+              }
+            }
+          }
+        }
       }
       else {
-        if (wildcard((strchr(mask->szMask, '\\') ||
-                      strchr(mask->szMask, ':')) ?
-                     r->pszFileName : file, mask->szMask, FALSE))
-          ret = TRUE;
+        if (wildcard((strchr(mask->szMask, '\\') ||
+                      strchr(mask->szMask, ':')) ?
+                     r->pszFileName : file, mask->szMask, FALSE))
+          ret = TRUE;
       }
     }
@@ -141 +145 @@
 }
 
-VOID load_masks(VOID)
+/**
+ * Load linked list of filter masks from FILTERS.DAT file
+ */
+
+static VOID load_masks(VOID)
 {
-
-  /* load linked list of filter masks from FILTERS.DAT file */
-
   FILE *fp;
   LINKMASKS *info, *last = NULL;
@@ -173 +178 @@
         }
       }
-    }  //while
+    } //while
     fclose(fp);
   }
 }
 
-VOID save_masks(VOID)
+/**
+ * Save linked list of filter masks to FILTERS.DAT file
+ */
+
+static VOID save_masks(VOID)
 {
-
-  /* save linked list of filter masks to FILTERS.DAT file */
-
   LINKMASKS *info;
   FILE *fp;
@@ -206 +212 @@
 }
 
-VOID add_mask(CHAR * mask)
+/**
+ * Add mask to end of internal list
+ */
+
+static VOID add_mask(CHAR * mask)
 {
-
-  LINKMASKS *info, *last = NULL;
+  LINKMASKS *info;
+  LINKMASKS *last = NULL;
 
   if (!mask || !*mask)
@@ -237 +247 @@
 }
 
-VOID remove_mask(CHAR * mask)
+/**
+ * Remove mask from internal list
+ */
+
+static VOID remove_mask(CHAR * mask)
 {
-
   LINKMASKS *info, *last = NULL;
 
@@ -262 +275 @@
 }
 
+/**
+ * Select filter option dialog box procedure
+ */
+
 MRESULT EXPENTRY PickMaskDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
+  LINKMASKS *info;
+  MASK *mask;
+  SHORT sSelect;
+  CHAR s[CCHMAXPATH];
+  ULONG size;
+  static SHORT sLastMaskSelect = LIT_NONE;
 
   switch (msg) {
@@ -270 +293 @@
                       MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     if (!mp2) {
+      Runtime_Error(pszSrcFile, __LINE__, NULL);
       WinDismissDlg(hwnd, 0);
       break;
     }
-    if (!loadedmasks)
+
+    if (!loadedmasks) {
       load_masks();
+      size = sizeof(sLastMaskSelect);
+      PrfQueryProfileData(fmprof, appname, PSCZ_FILTER_LASTMASK_SELECT, &sLastMaskSelect, &size);
+    }
+
     WinSetWindowPtr(hwnd, QWL_USER, mp2);
-    {                                   /* fill list box */
-      LINKMASKS *info;
-
-      info = maskhead;
-      while (info) {
-        WinSendDlgItemMsg(hwnd, MSK_LISTBOX, LM_INSERTITEM,
-                          MPFROM2SHORT(LIT_SORTASCENDING, 0),
-                          MPFROMP(info->mask));
-        info = info->next;
-      }
-    }
-    {
-      MASK *mask = (MASK *) mp2;
-
-      if (mask->fNoAttribs) {
-        WinEnableWindow(WinWindowFromID(hwnd, MSK_SYSTEM), FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd, MSK_HIDDEN), FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd, MSK_READONLY), FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd, MSK_ARCHIVED), FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd, MSK_DIRECTORY), FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTSYSTEM), FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTHIDDEN), FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTREADONLY), FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTARCHIVED), FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTDIRECTORY), FALSE);
+
+    info = maskhead;
+    while (info) {
+      WinSendDlgItemMsg(hwnd, MSK_LISTBOX, LM_INSERTITEM,
+                        MPFROM2SHORT(LIT_SORTASCENDING, 0),
+                        MPFROMP(info->mask));
+      info = info->next;
+    }
+    if (sLastMaskSelect >= 0)
+      WinSendDlgItemMsg(hwnd, MSK_LISTBOX, LM_SELECTITEM,
+                        MPFROMSHORT(sLastMaskSelect), MPFROMSHORT(TRUE));
+
+    mask = (MASK *)mp2;
+
+    if (mask->fNoAttribs) {
+      WinEnableWindow(WinWindowFromID(hwnd, MSK_SYSTEM), FALSE);
+      WinEnableWindow(WinWindowFromID(hwnd, MSK_HIDDEN), FALSE);
+      WinEnableWindow(WinWindowFromID(hwnd, MSK_READONLY), FALSE);
+      WinEnableWindow(WinWindowFromID(hwnd, MSK_ARCHIVED), FALSE);
+      WinEnableWindow(WinWindowFromID(hwnd, MSK_DIRECTORY), FALSE);
+      WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTSYSTEM), FALSE);
+      WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTHIDDEN), FALSE);
+      WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTREADONLY), FALSE);
+      WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTARCHIVED), FALSE);
+      WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTDIRECTORY), FALSE);
+      WinEnableWindow(WinWindowFromID(hwnd, MSK_SHOWDIRS), FALSE);
+    }
+    else {
+      WinCheckButton(hwnd, MSK_SYSTEM, (mask->attrFile & FILE_SYSTEM) != 0);
+      WinCheckButton(hwnd, MSK_HIDDEN, (mask->attrFile & FILE_HIDDEN) != 0);
+      WinCheckButton(hwnd, MSK_READONLY,
+                     (mask->attrFile & FILE_READONLY) != 0);
+      WinCheckButton(hwnd, MSK_ARCHIVED,
+                     (mask->attrFile & FILE_ARCHIVED) != 0);
+      WinCheckButton(hwnd, MSK_DIRECTORY,
+                     (mask->attrFile & FILE_DIRECTORY) != 0);
+      WinCheckButton(hwnd, MSK_MUSTSYSTEM,
+                     (mask->antiattr & FILE_SYSTEM) != 0);
+      WinCheckButton(hwnd, MSK_MUSTHIDDEN,
+                     (mask->antiattr & FILE_HIDDEN) != 0);
+      WinCheckButton(hwnd, MSK_MUSTREADONLY,
+                     (mask->antiattr & FILE_READONLY) != 0);
+      WinCheckButton(hwnd, MSK_MUSTARCHIVED,
+                     (mask->antiattr & FILE_ARCHIVED) != 0);
+      WinCheckButton(hwnd, MSK_MUSTDIRECTORY,
+                     (mask->antiattr & FILE_DIRECTORY) != 0);
+      if (mask->fNoDirs)
         WinEnableWindow(WinWindowFromID(hwnd, MSK_SHOWDIRS), FALSE);
-      }
-      else {
-        WinCheckButton(hwnd, MSK_SYSTEM, (mask->attrFile & FILE_SYSTEM) != 0);
-        WinCheckButton(hwnd, MSK_HIDDEN, (mask->attrFile & FILE_HIDDEN) != 0);
-        WinCheckButton(hwnd, MSK_READONLY,
-                       (mask->attrFile & FILE_READONLY) != 0);
-        WinCheckButton(hwnd, MSK_ARCHIVED,
-                       (mask->attrFile & FILE_ARCHIVED) != 0);
-        WinCheckButton(hwnd, MSK_DIRECTORY,
-                       (mask->attrFile & FILE_DIRECTORY) != 0);
-        WinCheckButton(hwnd, MSK_MUSTSYSTEM,
-                       (mask->antiattr & FILE_SYSTEM) != 0);
-        WinCheckButton(hwnd, MSK_MUSTHIDDEN,
-                       (mask->antiattr & FILE_HIDDEN) != 0);
-        WinCheckButton(hwnd, MSK_MUSTREADONLY,
-                       (mask->antiattr & FILE_READONLY) != 0);
-        WinCheckButton(hwnd, MSK_MUSTARCHIVED,
-                       (mask->antiattr & FILE_ARCHIVED) != 0);
-        WinCheckButton(hwnd, MSK_MUSTDIRECTORY,
-                       (mask->antiattr & FILE_DIRECTORY) != 0);
-        if (mask->fNoDirs)
-          WinEnableWindow(WinWindowFromID(hwnd, MSK_SHOWDIRS), FALSE);
-        else
-          WinCheckButton(hwnd, MSK_SHOWDIRS, (mask->fShowDirs != FALSE));
-        WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTSYSTEM),
-                        (mask->attrFile & FILE_SYSTEM) != 0);
-        WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTHIDDEN),
-                        (mask->attrFile & FILE_HIDDEN) != 0);
-        WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTARCHIVED),
-                        (mask->attrFile & FILE_ARCHIVED) != 0);
-        WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTREADONLY),
-                        (mask->attrFile & FILE_READONLY) != 0);
-        WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTDIRECTORY),
-                        (mask->attrFile & FILE_DIRECTORY) != 0);
-      }
+      else
+        WinCheckButton(hwnd, MSK_SHOWDIRS, (mask->fShowDirs != FALSE));
+      WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTSYSTEM),
+                      (mask->attrFile & FILE_SYSTEM) != 0);
+      WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTHIDDEN),
+                      (mask->attrFile & FILE_HIDDEN) != 0);
+      WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTARCHIVED),
+                      (mask->attrFile & FILE_ARCHIVED) != 0);
+      WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTREADONLY),
+                      (mask->attrFile & FILE_READONLY) != 0);
+      WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTDIRECTORY),
+                      (mask->attrFile & FILE_DIRECTORY) != 0);
+
       if (*mask->szMask) {
-
-        CHAR s[CCHMAXPATH], *p;
-
+        CHAR *p;
         strcpy(s, mask->szMask);
         if (!strchr(mask->szMask, '?') && !strchr(mask->szMask, '*')) {
@@ -352 +379 @@
         WinSendDlgItemMsg(hwnd, MSK_MASK, EM_SETSEL,
                           MPFROM2SHORT(0, CCHMAXPATH), MPVOID);
-//          *mask->szMask = 0;
         PostMsg(hwnd, UM_SETDIR, MPVOID, MPVOID);
       }
+
       if (mask->fIsTree) {
         WinCheckButton(hwnd, MSK_DIRECTORY, TRUE);
@@ -361 +388 @@
         WinEnableWindow(WinWindowFromID(hwnd, MSK_SHOWDIRS), FALSE);
       }
+
       if (mask->fIsSeeAll) {
         WinCheckButton(hwnd, MSK_DIRECTORY, FALSE);
@@ -369 +397 @@
         WinEnableWindow(WinWindowFromID(hwnd, MSK_SHOWDIRS), FALSE);
       }
+
       if (*mask->prompt)
         WinSetWindowText(hwnd, mask->prompt);
@@ -378 +407 @@
   case UM_SETUP:
     {
-      MASK *mask = WinQueryWindowPtr(hwnd, QWL_USER);
+      mask = WinQueryWindowPtr(hwnd, QWL_USER);
 
       if (mask && mask->fText) {
@@ -408 +437 @@
                              50,
                              swpE.cy, hwnd, HWND_TOP, 65535, NULL, NULL)) {
-          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                    PCSZ_WINCREATEWINDOW);
+          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
         }
         if (!WinCreateWindow(hwnd,
@@ -420 +449 @@
                              swpL.cx - 54,
                              swpE.cy, hwnd, HWND_TOP, MSK_TEXT, NULL, NULL)) {
-          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
-                    PCSZ_WINCREATEWINDOW);
-        }
-        WinSendDlgItemMsg(hwnd,
-                          MSK_TEXT,
-                          EM_SETTEXTLIMIT, MPFROM2SHORT(256, 0), MPVOID);
+          Win_Error(hwnd, hwnd, pszSrcFile, __LINE__,
+                    PCSZ_WINCREATEWINDOW);
+        }
+        WinSendDlgItemMsg(hwnd, MSK_TEXT, EM_SETTEXTLIMIT,
+                          MPFROM2SHORT(256, 0), MPVOID);
         if (mask->szText) {
           WinSetDlgItemText(hwnd, MSK_TEXT, mask->szText);
-          WinSendDlgItemMsg(hwnd,
-                            MSK_TEXT,
-                            EM_SETSEL, MPFROM2SHORT(0, 256), MPVOID);
+          WinSendDlgItemMsg(hwnd, MSK_TEXT, EM_SETSEL,
+                            MPFROM2SHORT(0, 256), MPVOID);
         }
       }
@@ -506 +533 @@
       case LN_SELECT:
         {
-          SHORT sSelect;
-          CHAR tempmask[CCHMAXPATH];
-
-          sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
-                                              MSK_LISTBOX,
-                                              LM_QUERYSELECTION,
+          sSelect = (SHORT) WinSendDlgItemMsg(hwnd, MSK_LISTBOX, LM_QUERYSELECTION,
                                               MPFROMSHORT(LIT_FIRST), MPVOID);
-          *tempmask = 0;
-          if (sSelect >= 0)
-            WinSendDlgItemMsg(hwnd,
-                              MSK_LISTBOX,
-                              LM_QUERYITEMTEXT,
+          *s = 0;
+          if (sSelect >= 0) {
+            sLastMaskSelect = sSelect;
+            WinSendDlgItemMsg(hwnd, MSK_LISTBOX, LM_QUERYITEMTEXT,
                               MPFROM2SHORT(sSelect,
-                                           CCHMAXPATH), MPFROMP(tempmask));
-          WinSetDlgItemText(hwnd, MSK_MASK, tempmask);
+                                           CCHMAXPATH), MPFROMP(s));
+          }
+          WinSetDlgItemText(hwnd, MSK_MASK, s);
         }
         break;
@@ -535 +557 @@
     switch (SHORT1FROMMP(mp1)) {
     case MSK_ALL:
-      {
-        MASK *mask = (MASK *) INSTDATA(hwnd);
-
-        if (mask) {
-          if (!mask->fNoAttribs) {
-            WinCheckButton(hwnd, MSK_SYSTEM, TRUE);
-            WinCheckButton(hwnd, MSK_HIDDEN, TRUE);
-            WinCheckButton(hwnd, MSK_READONLY, TRUE);
-            WinCheckButton(hwnd, MSK_ARCHIVED, TRUE);
-            WinCheckButton(hwnd, MSK_DIRECTORY, TRUE);
-            WinCheckButton(hwnd, MSK_MUSTSYSTEM, FALSE);
-            WinCheckButton(hwnd, MSK_MUSTHIDDEN, FALSE);
-            WinCheckButton(hwnd, MSK_MUSTREADONLY, FALSE);
-            WinCheckButton(hwnd, MSK_MUSTARCHIVED, FALSE);
-            WinCheckButton(hwnd, MSK_MUSTDIRECTORY, FALSE);
-            if (!mask->fNoDirs)
-              WinCheckButton(hwnd, MSK_SHOWDIRS, TRUE);
-            WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTSYSTEM), TRUE);
-            WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTHIDDEN), TRUE);
-            WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTARCHIVED), TRUE);
-            WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTREADONLY), TRUE);
-            WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTDIRECTORY), TRUE);
-          }
-          if (mask->fIsTree) {
-            WinCheckButton(hwnd, MSK_DIRECTORY, TRUE);
-            WinCheckButton(hwnd, MSK_MUSTDIRECTORY, FALSE);
-            WinCheckButton(hwnd, MSK_SHOWDIRS, FALSE);
-            WinEnableWindow(WinWindowFromID(hwnd, MSK_DIRECTORY), FALSE);
-            WinEnableWindow(WinWindowFromID(hwnd, MSK_SHOWDIRS), FALSE);
-          }
-          if (mask->fIsSeeAll) {
-            WinCheckButton(hwnd, MSK_DIRECTORY, FALSE);
-            WinCheckButton(hwnd, MSK_MUSTDIRECTORY, FALSE);
-            WinCheckButton(hwnd, MSK_SHOWDIRS, FALSE);
-            WinEnableWindow(WinWindowFromID(hwnd, MSK_DIRECTORY), FALSE);
-            WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTDIRECTORY), FALSE);
-            WinEnableWindow(WinWindowFromID(hwnd, MSK_SHOWDIRS), FALSE);
-          }
+      mask = (MASK *)INSTDATA(hwnd);
+      if (mask) {
+        if (!mask->fNoAttribs) {
+          WinCheckButton(hwnd, MSK_SYSTEM, TRUE);
+          WinCheckButton(hwnd, MSK_HIDDEN, TRUE);
+          WinCheckButton(hwnd, MSK_READONLY, TRUE);
+          WinCheckButton(hwnd, MSK_ARCHIVED, TRUE);
+          WinCheckButton(hwnd, MSK_DIRECTORY, TRUE);
+          WinCheckButton(hwnd, MSK_MUSTSYSTEM, FALSE);
+          WinCheckButton(hwnd, MSK_MUSTHIDDEN, FALSE);
+          WinCheckButton(hwnd, MSK_MUSTREADONLY, FALSE);
+          WinCheckButton(hwnd, MSK_MUSTARCHIVED, FALSE);
+          WinCheckButton(hwnd, MSK_MUSTDIRECTORY, FALSE);
+          if (!mask->fNoDirs)
+            WinCheckButton(hwnd, MSK_SHOWDIRS, TRUE);
+          WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTSYSTEM), TRUE);
+          WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTHIDDEN), TRUE);
+          WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTARCHIVED), TRUE);
+          WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTREADONLY), TRUE);
+          WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTDIRECTORY), TRUE);
+        }
+        if (mask->fIsTree) {
+          WinCheckButton(hwnd, MSK_DIRECTORY, TRUE);
+          WinCheckButton(hwnd, MSK_MUSTDIRECTORY, FALSE);
+          WinCheckButton(hwnd, MSK_SHOWDIRS, FALSE);
+          WinEnableWindow(WinWindowFromID(hwnd, MSK_DIRECTORY), FALSE);
+          WinEnableWindow(WinWindowFromID(hwnd, MSK_SHOWDIRS), FALSE);
+        }
+        if (mask->fIsSeeAll) {
+          WinCheckButton(hwnd, MSK_DIRECTORY, FALSE);
+          WinCheckButton(hwnd, MSK_MUSTDIRECTORY, FALSE);
+          WinCheckButton(hwnd, MSK_SHOWDIRS, FALSE);
+          WinEnableWindow(WinWindowFromID(hwnd, MSK_DIRECTORY), FALSE);
+          WinEnableWindow(WinWindowFromID(hwnd, MSK_MUSTDIRECTORY), FALSE);
+          WinEnableWindow(WinWindowFromID(hwnd, MSK_SHOWDIRS), FALSE);
         }
       }
@@ -582 +601 @@
     case MSK_DELETE:
     case DID_OK:
-      {
-        CHAR test[CCHMAXPATH];
-        MASK *mask;
-        SHORT sSelect;
-
-        mask = INSTDATA(hwnd);
-        *test = 0;
-        WinQueryDlgItemText(hwnd, MSK_MASK, CCHMAXPATH, test);
-        test[CCHMAXPATH - 1] = 0;
-        bstrip(test);
+      mask = INSTDATA(hwnd);
+      *s = 0;
+      WinQueryDlgItemText(hwnd, MSK_MASK, CCHMAXPATH, s);       // Entry field
+      s[CCHMAXPATH - 1] = 0;
+      bstrip(s);
+      if (SHORT1FROMMP(mp1) == DID_OK) {
+        mask->attrFile =
+          (WinQueryButtonCheckstate(hwnd, MSK_SYSTEM) *
+           FILE_SYSTEM) | (WinQueryButtonCheckstate(hwnd,
+                                                    MSK_HIDDEN) *
+                           FILE_HIDDEN) | (WinQueryButtonCheckstate(hwnd,
+                                                                    MSK_READONLY)
+                                           *
+                                           FILE_READONLY) |
+          (WinQueryButtonCheckstate(hwnd, MSK_ARCHIVED) *
+           FILE_ARCHIVED) | (WinQueryButtonCheckstate(hwnd,
+                                                      MSK_DIRECTORY) *
+                             FILE_DIRECTORY);
+        mask->antiattr =
+          (WinQueryButtonCheckstate(hwnd, MSK_MUSTSYSTEM) *
+           FILE_SYSTEM) | (WinQueryButtonCheckstate(hwnd,
+                                                    MSK_MUSTHIDDEN) *
+                           FILE_HIDDEN) | (WinQueryButtonCheckstate(hwnd,
+                                                                    MSK_MUSTREADONLY)
+                                           *
+                                           FILE_READONLY) |
+          (WinQueryButtonCheckstate(hwnd, MSK_MUSTARCHIVED) *
+           FILE_ARCHIVED) | (WinQueryButtonCheckstate(hwnd,
+                                                      MSK_MUSTDIRECTORY) *
+                             FILE_DIRECTORY);
+        mask->fShowDirs =
+          (WinQueryButtonCheckstate(hwnd, MSK_SHOWDIRS) != FALSE);
+        if (mask->fText)
+          WinQueryDlgItemText(hwnd, MSK_TEXT, 256, mask->szText);
+      }
+      if (*s) {
         if (SHORT1FROMMP(mp1) == DID_OK) {
-          mask->attrFile =
-            (WinQueryButtonCheckstate(hwnd, MSK_SYSTEM) *
-             FILE_SYSTEM) | (WinQueryButtonCheckstate(hwnd,
-                                                      MSK_HIDDEN) *
-                             FILE_HIDDEN) | (WinQueryButtonCheckstate(hwnd,
-                                                                      MSK_READONLY)
-                                             *
-                                             FILE_READONLY) |
-            (WinQueryButtonCheckstate(hwnd, MSK_ARCHIVED) *
-             FILE_ARCHIVED) | (WinQueryButtonCheckstate(hwnd,
-                                                        MSK_DIRECTORY) *
-                               FILE_DIRECTORY);
-          mask->antiattr =
-            (WinQueryButtonCheckstate(hwnd, MSK_MUSTSYSTEM) *
-             FILE_SYSTEM) | (WinQueryButtonCheckstate(hwnd,
-                                                      MSK_MUSTHIDDEN) *
-                             FILE_HIDDEN) | (WinQueryButtonCheckstate(hwnd,
-                                                                      MSK_MUSTREADONLY)
-                                             *
-                                             FILE_READONLY) |
-            (WinQueryButtonCheckstate(hwnd, MSK_MUSTARCHIVED) *
-             FILE_ARCHIVED) | (WinQueryButtonCheckstate(hwnd,
-                                                        MSK_MUSTDIRECTORY) *
-                               FILE_DIRECTORY);
-          mask->fShowDirs =
-            (WinQueryButtonCheckstate(hwnd, MSK_SHOWDIRS) != FALSE);
-          if (mask->fText)
-            WinQueryDlgItemText(hwnd, MSK_TEXT, 256, mask->szText);
-        }
-        if (*test) {
-          if (SHORT1FROMMP(mp1) == DID_OK) {
-            strcpy(mask->szMask, test);
-            add_mask(test);
-            save_masks();
-            //DosEnterCritSec(); // GKY 11-30-08 moved to SetMask
-            SetMask(mask->szMask, mask);
-            //DosExitCritSec();
-            WinDismissDlg(hwnd, 1);
+          strcpy(mask->szMask, s);
+          add_mask(s);
+          save_masks();
+          SetMask(mask->szMask, mask);
+          sLastMaskSelect = (SHORT)WinSendDlgItemMsg(hwnd, MSK_LISTBOX, LM_INSERTITEM,
+                                                     MPFROM2SHORT(LIT_SORTASCENDING, 0),
+                                                     MPFROMP(s));
+          PrfWriteProfileData(fmprof, appname,
+                              PSCZ_FILTER_LASTMASK_SELECT, &sLastMaskSelect, sizeof(sLastMaskSelect));
+          WinDismissDlg(hwnd, 1);
+        }
+        else {
+          // MSK_DELETE
+          WinSetDlgItemText(hwnd, MSK_MASK, NullStr);
+          remove_mask(s);
+          save_masks();
+          sSelect = (SHORT) WinSendDlgItemMsg(hwnd, MSK_LISTBOX, LM_SEARCHSTRING,
+                                              MPFROM2SHORT(0, LIT_FIRST), MPFROMP(s));
+          if (sSelect >= 0) {
+            WinSendDlgItemMsg(hwnd, MSK_LISTBOX, LM_DELETEITEM,
+                              MPFROM2SHORT(sSelect, 0), MPVOID);
+            // Try to select next item
+            if (!WinSendDlgItemMsg(hwnd, MSK_LISTBOX, LM_SELECTITEM,
+                 MPFROMSHORT(sSelect), MPFROMSHORT(TRUE))) {
+              sSelect = (SHORT)WinSendDlgItemMsg(hwnd, MSK_LISTBOX, LM_QUERYITEMCOUNT,
+                                                     MPVOID, MPVOID);
+              sSelect--;
+              if (sSelect >= 0)
+                WinSendDlgItemMsg(hwnd, MSK_LISTBOX, LM_SELECTITEM,
+                                  MPFROMSHORT(sSelect), MPFROMSHORT(TRUE));
+            }
+            sLastMaskSelect = sSelect;
           }
-          else {
-            WinSetDlgItemText(hwnd, MSK_MASK, NullStr);
-            remove_mask(test);
-            save_masks();
-            sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
-                                                MSK_LISTBOX,
-                                                LM_SEARCHSTRING,
-                                                MPFROM2SHORT(0, LIT_FIRST),
-                                                MPFROMP(test));
-            if (sSelect >= 0)
-              WinSendDlgItemMsg(hwnd,
-                                MSK_LISTBOX,
-                                LM_DELETEITEM,
-                                MPFROM2SHORT(sSelect, 0), MPVOID);
-          }
-        }
-        else {
-          if (SHORT1FROMMP(mp1) == DID_OK) {
-            *mask->szMask = 0;
-            //DosEnterCritSec(); // GKY 11-30-08 moved to SetMask
-            SetMask(mask->szMask, mask);
-            //DosExitCritSec();
-            WinDismissDlg(hwnd, 1);
-          }
-          else if (!fAlertBeepOff)
-            DosBeep(50, 100);           // MSK_DELETE
-        }
+        }
+      }
+      else {
+        if (SHORT1FROMMP(mp1) == DID_OK) {
+          *mask->szMask = 0;
+          SetMask(mask->szMask, mask);
+          PrfWriteProfileData(fmprof, appname,
+                              PSCZ_FILTER_LASTMASK_SELECT, &sLastMaskSelect, sizeof(sLastMaskSelect));
+          WinDismissDlg(hwnd, 1);
+        }
+        else if (!fAlertBeepOff)
+          DosBeep(50, 100);             // MSK_DELETE
       }
       break;
@@ -670 +694 @@
 
     case DID_CANCEL:
+      PrfWriteProfileData(fmprof, appname,
+                          PSCZ_FILTER_LASTMASK_SELECT, &sLastMaskSelect, sizeof(sLastMaskSelect));
       WinDismissDlg(hwnd, 0);
       break;

trunk/dll/flesh.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2005, 2008 Steven H. Levine
+  Copyright (c) 2005, 2009 Steven H. Levine
 
   24 May 05 SHL Rework Win_Error usage
@@ -23 +23 @@
   25 Dec 08 GKY Add ProcessDirectoryThread to allow optional recursive drive scan at startup.
   25 Dec 08 GKY Add DRIVE_RSCANNED flag to monitor for the first recursive drive scan per session
-                to prevent duplicate directory names in tree following a copy before initial scan.
+                to prevent duplicate directory names in tree following a copy before initial scan.
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
 
@@ -200 +200 @@
       ProcessDir = xmallocz(sizeof(PROCESSDIR), pszSrcFile, __LINE__);
       if (!ProcessDir)
-        return FALSE;
+        return FALSE;
       ProcessDir->hwndCnr = hwndCnr;
       ProcessDir->pciParent = pciParent;
@@ -213 +213 @@
 
       if (xbeginthread(ProcessDirectoryThread,
-                       65536,
-                       ProcessDir,
-                       pszSrcFile,
-                       __LINE__) == -1)
+                       65536,
+                       ProcessDir,
+                       pszSrcFile,
+                       __LINE__) == -1)
       {
-        xfree(ProcessDir, pszSrcFile, __LINE__);
-      }
-    }
-    else  {
+        xfree(ProcessDir, pszSrcFile, __LINE__);
+      }
+    }
+    else {
       ProcessDirectory(hwndCnr,
-                       pciParent,
-                       pciParent->pszFileName,
-                       includefiles,    // filestoo
-                       TRUE,            // recurse
-                       TRUE,            // partial
-                       NULL,            // stop flag
-                       dcd,
-                       NULL,            // total files
-                       NULL);           // total bytes
+                       pciParent,
+                       pciParent->pszFileName,
+                       includefiles,    // filestoo
+                       TRUE,            // recurse
+                       TRUE,            // partial
+                       NULL,            // stop flag
+                       dcd,
+                       NULL,            // total files
+                       NULL);           // total bytes
     }
   }
@@ -268 +268 @@
 #define DDEPTH 16
 
+/**
+ * Fill in drive tree subtree
+ * @return TRUE if OK, else FALSE
+ */
+
 BOOL Stubby(HWND hwndCnr, PCNRITEM pciParent)
 {
@@ -276 +281 @@
    */
 
-  BOOL ret = FALSE;
+  BOOL ok = FALSE;
   FILEFINDBUF3 ffb[DDEPTH];
   PFILEFINDBUF3 pffb;
@@ -308 +313 @@
       str[1] != ':' ||
       str[2] != '\\' || ((flags & DRIVE_IGNORE)))
-    return FALSE;
+    return FALSE;                       // Not a directory
 
   //if (isalpha(*str) &&  // redundant check GKY 11/24/08
@@ -314 +319 @@
     includefiles = TRUE;
 
-#if 0
-  if (!isalpha(*str) ||   // redundant check GKY 11/24/08
-      str[1] != ':' ||
-      str[2] != '\\' ||
-#endif
   if (flags & DRIVE_REMOTE)
     isremote = TRUE;
@@ -398 +398 @@
                                                      &nm))));
     DosFindClose(hDir);
+    // If drive B:
     if (toupper(*pciParent->pszFileName) > 'B' &&
         (*(pciParent->pszFileName + 1)) == ':' &&
@@ -429 +430 @@
                            GetPString(IDS_FSDERRORTITLETEXT),
                            GetPString(IDS_FSDERRORTEXT),
-                           (isremote) ?
-                           GetPString(IDS_REMOTETEXT) :
-                           GetPString(IDS_LOCALTEXT), *str);
+                           isremote ? GetPString(IDS_REMOTETEXT) :
+                                      GetPString(IDS_LOCALTEXT),
+                           *str);
               if (prc == MBID_NO) {
                 saymsg(MB_ENTER,
@@ -469 +470 @@
       if (isadir) {
 
-        PCNRITEM pci;
-
-        if (WinIsWindow((HAB)0, hwndCnr)) {
-          pci = WinSendMsg(hwndCnr,
-                           CM_ALLOCRECORD,
-                           MPFROMLONG(EXTRA_RECORD_BYTES), MPFROMLONG(1));
-          if (!pci) {
-            Win_Error(hwndCnr, HWND_DESKTOP, __FILE__, __LINE__,
-                      GetPString(IDS_RECORDALLOCFAILEDTEXT));
-          }
-          else {
-            RECORDINSERT ri;
-            pci->pszFileName = NullStr;
-            pci->pszDisplayName = pci->pszFileName;
-            pci->rc.pszIcon = pci->pszDisplayName;
-            memset(&ri, 0, sizeof(RECORDINSERT));
-            ri.cb = sizeof(RECORDINSERT);
-            ri.pRecordOrder = (PRECORDCORE) CMA_END;
-            ri.pRecordParent = (PRECORDCORE) pciParent;
-            ri.zOrder = (ULONG) CMA_TOP;
-            ri.cRecordsInsert = 1;
-            ri.fInvalidateRecord = TRUE;
-            //DbgMsg(pszSrcFile, __LINE__, "Stubby %p CM_INSERTRECORD \"%s\" %.255s", hwndCnr, pci->pszFileName, pffb->achName); // 18 Dec 08 SHL fixme debug
-            if (!WinSendMsg(hwndCnr,
-                            CM_INSERTRECORD, MPFROMP(pci), MPFROMP(&ri))) {
-              DosSleep(50); //05 Aug 07 GKY 100
-              WinSetFocus(HWND_DESKTOP, hwndCnr);
-              if (WinIsWindow((HAB)0, hwndCnr)) {
-                //DbgMsg(pszSrcFile, __LINE__, "Stubby %p CM_INSERTRECORD %s", hwndCnr, pci->pszFileName); // 18 Dec 08 SHL fixme debug
-                if (!WinSendMsg(hwndCnr,
-                                CM_INSERTRECORD, MPFROMP(pci), MPFROMP(&ri))) {
-                  Win_Error(hwndCnr, HWND_DESKTOP, __FILE__, __LINE__,
-                            GetPString(IDS_RECORDINSERTFAILEDTEXT));
-                  FreeCnrItem(hwndCnr, pci);
-                }
-                else
-                  ret = TRUE;
-              }
-            }
-            else
-              ret = TRUE;
-          }
-        }
+        PCNRITEM pci;
+
+        if (WinIsWindow((HAB)0, hwndCnr)) {
+          pci = WinSendMsg(hwndCnr,
+                           CM_ALLOCRECORD,
+                           MPFROMLONG(EXTRA_RECORD_BYTES), MPFROMLONG(1));
+          if (!pci) {
+            Win_Error(hwndCnr, HWND_DESKTOP, __FILE__, __LINE__,
+                      GetPString(IDS_RECORDALLOCFAILEDTEXT));
+          }
+          else {
+            RECORDINSERT ri;
+            pci->pszFileName = NullStr;
+            pci->pszDisplayName = pci->pszFileName;
+            pci->rc.pszIcon = pci->pszDisplayName;
+            memset(&ri, 0, sizeof(RECORDINSERT));
+            ri.cb = sizeof(RECORDINSERT);
+            ri.pRecordOrder = (PRECORDCORE) CMA_END;
+            ri.pRecordParent = (PRECORDCORE) pciParent;
+            ri.zOrder = (ULONG) CMA_TOP;
+            ri.cRecordsInsert = 1;
+            ri.fInvalidateRecord = TRUE;
+            //DbgMsg(pszSrcFile, __LINE__, "Stubby %p CM_INSERTRECORD \"%s\" %.255s", hwndCnr, pci->pszFileName, pffb->achName); // 18 Dec 08 SHL fixme debug
+            if (!WinSendMsg(hwndCnr,
+                            CM_INSERTRECORD, MPFROMP(pci), MPFROMP(&ri))) {
+              DosSleep(50); //05 Aug 07 GKY 100
+              WinSetFocus(HWND_DESKTOP, hwndCnr);
+              if (WinIsWindow((HAB)0, hwndCnr)) {
+                //DbgMsg(pszSrcFile, __LINE__, "Stubby %p CM_INSERTRECORD %s", hwndCnr, pci->pszFileName); // 18 Dec 08 SHL fixme debug
+                if (!WinSendMsg(hwndCnr,
+                                CM_INSERTRECORD, MPFROMP(pci), MPFROMP(&ri))) {
+                  Win_Error(hwndCnr, HWND_DESKTOP, __FILE__, __LINE__,
+                            GetPString(IDS_RECORDINSERTFAILEDTEXT));
+                  FreeCnrItem(hwndCnr, pci);
+                }
+                else
+                  ok = TRUE;
+              }
+            }
+            else
+              ok = TRUE;
+          }
+        }
       }
       else if (toupper(*str) > 'B' && str[1] == ':' && str[2] == '\\' &&
@@ -528 +529 @@
   }
   else if (toupper(*str) > 'B' && rc != ERROR_NO_MORE_FILES) {
-
     CHAR s[CCHMAXPATH + 80];
-
     sprintf(s, GetPString(IDS_SEARCHERRORTEXT), rc, str);
     Notify(s);
@@ -538 +537 @@
 
   DosError(FERR_DISABLEHARDERR);
-  return ret;
+  return ok;
 }
 

trunk/dll/grep.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2008 Steven H. Levine
+  Copyright (c) 2001, 2009 Steven H. Levine
 
   12 Feb 03 SHL InsertGrepFile: standardize EA math
@@ -562 +562 @@
   PSZ p;
   APIRET rc;
-  // 06 Oct 07 SHL Correct size for xDosFindFirst
   ULONG ulBufBytes = FilesToGet * sizeof(FILEFINDBUF4L);
   static BOOL fDone;
@@ -697 +696 @@
 
 /**
- * Insert record into container
+ * Insert one or more records into container
  */
 
@@ -826 +825 @@
       grep->insertedbytes += pffb->cbFile + CBLIST_TO_EASIZE(pffb->cbList);
       grep->toinsert++;
-      if (grep->toinsert == FilesToGet)
+      // 07 Oct 09 SHL honor sync updates
+      if (grep->toinsert == FilesToGet || fSyncUpdates)
         return DoInsertion(grep, pitdSleep, pitdReport);
       return TRUE;

trunk/dll/grep2.c

@@ -26 +26 @@
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  07 Oct 09 SHL Remember last search mask across runs
 
   fixme for more excess locals to be gone
@@ -36 +37 @@
 #include <share.h>
 #include <time.h>
-// #include <process.h>                    // _beginthread
 
 #define INCL_DOS
 #define INCL_WIN
-#define INCL_LONGLONG                   // dircnrs.h
-#define INCL_WINSTDCNR                  // makelist.h
+#define INCL_LONGLONG                   // dircnrs.h
+#define INCL_WINSTDCNR                  // makelist.h
 
 #include "fm3dll.h"
@@ -54 +54 @@
 #include "mle.h"
 #include "grep.h"
-#include "errutil.h"                    // Dos_Error...
-#include "strutil.h"                    // GetPString
-#include "pathutil.h"                   // BldFullPathName
-#include "walkem.h"                     // FillPathListBox
+#include "errutil.h"                    // Dos_Error...
+#include "strutil.h"                    // GetPString
+#include "pathutil.h"                   // BldFullPathName
+#include "walkem.h"                     // FillPathListBox
 #include "grep2.h"
 #include "wrappers.h"                   // xfgets
-#include "misc.h"                       // LoadLibPath
+#include "misc.h"                       // LoadLibPath
 #include "strips.h"                     // bstrip
 #include "dirs.h"                       // save_dir2
 #include "fortify.h"
 #include "excputil.h"                   // xbeginthread
-#include "valid.h"                      // IsFile
+#include "valid.h"                      // IsFile
 
 #pragma data_seg(DATA1)
 
 static PSZ pszSrcFile = __FILE__;
+
+static PCSZ PSCZ_GREP_LASTMASK_SELECT = "Grep_LastMaskSelect";
 
 MRESULT EXPENTRY EnvDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
@@ -159 +161 @@
         bstrip(p);
         if (!*p) {
-          if (!fAlertBeepOff)
+          if (!fAlertBeepOff)
             DosBeep(50, 100);
           WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, ENV_NAME));
@@ -190 +192 @@
   SHORT sSelect;
   CHAR *p;
-  CHAR s[8192 + 14];
+  GREPINFO *GrepInfo;
+  ULONG size;
   CHAR simple[8192];
   CHAR path[CCHMAXPATH];
-  GREPINFO *GrepInfo;
-
-  static CHAR lastmask[8192] = "*";
-  static CHAR lasttext[4096] = "";
+  CHAR s[8192 + 14];
+
+  // 07 Oct 09 SHL fixme to not be static and save to profile?
+  static CHAR lastmask[8192];
+  static CHAR lasttext[4096];
   static BOOL recurse = TRUE;
-  static BOOL sensitive = FALSE;
-  static BOOL absolute = FALSE;
-  static BOOL sayfiles = TRUE;
+  static BOOL sensitive;
+  static BOOL absolute;
+  static BOOL sayfiles;
   static BOOL searchEAs = TRUE;
   static BOOL searchFiles = TRUE;
-  static BOOL changed = FALSE;
+  static BOOL changed;
+  static BOOL fInitDone;                // First time init done
   static BOOL findifany = TRUE;
-  static BOOL gRemember = FALSE;
-  ULONG size;
+  static BOOL gRemember;
   static UINT newer = 0;
   static UINT older = 0;
   static ULONG greater = 0;
   static ULONG lesser = 0;
+  static SHORT sLastMaskSelect = LIT_NONE;
 
   switch (msg) {
@@ -220 +225 @@
     GrepInfo = mp2;
     if (GrepInfo->szGrepPath && IsFile(GrepInfo->szGrepPath) == 0) {
-      BldFullPathName(lastmask, GrepInfo->szGrepPath, "*");
-    }
+      BldFullPathName(lastmask, GrepInfo->szGrepPath, "*");     // Directory passed
+      sLastMaskSelect = LIT_NONE;
+      fInitDone = TRUE;
+    }
+    else if (sLastMaskSelect == LIT_NONE) {
+      size = sizeof(sLastMaskSelect);
+      PrfQueryProfileData(fmprof, appname, PSCZ_GREP_LASTMASK_SELECT, &sLastMaskSelect, &size);
+      if (sLastMaskSelect >= 0)
+      fInitDone = TRUE;
+    }
+    if (!fInitDone) {
+      lastmask[0] = '*';
+      lastmask[1] = 0;
+    }
+
     WinSetWindowULong(hwnd, QWL_USER, *(HWND *) GrepInfo->hwnd);
     WinSendDlgItemMsg(hwnd,
@@ -303 +321 @@
     WinEnableWindow(WinWindowFromID(hwnd, GREP_NOSIZEDUPES), FALSE);
 
+    // Fill mask listbox
     BldFullPathName(s, pFM2SaveDirectory, PCSZ_GREPMASKDAT);
     fp = _fsopen(s, "r", SH_DENYWR);
@@ -318 +337 @@
       fclose(fp);
     }
+    // 25 Sep 09 SHL Reselect last last used item
+    if (sLastMaskSelect >= 0)
+      WinSendDlgItemMsg(hwnd, GREP_LISTBOX, LM_SELECTITEM,
+                        MPFROMSHORT(sLastMaskSelect), MPFROMSHORT(TRUE));
 
     FillPathListBox(hwnd,
                     WinWindowFromID(hwnd, GREP_DRIVELIST),
                     (HWND) 0, NULL, FALSE);
+    // 25 Sep 09 SHL fixme select drive matching current container?
     break;
 
@@ -334 +358 @@
 
   case UM_FOCUSME:
-    /* set focus to window hwnd in mp1 */
+    // set focus to window hwnd in mp1
     if (mp1)
       WinSetFocus(HWND_DESKTOP, (HWND) mp1);
@@ -409 +433 @@
           }
         }
-        break;                          // LN_ENTER
-      }                                 // switch
+        break; // LN_ENTER
+      } // switch
       break;
 
@@ -435 +459 @@
                                               MPFROMSHORT(LIT_FIRST), MPVOID);
           if (sSelect >= 0) {
+            sLastMaskSelect = sSelect;
             *s = 0;
             if (WinQueryButtonCheckstate(hwnd, GREP_APPEND)) {
@@ -650 +675 @@
           }
           rstrip(s);
+          // 25 Sep 09 SHL fixme to honor append
           if (*s) {
             strcat(s, simple);
@@ -692 +718 @@
                           GREP_LISTBOX,
                           LM_DELETEITEM, MPFROM2SHORT(sSelect, 0), MPVOID);
+        if (sSelect >= sLastMaskSelect)
+          sLastMaskSelect--;
         changed = TRUE;
       }
@@ -812 +840 @@
       else {
         // 07 Feb 08 SHL - fixme to malloc and free in thread
-        static GREP g;          // Passed to thread
-
+        static GREP g;                  // Passed to thread
         p = xmalloc(8192 + 512, pszSrcFile, __LINE__);
         if (!p)
@@ -841 +868 @@
                               (PVOID) & searchEAs, sizeof(BOOL));
         }
+        PrfWriteProfileData(fmprof, appname,
+                            PSCZ_GREP_LASTMASK_SELECT, &sLastMaskSelect, sizeof(sLastMaskSelect));
         g.finddupes = WinQueryButtonCheckstate(hwnd, GREP_FINDDUPES) != 0;
         if (g.finddupes) {
@@ -854 +883 @@
         bstrip(p);
         if (!*p) {
-          if (!fAlertBeepOff)
+          if (!fAlertBeepOff)
             DosBeep(50, 100);
           WinSetFocus(HWND_DESKTOP, WinWindowFromID(hwnd, GREP_MASK));
@@ -976 +1005 @@
       }
       if (changed) {
-        // Grep mask list changed
+        // Save modified mask list
         SHORT x;
 
@@ -983 +1012 @@
                                             LM_QUERYITEMCOUNT,
                                             MPVOID, MPVOID);
-        if (sSelect > 0) {
+        // 07 Oct 09 SHL Rewrite if list empty
+        if (sSelect >= 0) {
           BldFullPathName(s, pFM2SaveDirectory, PCSZ_GREPMASKDAT);
           if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 1) == 2)

trunk/dll/init.c

@@ -78 +78 @@
   14 Mar 09 GKY PCSZ strings moved to compile time initialization
   14 Mar 09 GKY Prevent execution of UM_SHOWME while drive scan is occuring replaces check for
-                saved drive containers.
+                saved drive containers.
   06 Jun 09 GKY Add option to show file system type or drive label in tree
   28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
@@ -85 +85 @@
   22 Jul 09 GKY Fix failure to restore the notebook setting for saving container states or not
   12 Sep 09 GKY Change protectonly check to check for VKBD being loaded instead of starting
-                command.com. Prevents hang (at least until a Dos program is started) on a system
-                that has a broken MDOS install.
+                command.com. Prevents hang (at least until a Dos program is started) on a system
+                that has a broken MDOS install.
 
 ***********************************************************************/
@@ -117 +117 @@
 #include "cmdline.h"                    // Data declaration(s)
 #include "fm2cmd.h"                     // Data declaration(s)
-#include "printer.h"                    // Data declaration(s)
-#include "flesh.h"                      // Data declaration(s)
-#include "worker.h"                     // Data declaration(s)
-#include "filldir.h"                    // Data declaration(s)
-#include "defview.h"                    // Data declaration(s)
-#include "draglist.h"                   // Data declaration(s)
+#include "printer.h"                    // Data declaration(s)
+#include "flesh.h"                      // Data declaration(s)
+#include "worker.h"                     // Data declaration(s)
+#include "filldir.h"                    // Data declaration(s)
+#include "defview.h"                    // Data declaration(s)
+#include "draglist.h"                   // Data declaration(s)
 #include "fm3dlg.h"
 #include "datamin.h"
@@ -128 +128 @@
 #include "fm3str.h"
 #include "version.h"
-#include "pathutil.h"                   // BldFullPathName
-#include "arccnrs.h"                    // ArcClientWndProc
-#include "errutil.h"                    // Dos_Error...
-#include "strutil.h"                    // GetPString
-#include "valid.h"                      // ArgDriveFlags
-#include "autoview.h"                   // AutoViewProc
+#include "pathutil.h"                   // BldFullPathName
+#include "arccnrs.h"                    // ArcClientWndProc
+#include "errutil.h"                    // Dos_Error...
+#include "strutil.h"                    // GetPString
+#include "valid.h"                      // ArgDriveFlags
+#include "autoview.h"                   // AutoViewProc
 #include "mainwnd.h"                    // BubbleProc, ChildButtonProc, DriveBackProc,
                                         // DriveProc, LEDProc, MainWndProc, StatusProc
@@ -1097 +1097 @@
   if (DosCreateMutexSem(NULL, &hmtxFM2Delete, 0L, FALSE))
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-              PCSZ_DOSCREATEMUTEXSEM);
+              PCSZ_DOSCREATEMUTEXSEM);
   if (DosCreateMutexSem(NULL, &hmtFillingTreeCnr, 0L, FALSE))
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-              PCSZ_DOSCREATEMUTEXSEM);
+              PCSZ_DOSCREATEMUTEXSEM);
   if (DosCreateEventSem(NULL, &hevInitialCnrScanComplete, 0L, FALSE))
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-              PCSZ_DOSCREATEEVENTSEM);
+              PCSZ_DOSCREATEEVENTSEM);
 
   /*
@@ -1181 +1181 @@
       rc = DosQueryModuleHandle("VKBD", &hmod);
       if (rc != NO_ERROR) {
-        fProtectOnly = TRUE;
-        DbgMsg(pszSrcFile, __LINE__, "DosQModuleHandle VKBD returned %d fProtectOnly=%d", rc, fProtectOnly);
+        fProtectOnly = TRUE;
+        DbgMsg(pszSrcFile, __LINE__, "DosQModuleHandle VKBD returned %d fProtectOnly=%d", rc, fProtectOnly);
       }
       else {
-        rc = DosQueryModuleHandle("VMOUSE", &hmod);
-        if (rc != NO_ERROR)
-          fProtectOnly = TRUE;
-        DbgMsg(pszSrcFile, __LINE__, "DosQModuleHandle VMOUSE returned %d fProtectOnly=%d", rc, fProtectOnly);
+        rc = DosQueryModuleHandle("VMOUSE", &hmod);
+        if (rc != NO_ERROR) {
+          fProtectOnly = TRUE;
+          DbgMsg(pszSrcFile, __LINE__, "DosQModuleHandle VMOUSE returned %d fProtectOnly=%d", rc, fProtectOnly);
+        }
       }
     }
@@ -1343 +1344 @@
   PrfQueryProfileData(fmprof, appname, "ShowEnv", &fShowEnv, &size);
   PrfQueryProfileString(fmprof, appname, "TreeEnvVarList", "PATH;DPATH;LIBPATH;HELP;BOOKSHELF;",
-                        pszTreeEnvVarList, MaxComLineStrg);
+                        pszTreeEnvVarList, MaxComLineStrg);
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, FM3Str, "ShowDriveOnly", &fShowDriveOnly, &size);
@@ -1408 +1409 @@
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "ConfirmDelete", &fConfirmDelete, &size);
-  size = sizeof(BOOL);  
+  size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, FM3Str, "SaveState", &fSaveState, &size);
   size = sizeof(BOOL);

trunk/dll/ipf/arclist.ipf

@@ -6 +6 @@
 .*
 .* Copyright (c) 1993-98 M. Kimes
-.* Copyright (c) 2004 Steven H.Levine
-.*
-.* Revisions    31 Jul 04 SHL - Rework file name position description
+.* Copyright (c) 2004, 2009 Steven H.Levine
+.*
+.* 31 Jul 04 SHL Rework file name position description
+.* 28 Sep 09 SHL Minor updates
 .*
 .***********************************************************************
@@ -119 +120 @@
 enclosed directories (i.e. files are extracted into the directories they
 were archived "with," if any, rather than all going into the extract
-directory). :hp1.Extract All w/ Dirs &amp. Exit:ehp1. does the same
+directory).
+:p.
+:hp1.Extract All w/ Dirs &amp. Exit:ehp1. does the same
 thing but closes the archive listing window after starting the
 extraction. (:hp2.Note:ehp2. that if all you want to do to an archive

trunk/dll/ipf/collect.ipf

@@ +1 @@
+.***********************************************************************
+.*
+.* $Id$
+.*
+.* Collector
+.*
+.* Copyright (c) 1993-98 M. Kimes
+.* Copyright (c) 2006, 2009 Steven H.Levine
+.*
+.* 29 Apr 09 SHL Expand say files usage help
+.*
+.***********************************************************************
+.*
 :h2 res=90100 name=PANEL_COLLECTOR.Collector
 :i1 id=aboutCollector.Collector
@@ -108 +121 @@
 :p.
 The :hp6.Say files as found:ehp6. checkbox tells FM/2 to display the
-filenames it finds based on the filemasks as it encounters them, if
-checked.
+filenames it finds based on the filemasks as it encounters them, if checked.
+This is the recommended setting if you expect the filemask to match a relatively small number
+of files.
+If the checkbox is unchecked, FM/2 will report progress by displaying
+the filename in process every couple of seconds.
+This is the recommended setting if you expect the filemask to match a large number
+of files and will speed up Seek and scan performance.
+If you expect to match a large number of files, it is probably best to toggle
+off :hp6.Immediate updates:ehp6. in the Config menu.
 :p.
 The :hp6.Search files:ehp6. checkbox, when checked, tells FM/2 to look

trunk/dll/ipf/fm3.ipf

@@ -6 +6 @@
 .*
 .* Copyright (c) 1993-98 M. Kimes
-.* Copyright (c) 2006 Steven H.Levine
+.* Copyright (c) 2006, 2009 Steven H.Levine
 .*
 .* 24 Sep 06 GKY ADD Change to F1 help
@@ -873 +873 @@
 quicklists:ehp1. command ( :color fc=default bc=palegray.F8:color fc=default bc=default. accelerator).
 :p.
-The first list (starting from the left) contains drives. If you select a
+The first quicklist (starting from the left) contains drives. If you select a
 drive from the list, the Drive Tree scrolls to that drive and makes it the
 current object in the Drive Tree. This can be handy when you have the tree
@@ -881 +881 @@
 :p.
 .br
-The second list is the State list, containing the names of saved States of
+The second list is the States quicklist, containing the names of saved States of
 the FM/2 window (what directories are open, where the windows are located,
-etc.). You can add to this list by typing a name into the entry field,
-requesting a context menu on the entry field, then selecting :hp1.Save
-State as name:ehp1. from the context menu. FM/2 will save its current
-State under that name for later recall. FM/2 provides one state automatically.
-It is called FM2Shutdown and it will restore FM/2 to the state it was in
-when it was last shutdown. This is the same state that is opened on start up
-if you have "Save state of dir windows" selected.
+etc.). To add a State to this list, type the name into the entry field,
+and select :hp1.Save State as name:ehp1. from the context menu.
+FM/2 will save its current state under this name for later recall.
+:p.
+To delete a State, recall the State name from the States quicklist or type the State name
+into the entry field and and select :hp1.Delete state:ehp1. from the context menu.
+To recall a State name without switching to the State, hold down the
+&CtrlKey. while selecting the State name from the list.
+:p.
+FM/2 provides one built-in State.
+It is named FM2Shutdown and it can be used to restore FM/2 to the state it was in
+when FM/2 was last shutdown. This State is opened on start up
+if you have "Save dir window state" selected on the Monolithic tab of the
+Configuration menu.
 :p.
 :artwork name='bitmaps\useradds.bmp' align=center.
@@ -905 +912 @@
 more flexible than the way DOS-think file managers do things.
 :p.
-To "edit" a State, first recall it, then change what you want, then
-delete the State name, then save it again.
-:p.
-Holding down the  &ShiftKey.
- key while selecting a state name prevents FM/2 from closing windows that are already open.
+To edit a State, first recall it, then change what you want, then
+resave the State.
+:p.
+To add a saved State to the current state, hold down the &ShiftKey.
+key while selecting a State name from the list.
+The container windows defined by the selected State will be added to the current container windows.
 :p.
 :artwork name='bitmaps\userstat.bmp' align=center.
 :p.
 .br
-The third list is the user-defined commands list. User-defined commands
+The third list is the user-defined commands quicklist. User-defined commands
 allow you to extend FM/2 with commands of your own devising. You can
 add, change and delete commands with the :hp1.Config->Edit Commands:ehp1.
@@ -922 +930 @@
 :p.
 .br
-The fourth list is the commonly used directory list. You can add a
+The fourth list is the commonly used directory quicklist. You can add a
 directory to this list as above; type in the name and select :hp1.Add
 pathname:ehp1. from a context menu.
@@ -950 +958 @@
 :color fc=default bc=palegray.M:color fc=default bc=default. accelerator key).
 :p.
-The commonly used directory list, in combination with the State list,
+The commonly used directory quicklist, in combination with the States quicklist,
 allows you to quickly place FM/2 into precisely the configuration you
 need to get real work done.

trunk/dll/ipf/walkem.ipf

@@ +1 @@
+.***********************************************************************
+.*
+.* $Id$
+.*
+.* Walk dialog help
+.*
+.* Copyright (c) 1993-98 M. Kimes
+.* Copyright (c) 2002, 2009 Steven H.Levine
+.*
+.* 07 Oct 09 SHL Drop 100 file limit text
+.*
+.***********************************************************************
+.*
 :h1 res=91500 name=PANEL_WALKEM.Walk Directories
 :i1 id=aboutWalkem.Walk Directories
@@ -20 +33 @@
 :hp1.Add:ehp1. when the desired directory name is displayed in the
 entry field at the bottom of the window. To delete a directory,
-highlight it and click :hp1.Delete:ehp1.. To switch to one of these
+highlight it and click :hp1.Delete:ehp1..
+To switch to one of these
 user-defined directories, highlight it and click &OkayButton. or
-double-click the directory. You can add up to 100 directories.
+double-click the directory.
+To highlight the directory without switching, hold down the &CtrlKey.
+and click on the directory.
 :p.
 You can also select directories from the Recent directories drop-down
@@ -28 +44 @@
 automatically as you traverse your drives. Just drop down the list
 and click the directory of choice.
+To exit the drop down list without making a selection, click the drop down arrow
+or Tab out of the drop down list with the Tab key.
 :p.
 When the desired directory is displayed in the bottom entry field of
-the dialog, click &OkayButton. to exit. Click &CancelButton. to
+the dialog, click &OkayButton. to exit. Click the &CancelButton. to
 exit without selecting a directory.
 

trunk/dll/key.c

@@ -54 +54 @@
   static INT width, direction, ticktock, counter;
   static HPOINTER stick1, stick2, stick3, stick4, stick12, stick22, stick32,
-    stick42, stick5, stick52;
+                  stick42, stick5, stick52;
 
   switch (msg) {

trunk/dll/mainwnd.c

@@ -2056 +2056 @@
         BOOL rdy, local;
         CHAR chDrv = *szDrv;
-        UINT iDrv;
+        UINT iDrv = chDrv - 'A';
 
         strcat(szDrv, PCSZ_BACKSLASH);
@@ -4101 +4101 @@
           if (fUserComboBox) {
             if (!aheight) {
-
               SWP swpTemp;
-
               WinQueryWindowPos(WinWindowFromID(hwndDrivelist, CBID_EDIT),
                                 &swpTemp);
@@ -4318 +4316 @@
       if (fUserComboBox) {
         if (!aheight) {
-
           SWP swpTemp;
-
           WinQueryWindowPos(WinWindowFromID(hwndDrivelist, CBID_EDIT),
                             &swpTemp);
@@ -6281 +6277 @@
           if (*path) {
             if (SHORT1FROMMP(mp1) == MAIN_USERLIST) {
+              // 06 Oct 09 SHL Ctrl-select selects, but suppresses open
+                if ((shiftstate & (KC_CTRL | KC_SHIFT | KC_ALT)) == KC_CTRL)
+                  break;
               if (!strcmp(path, GetPString(IDS_NEWDIRECTORYTEXT))) {
                 if (!LastDir ||
@@ -6323 +6322 @@
             else if (SHORT1FROMMP(mp1) == MAIN_SETUPLIST) {
               CHAR szKey[80];
-              ULONG size, numsaves = 0;
-
-              SetShiftState();
-              size = sizeof(ULONG);
+              ULONG numsaves = 0;
+              ULONG size = sizeof(ULONG);
+              // 06 Oct 09 SHL Ctrl-select selects, but suppresses open
+                if ((shiftstate & (KC_CTRL | KC_SHIFT | KC_ALT)) == KC_CTRL)
+                  break;
               sprintf(szKey, "%s.NumDirsLastTime", path);       // path is state name
               if (!PrfQueryProfileData(fmprof,
@@ -6369 +6369 @@
             else if (SHORT1FROMMP(mp1) == MAIN_CMDLIST) {
 
-              SHORT sSelect;
-
-              sSelect = (SHORT) WinSendMsg(hwndCmdlist,
-                                           LM_QUERYSELECTION,
-                                           MPFROMSHORT(LIT_FIRST), MPVOID);
+              SHORT sSelect = (SHORT) WinSendMsg(hwndCmdlist,
+                                                 LM_QUERYSELECTION,
+                                                 MPFROMSHORT(LIT_FIRST), MPVOID);
               if (sSelect >= 0)
                 WinPostMsg(hwnd,
@@ -6382 +6380 @@
             }
           }
-        }
+        } // CBN_ENTER
         break;
 

trunk/dll/treecnr.c

@@ -106 +106 @@
 #include "notebook.h"                   // CfgDlgProc
 #include "command.h"                    // RunCommand
-#include "worker.h"             // Action, MassAction
+#include "worker.h"                     // Action, MassAction
 #include "mainwnd.h"                    // BubbleHelp, FindDirCnrByName, GetNextWindowPos
 #include "misc.h"                       // CnrDirectEdit, EmphasizeButton, FindDirCnr
-                                // FindDirCnr, FixSwitchList, OpenEdit, QuickPopup
-                                // SetSortChecks, SwitchCommand, CheckMenu
-                                // CurrentRecord, IsFm2Window
+                                        // FindDirCnr, FixSwitchList, OpenEdit, QuickPopup
+                                        // SetSortChecks, SwitchCommand, CheckMenu
+                                        // CurrentRecord, IsFm2Window
 #include "common.h"                     // CommonCnrProc, CommonDriveCmd, CommonFrameWndProc
-                                // CommonTextProc
+                                        // CommonTextProc
 #include "valid.h"                      // CheckDrive, DriveFlagsOne, IsValidDrive
 #include "chklist.h"                    // DropListProc
@@ -838 +838 @@
         }
       }
+      // 21 Sep 09 SHL fixme to know why checking again - focus change?
       if (dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent))
         WinSetWindowText(hwndStatus, s);

trunk/dll/walkem.c

@@ -35 +35 @@
   24 Aug 08 GKY Warn full drive on save of .DAT file; prevent loss of existing file
   28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
+  06 Oct 09 SHL Ctrl-select selects Walk Dialog listbox entry, but suppresses action
 
 ***********************************************************************/
@@ -1069 +1070 @@
         APIRET rc;
 
+        // 06 Oct 09 SHL Ctrl-select selects, but suppresses action
+        SetShiftState();
+        if ((shiftstate & (KC_CTRL | KC_SHIFT | KC_ALT)) == KC_CTRL)
+          break;
         DosError(FERR_DISABLEHARDERR);
         hDir = HDIR_CREATE;
@@ -1234 +1239 @@
 
     case WALK_DELETE:
-      *szBuff = 0;
-      WinQueryDlgItemText(hwnd, WALK_PATH, CCHMAXPATH, szBuff);
-      bstrip(szBuff);
-      while ((p = strchr(szBuff, '/')) != NULL)
-        *p = '\\';
-      if (*szBuff && !IsFile(szBuff)) {
-        MakeFullName(szBuff);
-        sSelect = (SHORT) WinSendDlgItemMsg(hwnd,
-                                            WALK_USERLIST,
-                                            LM_SEARCHSTRING,
-                                            MPFROM2SHORT(0, LIT_FIRST),
-                                            MPFROMP(szBuff));
-        if (sSelect >= 0) {
-          WinSendDlgItemMsg(hwnd,
-                            WALK_USERLIST,
-                            LM_DELETEITEM, MPFROM2SHORT(sSelect, 0), MPVOID);
-          remove_udir(szBuff);
-          wa->changed = 1;
-        }
+      // 07 Oct 09 SHL Delete current selection, like docs says
+      sSelect = (SHORT)WinSendDlgItemMsg(hwnd,
+                                         WALK_USERLIST,
+                                         LM_QUERYSELECTION,
+                                         MPFROMSHORT(LIT_FIRST), MPVOID);
+      if (sSelect >= 0) {
+        WinSendDlgItemMsg(hwnd,
+                          WALK_USERLIST,
+                          LM_DELETEITEM, MPFROM2SHORT(sSelect, 0), MPVOID);
+        remove_udir(szBuff);
+        wa->changed = 1;
       }
       break;
@@ -1270 +1267 @@
         SWP swp;
         ULONG size = sizeof(SWP);
-
         WinQueryWindowPos(hwnd, &swp);
         PrfWriteProfileData(fmprof, FM3Str, "WalkDir.Position", (PVOID) &swp,