Changeset 783

Timestamp:

Aug 14, 2007, 6:09:54 AM (18 years ago)

Author:

Steven Levine

Message:

Rework DosFindFirst/Next loops to optimize memory allocation and code paths
Adjust FilesToGet limits
Update configuration notebook scanning page
Start updating #pragma alloc_text positioning for OpenWatcom compatibility

Location:

trunk/dll

Files:

• comp.c (modified) (11 diffs)
• dirsize.c (modified) (15 diffs)
• filldir.c (modified) (31 diffs)
• fm3res.dlg (modified) (2 diffs)
• grep.c (modified) (52 diffs)
• init.c (modified) (4 diffs)
• ipf/notebook.ipf (modified) (4 diffs)
• notebook.c (modified) (9 diffs)
• objcnr.c (modified) (11 diffs)
• seeall.c (modified) (14 diffs)

trunk/dll/comp.c

@@ -31 +31 @@
   07 Aug 07 SHL COMP_COLLECT: Avoid collecting empty entries when nothing selected
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
-
+  13 Aug 07 SHL Sync code with other FilesToGet usage
+  13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
 
 ***********************************************************************/
@@ -37 +38 @@
 #define INCL_DOS
 #define INCL_WIN
+#define INCL_DOSERRORS
 #define INCL_GPI
 #define INCL_LONGLONG
@@ -52 +54 @@
 #include "fm3dlg.h"
 #include "fm3str.h"
-
-#pragma alloc_text(COMPAREDIR,FillCnrsThread,FillDirList,CompNames,BldFullPathName)
-#pragma alloc_text(COMPAREDIR1,CompareDlgProc)
-#pragma alloc_text(COMPAREDIR2,SelectCnrsThread,ActionCnrThread)
-#pragma alloc_text(COMPAREFILE,CFileDlgProc,CompareFilesThread)
-#pragma alloc_text(SNAPSHOT,SnapShot,StartSnap)
 
 typedef struct
@@ -92 +88 @@
 //=== SnapShot() Write directory tree to file and recurse if requested ===
 
-static VOID SnapShot(char *path, FILE * fp, BOOL recurse)
+static VOID SnapShot(char *path, FILE *fp, BOOL recurse)
 {
-  FILEFINDBUF4 *fb;
+  PFILEFINDBUF4 pffb;
   char *mask, *enddir;
   HDIR hdir = HDIR_CREATE;
-  ULONG nm = 1;
-
-  fb = xmalloc(sizeof(FILEFINDBUF4), pszSrcFile, __LINE__);
-  if (fb) {
+  ULONG ulFindCnt;
+
+  // 13 Aug 07 SHL fimxe to use FileToGet
+  pffb = xmalloc(sizeof(FILEFINDBUF4), pszSrcFile, __LINE__);
+  if (pffb) {
     mask = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__);
     if (mask) {
-      sprintf(mask,
-              "%s%s*",
-              path, (path[strlen(path) - 1] != '\\') ? "\\" : NullStr);
+      BldFullPathName(mask, path, "*");
+      // sprintf(mask,
+      //         "%s%s*",
+      //         path, (path[strlen(path) - 1] != '\\') ? "\\" : NullStr);
       enddir = strrchr(mask, '\\');
       enddir++;
+      ulFindCnt = 1;
+      // 13 Aug 07 SHL fixme to report errors
       if (!DosFindFirst(mask,
                         &hdir,
@@ -113 +113 @@
                         FILE_ARCHIVED | FILE_READONLY | FILE_HIDDEN |
                         FILE_SYSTEM,
-                        fb, sizeof(FILEFINDBUF4), &nm, FIL_QUERYEASIZE)) {
+                        pffb, sizeof(FILEFINDBUF4), &ulFindCnt, FIL_QUERYEASIZE)) {
         do {
-          strcpy(enddir, fb->achName);
-          if (!(fb->attrFile & FILE_DIRECTORY))
+          strcpy(enddir, pffb->achName);
+          if (!(pffb->attrFile & FILE_DIRECTORY))
             fprintf(fp,
                     "\"%s\",%u,%lu,%04u/%02u/%02u,%02u:%02u:%02u,%lu,%lu,N\n",
                     mask,
                     enddir - mask,
-                    fb->cbFile,
-                    (fb->fdateLastWrite.year + 1980),
-                    fb->fdateLastWrite.month,
-                    fb->fdateLastWrite.day,
-                    fb->ftimeLastWrite.hours,
-                    fb->ftimeLastWrite.minutes,
-                    fb->ftimeLastWrite.twosecs,
-                    fb->attrFile, (fb->cbList > 4) ? (fb->cbList / 2) : 0);
+                    pffb->cbFile,
+                    (pffb->fdateLastWrite.year + 1980),
+                    pffb->fdateLastWrite.month,
+                    pffb->fdateLastWrite.day,
+                    pffb->ftimeLastWrite.hours,
+                    pffb->ftimeLastWrite.minutes,
+                    pffb->ftimeLastWrite.twosecs,
+                    pffb->attrFile, (pffb->cbList > 4) ? (pffb->cbList / 2) : 0);
           // Skip . and ..
           else if (recurse &&
-                   (fb->achName[0] != '.' ||
-                    (fb->achName[1] &&
-                     (fb->achName[1] != '.' || fb->achName[2])))) {
+                   (pffb->achName[0] != '.' ||
+                    (pffb->achName[1] &&
+                     (pffb->achName[1] != '.' || pffb->achName[2])))) {
             SnapShot(mask, fp, recurse);
           }
-          nm = 1;
-        } while (!DosFindNext(hdir, fb, sizeof(FILEFINDBUF4), &nm));
+          ulFindCnt = 1;
+        } while (!DosFindNext(hdir, pffb, sizeof(FILEFINDBUF4), &ulFindCnt));
         DosFindClose(hdir);
       }
       free(mask);
     }
-    free(fb);
+    free(pffb);
   }
 }
@@ -683 +683 @@
   HMQ hmq;
 
-  if (!cmp)
+  if (!cmp) {
+    Runtime_Error(pszSrcFile, __LINE__, "no data");
     return;
+  }
 
   DosError(FERR_DISABLEHARDERR);
@@ -729 +731 @@
                         FILELIST ***list, INT *numfiles, INT *numalloc)
 {
-
-  BYTE *fb;
   CHAR *enddir;
   ULONG x;
   CHAR *maskstr;
-  FILEFINDBUF4 *ffb4, *pffb;
+  PFILEFINDBUF4 pffbArray;
+  PFILEFINDBUF4 pffbFile;
   HDIR hDir;
-  ULONG nm, fl = 0, ulM = FilesToGet;
+  ULONG ulFindCnt;
+  ULONG ulBufBytes = sizeof(FILEFINDBUF4) * FilesToGet;
   APIRET rc;
 
@@ -744 +746 @@
   }
 
-  //if (!recurse)
-  //  ulM = FilesToGet;
   maskstr = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__);
   if (!maskstr)
     return;
-  ffb4 = xmalloc(sizeof(FILEFINDBUF4) * ulM, pszSrcFile, __LINE__);
-  if (!ffb4) {
+  pffbArray = xmalloc(ulBufBytes, pszSrcFile, __LINE__);
+  if (!pffbArray) {
     free(maskstr);
     return;
@@ -765 +765 @@
   *(enddir + 1) = 0;
   hDir = HDIR_CREATE;
-  nm = ulM;
-  if (recurse)
-    fl = FILE_DIRECTORY;
   DosError(FERR_DISABLEHARDERR);
+  ulFindCnt = FilesToGet;
   rc = DosFindFirst(maskstr, &hDir,
-                    (FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
-                     FILE_SYSTEM | FILE_HIDDEN) | fl,
-                    ffb4, sizeof(FILEFINDBUF4) * nm, &nm, FIL_QUERYEASIZE);
+                    FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
+                    FILE_SYSTEM | FILE_HIDDEN |
+                    (recurse ? FILE_DIRECTORY : 0),
+                    pffbArray, ulBufBytes, &ulFindCnt, FIL_QUERYEASIZE);
   if (!rc) {
-    while (!rc) {
-      fb = (BYTE *) ffb4;
-      x = 0;
-      while (x < nm) {
-        pffb = (FILEFINDBUF4 *) fb;
-        if (pffb->attrFile & FILE_DIRECTORY) {
+    do {
+      pffbFile = pffbArray;
+      for (x = 0; x < ulFindCnt; x++) {
+        if (pffbFile->attrFile & FILE_DIRECTORY) {
           // Skip . and ..
           if (recurse &&
-              (pffb->achName[0] != '.' ||
-               (pffb->achName[1] &&
-                (pffb->achName[1] != '.' || pffb->achName[2])))) {
+              (pffbFile->achName[0] != '.' ||
+               (pffbFile->achName[1] &&
+                (pffbFile->achName[1] != '.' || pffbFile->achName[2])))) {
             if (fForceUpper)
-              strupr(pffb->achName);
+              strupr(pffbFile->achName);
             else if (fForceLower)
-              strlwr(pffb->achName);
-            memcpy(enddir, pffb->achName, pffb->cchName + 1);
+              strlwr(pffbFile->achName);
+            memcpy(enddir, pffbFile->achName, pffbFile->cchName + 1);
             FillDirList(maskstr, skiplen, recurse, list, numfiles, numalloc);
           }
@@ -795 +792 @@
         else {
           if (fForceUpper)
-            strupr(pffb->achName);
+            strupr(pffbFile->achName);
           else if (fForceLower)
-            strlwr(pffb->achName);
-          memcpy(enddir, pffb->achName, pffb->cchName + 1);
-          if (AddToFileList
-              (maskstr + skiplen, pffb, list, numfiles, numalloc))
+            strlwr(pffbFile->achName);
+          memcpy(enddir, pffbFile->achName, pffbFile->cchName + 1);
+          if (AddToFileList(maskstr + skiplen,
+                            pffbFile, list, numfiles, numalloc)) {
             goto Abort;
-        }
-        fb += pffb->oNextEntryOffset;
-        x++;
-      }
-      nm = ulM;
+          }
+        }
+        pffbFile = (PFILEFINDBUF4)((PBYTE)pffbFile + pffbFile->oNextEntryOffset);
+      } // for
       DosError(FERR_DISABLEHARDERR);
-      rc = DosFindNext(hDir, ffb4, sizeof(FILEFINDBUF4) * nm, &nm);
-    }
-  Abort:
+      ulFindCnt = FilesToGet;
+      rc = DosFindNext(hDir, pffbArray, ulBufBytes, &ulFindCnt);
+    } while (!rc);
+
+Abort:
+
     DosFindClose(hDir);
     DosSleep(1);
   }
+
+  if (rc && rc != ERROR_NO_MORE_FILES) {
+    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              GetPString(IDS_CANTFINDDIRTEXT), maskstr);
+  }
+
   free(maskstr);
-  free(ffb4);
+  free(pffbArray);
 }
 
@@ -2500 +2505 @@
   return WinDefDlgProc(hwnd, msg, mp1, mp2);
 }
+
+#pragma alloc_text(COMPAREDIR,FillCnrsThread,FillDirList,CompNames,BldFullPathName)
+#pragma alloc_text(COMPAREDIR1,CompareDlgProc)
+#pragma alloc_text(COMPAREDIR2,SelectCnrsThread,ActionCnrThread)
+#pragma alloc_text(COMPAREFILE,CFileDlgProc,CompareFilesThread)
+#pragma alloc_text(SNAPSHOT,SnapShot,StartSnap)
+

trunk/dll/dirsize.c

@@ -28 +28 @@
   03 Aug 07 SHL DirSizeProc; correct sizing and positioning to be deterministic
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
-  11 Aug 07 SHL ProcessDir: remove unneeded reallocs
+  13 Aug 07 SHL ProcessDir: remove unneeded reallocs.  Sanitize code
+  13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
 
 ***********************************************************************/
@@ -68 +69 @@
 static PSZ pszSrcFile = __FILE__;
 
-#pragma alloc_text(DIRSIZE,ProcessDir,FillCnrThread,DirSizeProc)
-#pragma alloc_text(DIRSIZE2,PrintToFile,FillInRecSizes,SortSizeCnr)
-
-static SHORT APIENTRY SortSizeCnr(PMINIRECORDCORE p1, PMINIRECORDCORE p2,
+static SHORT APIENTRY SortSizeCnr(PMINIRECORDCORE p1,
+                                  PMINIRECORDCORE p2,
                                   PVOID SortFlags)
 {
@@ -95 +94 @@
   register char *sp;
   register char *pp;
-  ULONG nm;
+  ULONG ulFindCnt;
   ULONGLONG ullCurDirBytes = 0;
   ULONGLONG ullSubDirBytes = 0;
   ULONGLONG ull;
   HDIR hdir;
-  FILEFINDBUF4 *pffb;
+  PFILEFINDBUF4 pffbArray;
   APIRET rc;
   RECORDINSERT ri;
   PCNRITEM pci;
-
-  // fixme to report errors
+  ULONG ulBufBytes;
+
   *pullTotalBytes = 0;                  // In case we fail
 
-  pffb = xmalloc(sizeof(FILEFINDBUF4) * FilesToGet, pszSrcFile, __LINE__);
-  if (!pffb)
+  ulBufBytes = sizeof(FILEFINDBUF4) * FilesToGet;
+  pffbArray = xmalloc(ulBufBytes, pszSrcFile, __LINE__);
+  if (!pffbArray)
     return FALSE;                       // Error already reported
 
@@ -119 +119 @@
 
   hdir = HDIR_CREATE;
-  nm = 1;
-  // 11 Aug 07 SHL fixme to know if we can bypass memset
-  memset(pffb, 0, sizeof(FILEFINDBUF4));
+  ulFindCnt = 1;
+  // memset(pffbArray, 0, sizeof(FILEFINDBUF4));        // 11 Aug 07 SHL bypass memset
   DosError(FERR_DISABLEHARDERR);
   // Check directory exists
@@ -127 +126 @@
                     FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
                     FILE_SYSTEM | FILE_HIDDEN | MUST_HAVE_DIRECTORY,
-                    pffb, sizeof(FILEFINDBUF4), &nm, FIL_QUERYEASIZE);
+                    pffbArray, ulBufBytes, &ulFindCnt, FIL_QUERYEASIZE);
 
   if (!rc)
@@ -137 +136 @@
    * requesting EASIZE.  sheesh.
    */
-  if ((!rc && (pffb->attrFile & FILE_DIRECTORY)) || strlen(pszFileName) < 4) {
+  if ((!rc && (pffbArray->attrFile & FILE_DIRECTORY)) || strlen(pszFileName) < 4) {
     if (*pchStopFlag) {
-      free(pffb);
+      free(pffbArray);
       return FALSE;
     }
@@ -145 +144 @@
                      MPFROMLONG(1));
     if (!pci) {
-      free(pffb);
+      Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, "CM_ALLOCRECORD");
+      free(pffbArray);
       return FALSE;
     }
     if (!rc) {
-      ullCurDirBytes = pffb->cbFile;
-      ullCurDirBytes += CBLIST_TO_EASIZE(pffb->cbList);
+      ullCurDirBytes = pffbArray->cbFile;
+      ullCurDirBytes += CBLIST_TO_EASIZE(pffbArray->cbList);
     }
     else
@@ -161 +161 @@
   else {
     // No match
-    free(pffb);
+    free(pffbArray);
     Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               GetPString(IDS_CANTFINDDIRTEXT), pszFileName);
@@ -186 +186 @@
     pci->pszFileName = xstrdup(szBuf, pszSrcFile, __LINE__);
   }
-  // fixme to know why - it appears to be indirectly saving length, but why?
+  // fixme to understand this - appears to be indirectly saving length, but why?
   pci->pszDisplayName = pci->pszFileName + strlen(pci->pszFileName);
   pci->pszLongName = pci->pszFileName;  // fixme to be sure?
@@ -204 +204 @@
   ri.fInvalidateRecord = TRUE;
   if (!WinSendMsg(hwndCnr, CM_INSERTRECORD, MPFROMP(pci), MPFROMP(&ri))) {
-    free(pffb);
+    free(pffbArray);
     return FALSE;
   }
@@ -210 +210 @@
   // Find files and directories in this directory
   hdir = HDIR_CREATE;
-  nm = FilesToGet;
+  // 13 Aug 07 SHL fixme to know if need to support fRemoteBug here like objcnr.c?
+  ulFindCnt = FilesToGet;
   rc = DosFindFirst(maskstr, &hdir,
                     FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
                     FILE_SYSTEM | FILE_HIDDEN | FILE_DIRECTORY,
-                    pffb, nm * sizeof(FILEFINDBUF4), &nm, FIL_QUERYEASIZE);
+                    pffbArray, ulBufBytes, &ulFindCnt, FIL_QUERYEASIZE);
   if (!rc) {
-    PBYTE fb = (PBYTE)pffb;
-    FILEFINDBUF4 *pffbFile;
+    PFILEFINDBUF4 pffbFile;
     ULONG x;
 
     while (!rc) {
+
+#if 0 // 13 Aug 07 SHL fixme to be gone
+      {
+        static ULONG ulMaxCnt = 1;
+        if (ulFindCnt > ulMaxCnt) {
+          ulMaxCnt = ulFindCnt;
+          DbgMsg(pszSrcFile, __LINE__, "ulMaxCnt %u/%u", ulMaxCnt, FilesToGet);
+        }
+      }
+#endif
+
       priority_normal();
-      for (x = 0; x < nm; x++) {
-        pffbFile = (FILEFINDBUF4 *)fb;
+      pffbFile = pffbArray;
+      for (x = 0; x < ulFindCnt; x++) {
         // Total size skipping . and ..
         if ((~pffbFile->attrFile & FILE_DIRECTORY) ||
@@ -232 +243 @@
           ullCurDirBytes += CBLIST_TO_EASIZE(pffbFile->cbList) & 0x3ff;
 
-          if (!(pffbFile->attrFile & FILE_DIRECTORY))
-            pci->attrFile++;            // Bump file count
           if (*pchStopFlag)
             break;
-          if (pffbFile->attrFile & FILE_DIRECTORY) {
+          if (~pffbFile->attrFile & FILE_DIRECTORY)
+            pci->attrFile++;            // Bump file count
+          else {
             // Recurse into subdir
             strcpy(pEndMask, pffbFile->achName);        // Append dirname to base dirname
-            if (!*pchStopFlag) {
-              ProcessDir(hwndCnr, maskstr, pci, pchStopFlag, FALSE, &ull);
-              ullSubDirBytes += ull;
-            }
+            ProcessDir(hwndCnr, maskstr, pci, pchStopFlag, FALSE, &ull);
+            ullSubDirBytes += ull;
           }
         }
         if (!pffbFile->oNextEntryOffset)
           break;
-        fb += pffbFile->oNextEntryOffset;
+        pffbFile = (PFILEFINDBUF4)((PBYTE)pffbFile + pffbFile->oNextEntryOffset);
+
+#if 0 // 13 Aug 07 SHL fixme to be gone
+        {
+          static ULONG ulMaxBytes = 65535;
+          ULONG ul = (PBYTE)pffbFile - (PBYTE)pffbArray;
+          if (ul > ulMaxBytes) {
+            ulMaxBytes = ul;
+            DbgMsg(pszSrcFile, __LINE__, "ulFindCnt %u/%u ulMaxBytes %u/%u",
+                   ulFindCnt, FilesToGet, ulMaxBytes, ulBufBytes);
+          }
+        }
+#endif
+
       } // for matches
       if (*pchStopFlag)
         break;
-      DosSleep(1);
-      nm = FilesToGet;
+      DosSleep(0);
+      ulFindCnt = FilesToGet;
       DosError(FERR_DISABLEHARDERR);
-      rc = DosFindNext(hdir, pffb, sizeof(FILEFINDBUF4) * FilesToGet, &nm);
+      rc = DosFindNext(hdir, pffbArray, ulBufBytes, &ulFindCnt);
     } // while more found
-
-    if (rc != ERROR_NO_MORE_FILES) {
-      Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                GetPString(IDS_CANTFINDDIRTEXT), pszFileName);
-    }
 
     DosFindClose(hdir);
@@ -266 +283 @@
   } // if got files or directories
 
-  free(pffb);
+  if (rc && rc != ERROR_NO_MORE_FILES) {
+    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              GetPString(IDS_CANTFINDDIRTEXT), pszFileName);
+  }
+
+  free(pffbArray);
 
   pci->cbFile = ullCurDirBytes;
@@ -407 +429 @@
 }
 
-static VOID FillCnrThread(VOID * args)
+static VOID FillCnrThread(VOID *args)
 {
   HAB hab;
   HMQ hmq;
-  DIRSIZE *dirsize = (DIRSIZE *) args;
+  DIRSIZE *dirsize = (DIRSIZE *)args;
   HWND hwndCnr;
   ULONGLONG ull;
 
-  if (!dirsize)
+  if (!dirsize) {
+    Runtime_Error(pszSrcFile, __LINE__, "no data");
     return;
+  }
+
   hwndCnr = dirsize->hwndCnr;
 
@@ -965 +990 @@
   return WinDefDlgProc(hwnd, msg, mp1, mp2);
 }
+
+#pragma alloc_text(DIRSIZE,ProcessDir,FillCnrThread,DirSizeProc)
+#pragma alloc_text(DIRSIZE2,PrintToFile,FillInRecSizes,SortSizeCnr)
+

trunk/dll/filldir.c

@@ -37 +37 @@
   04 Aug 07 SHL Update #pragma alloc_test for new functions
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
+  13 Aug 07 SHL Sync code with other FilesToGet usage and optimize
+  13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
 
 ***********************************************************************/
@@ -42 +44 @@
 #define INCL_DOS
 #define INCL_WIN
+#define INCL_DOSERRORS
 #define INCL_LONGLONG
 #include <os2.h>
@@ -53 +56 @@
 #include <time.h>
 
-#if 1 // fixme to disable or to be configurable
+#if 0 // fixme to disable or to be configurable
 #include <malloc.h>                     // _heapchk
 #endif
@@ -61 +64 @@
 
 static PSZ pszSrcFile = __FILE__;
-
-#pragma alloc_text(FILLDIR,FillInRecordFromFFB,FillInRecordFromFSA,IDFile)
-#pragma alloc_text(FILLDIR1,ProcessDirectory,FillDirCnr,FillTreeCnr,FileAttrToString)
-#pragma alloc_text(EMPTYCNR,EmptyCnr,FreeCnrItemData,FreeCnrItem,FreeCnrItemList,RemoveCnrItems)
 
 /**
@@ -240 +239 @@
                               DIRCNRDATA *dcd)
 {
-  /* fill in a container record from a FILEFINDBUF4 structure */
+  // fill in a container record from a FILEFINDBUF4 structure
 
   CHAR *p;
@@ -271 +270 @@
   }
 
-  /* load the object's Subject, if required */
+  // load the object's Subject, if required
   pci->pszSubject = NullStr;
   if (pffb->cbList > 4L &&
@@ -316 +315 @@
     pci->pszSubject = NullStr;
 
-  /* load the object's longname */
+  // load the object's longname
   pci->pszLongName = 0;
   if (fLoadLongnames &&
@@ -363 +362 @@
     pci->pszLongName = NullStr;
 
-  /* do anything required to case of filename */
+  // do anything required to case of filename
   if (fForceUpper)
     strupr(pci->pszFileName);
@@ -369 +368 @@
     strlwr(pci->pszFileName);
 
-  /* get an icon to use with it */
+  // get an icon to use with it
   if (pffb->attrFile & FILE_DIRECTORY) {
     // is directory
@@ -425 +424 @@
   pci->pszDisplayName = p;
 
-  /* now fill the darned thing in... */
+  // now fill the darned thing in...
   pci->date.day = pffb->fdateLastWrite.day;
   pci->date.month = pffb->fdateLastWrite.month;
@@ -451 +450 @@
   pci->rc.hptrIcon = hptr;
 
-  /* check to see if record should be visible */
+  // check to see if record should be visible
   if (dcd && (*dcd->mask.szMask || dcd->mask.antiattr ||
               ((dcd->mask.attrFile &
@@ -483 +482 @@
   CHAR *p;
 
-  /* fill in a container record from a FILESTATUS4 structure */
+  // fill in a container record from a FILESTATUS4 structure
 
   pci->hwndCnr = hwndCnr;
@@ -489 +488 @@
   strcpy(pci->pszFileName, pszFileName);
 
-  /* load the object's Subject, if required */
+  // load the object's Subject, if required
   pci->pszSubject = NullStr;
   if (pfsa4->cbList > 4L &&
@@ -708 +707 @@
   PFILEFINDBUF4 paffbTemp;
   HDIR hdir = HDIR_CREATE;
-  ULONG ulFileCnt;
-  ULONG ulExtraBytes;
-  ULONG ulM = 1;
+  ULONG ulFindCnt;
+  ULONG ulFindMax;
+  ULONG ulSelCnt;
   ULONG ulTotal = 0;
   ULONGLONG ullBytes;
@@ -721 +720 @@
   PCNRITEM pciFirst;
   RECORDINSERT ri;
-  PBYTE pByte;
-  PBYTE pByte2;
   BOOL ok = TRUE;
+  ULONG ulBufBytes;
+  ULONG x;
 
   if (isalpha(*szDirBase) && szDirBase[1] == ':' && szDirBase[2] == '\\') {
-    ulExtraBytes = EXTRA_RECORD_BYTES;
     if ((driveflags[toupper(*szDirBase) - 'A'] & DRIVE_REMOTE) && fRemoteBug)
-      ulM = 1;                          /* file system gets confused */
+      ulFindMax = 1;                            // file system gets confused
     else if (driveflags[toupper(*szDirBase) - 'A'] & DRIVE_ZIPSTREAM)
-      ulM = min(FilesToGet, 225);       /* anything more is wasted */
+      ulFindMax = min(FilesToGet, 225); // anything more is wasted
     else
-      ulM = FilesToGet;                 /* full-out */
+      ulFindMax = FilesToGet;           // full-out
   }
   else {
-    ulExtraBytes = EXTRA_RECORD_BYTES;
-    ulM = FilesToGet;
+    ulFindMax = FilesToGet;
   }
   if (OS2ver[0] == 20 && OS2ver[1] < 30)
-    ulM = min(ulM, (65535 / sizeof(FILEFINDBUF4)));
-
-  ulFileCnt = ulM;
+    ulFindMax = min(ulFindMax, (65535 / sizeof(FILEFINDBUF4)));
+
+  ulBufBytes = ulFindMax * sizeof(FILEFINDBUF4);
+
   pszFileSpec = xmalloc(CCHMAXPATH + 2, pszSrcFile, __LINE__);
-  paffbFound =
-    xmalloc((ulM + 1) * sizeof(FILEFINDBUF4), pszSrcFile, __LINE__);
-  papffbSelected =
-    xmalloc((ulM + 1) * sizeof(PFILEFINDBUF4), pszSrcFile, __LINE__);
+  paffbFound = xmalloc(ulBufBytes, pszSrcFile, __LINE__);
+  papffbSelected = xmalloc(sizeof(PFILEFINDBUF4) * ulFindMax, pszSrcFile, __LINE__);
+
   if (paffbFound && papffbSelected && pszFileSpec) {
     t = strlen(szDirBase);
@@ -757 +754 @@
     memcpy(pchEndPath, "*", 2);
     DosError(FERR_DISABLEHARDERR);
-    rc = DosFindFirst(pszFileSpec, &hdir,
-                      FILE_NORMAL | ((filestoo) ? FILE_DIRECTORY :
-                                     MUST_HAVE_DIRECTORY) | FILE_READONLY |
-                      FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN,
-                      paffbFound, ulM * sizeof(FILEFINDBUF4),
-                      &ulFileCnt, FIL_QUERYEASIZE);
+    ulFindCnt = ulFindMax;
+    rc = DosFindFirst(pszFileSpec,
+                      &hdir,
+                      FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
+                      FILE_SYSTEM | FILE_HIDDEN |
+                      (filestoo ? FILE_DIRECTORY : MUST_HAVE_DIRECTORY),
+                      paffbFound,
+                      ulBufBytes,
+                      &ulFindCnt,
+                      FIL_QUERYEASIZE);
     priority_normal();
     *pchEndPath = 0;
     if (!rc) {
-      while (!rc) {
+      do {
         /*
          * remove . and .. from list if present
@@ -774 +775 @@
          * network file systems exhibit such a problem).
          */
-        register ULONG x;
+#if 0 // 13 Aug 07 SHL fixme to be gone
+        {
+          static ULONG ulMaxCnt = 1;
+          if (ulFindCnt > ulMaxCnt) {
+            ulMaxCnt = ulFindCnt;
+            DbgMsg(pszSrcFile, __LINE__, "ulMaxCnt %u/%u", ulMaxCnt, ulFindMax);
+          }
+        }
+#endif // fixme to be gone
 
         if (stopflag && *stopflag)
           goto Abort;
-        pByte = (PBYTE) paffbFound;
-        for (x = 0; x < ulFileCnt;) {
-          pffbFile = (PFILEFINDBUF4) pByte;
+        pffbFile = paffbFound;
+        ulSelCnt = 0;
+        for (;;) {
           if (!*pffbFile->achName ||
-              (!filestoo && !(pffbFile->attrFile & FILE_DIRECTORY)) ||
-              ((pffbFile->attrFile & FILE_DIRECTORY) &&
+              (!filestoo && ~pffbFile->attrFile & FILE_DIRECTORY) ||
+              (pffbFile->attrFile & FILE_DIRECTORY &&
                pffbFile->achName[0] == '.' &&
                (!pffbFile->achName[1] ||
                 (pffbFile->achName[1] == '.' && !pffbFile->achName[2])))) {
-            ulFileCnt--;                // Got . or ..
+            // ulFindCnt--;             // Got . or .. or file to be skipped
           }
           else
-            papffbSelected[x++] = pffbFile;     // Count file
+            papffbSelected[ulSelCnt++] = pffbFile;      // Remember selected file
           if (!pffbFile->oNextEntryOffset) {
-            ulFileCnt = x;              // Adjust count
+            // ulFindCnt = ulSelCnt;    // Remember number selected
             break;
           }
-          pByte += pffbFile->oNextEntryOffset;
+          pffbFile = (PFILEFINDBUF4)((PBYTE)pffbFile + pffbFile->oNextEntryOffset);
         } // for
-        if (ulFileCnt) {
+        if (ulSelCnt) {
+          // One or more entries selected
           if (stopflag && *stopflag)
             goto Abort;
           if (fSyncUpdates) {
             pciFirst = WinSendMsg(hwndCnr, CM_ALLOCRECORD,
-                                  MPFROMLONG(ulExtraBytes),
-                                  MPFROMLONG(ulFileCnt));
+                                  MPFROMLONG(EXTRA_RECORD_BYTES),
+                                  MPFROMLONG(ulSelCnt));
             if (!pciFirst) {
               Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
@@ -811 +821 @@
             }
             else {
-              register INT i;
-
               pci = pciFirst;
               ullTotalBytes = 0;
-              for (i = 0; i < ulFileCnt; i++) {
-                pffbFile = papffbSelected[i];
+              // Insert selected in container
+              for (x = 0; x < ulSelCnt; x++) {
+                pffbFile = papffbSelected[x];
                 ullBytes = FillInRecordFromFFB(hwndCnr, pci, pszFileSpec,
                                                pffbFile, partial, dcd);
@@ -822 +831 @@
                 ullTotalBytes += ullBytes;
               } // for
-              if (ulFileCnt) {
-                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 = ulFileCnt;
-                ri.fInvalidateRecord = (!fSyncUpdates && dcd &&
-                                        dcd->type == DIR_FRAME) ?
+              // 13 Aug 07 SHL ulSelCnt checked already?
+              // if (ulSelCnt) {
+              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 = ulSelCnt;
+              ri.fInvalidateRecord =
+                !fSyncUpdates && dcd && dcd->type == DIR_FRAME ?
                   FALSE : TRUE;
+              if (!WinSendMsg(hwndCnr,
+                              CM_INSERTRECORD,
+                              MPFROMP(pciFirst), MPFROMP(&ri))) {
+                DosSleep(10);           // Give GUI time to work
+                WinSetFocus(HWND_DESKTOP, hwndCnr);
                 if (!WinSendMsg(hwndCnr,
                                 CM_INSERTRECORD,
                                 MPFROMP(pciFirst), MPFROMP(&ri))) {
-                  DosSleep(10);
-                  WinSetFocus(HWND_DESKTOP, hwndCnr);
-                  if (!WinSendMsg(hwndCnr,
-                                  CM_INSERTRECORD,
-                                  MPFROMP(pciFirst), MPFROMP(&ri))) {
-                    Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
-                               IDS_CMINSERTERRTEXT);
-                    ok = FALSE;
-                    ullTotalBytes = 0;
-                    if (WinIsWindow((HAB) 0, hwndCnr))
-                      FreeCnrItemList(hwndCnr, pciFirst);
-                  }
+                  Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
+                             IDS_CMINSERTERRTEXT);
+                  ok = FALSE;
+                  ullTotalBytes = 0;
+                  if (WinIsWindow((HAB) 0, hwndCnr))
+                    FreeCnrItemList(hwndCnr, pciFirst);
                 }
+              // }
               }
             }
             if (ok) {
               ullReturnBytes += ullTotalBytes;
-              ulReturnFiles += ulFileCnt;
+              ulReturnFiles += ulSelCnt;
             }
-          }
+          } // if sync updates
           else {
+            // Append newly selected entries to aggregate list
             paffbTemp = xrealloc(paffbTotal,
-                                 sizeof(FILEFINDBUF4) * (ulFileCnt + ulTotal),
+                                 sizeof(FILEFINDBUF4) * (ulSelCnt + ulTotal),
                                  pszSrcFile, __LINE__);
             if (paffbTemp) {
+              // 13 Aug 07 SHL fixme to optimize copy
               paffbTotal = paffbTemp;
-              for (x = 0; x < ulFileCnt; x++)
+              for (x = 0; x < ulSelCnt; x++)
                 paffbTotal[x + ulTotal] = *papffbSelected[x];
-              ulTotal += ulFileCnt;
+              ulTotal += ulSelCnt;
             }
             else {
@@ -872 +884 @@
             }
           }
-        }
+        } // if entries selected
         if (stopflag && *stopflag)
           goto Abort;
-        ulFileCnt = ulM;
         DosError(FERR_DISABLEHARDERR);
-        rc = DosFindNext(hdir, paffbFound, ulM * sizeof(FILEFINDBUF4),
-                         &ulFileCnt);
+        ulFindCnt = ulFindMax;
+        rc = DosFindNext(hdir, paffbFound, ulBufBytes, &ulFindCnt);
         priority_normal();
         if (rc)
           DosError(FERR_DISABLEHARDERR);
-      }
+      } while (!rc);
+
       DosFindClose(hdir);
 
-      if (paffbFound || papffbSelected) {
-        if (paffbFound)
-          free(paffbFound);
-        if (papffbSelected)
-          free(papffbSelected);
+      if (paffbFound) {
+        free(paffbFound);
+        paffbFound = NULL;
+      }
+      if (papffbSelected) {
+        free(papffbSelected);
         papffbSelected = NULL;
-        paffbFound = NULL;
       }
 
@@ -900 +912 @@
 
         pciFirst = WinSendMsg(hwndCnr, CM_ALLOCRECORD,
-                              MPFROMLONG(ulExtraBytes), MPFROMLONG(ulTotal));
+                              MPFROMLONG(EXTRA_RECORD_BYTES), MPFROMLONG(ulTotal));
         if (!pciFirst) {
           Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
@@ -908 +920 @@
         }
         else {
-          register INT i;
-
           pci = pciFirst;
           ullTotalBytes = 0;
-          pByte2 = (PBYTE) paffbTotal;
-          for (i = 0; i < ulTotal; i++) {
-            pffbFile = (PFILEFINDBUF4) pByte2;
+          pffbFile = paffbTotal;
+          for (x = 0; x < ulTotal; x++) {
             ullBytes = FillInRecordFromFFB(hwndCnr, pci, pszFileSpec,
                                            pffbFile, partial, dcd);
             pci = (PCNRITEM) pci->rc.preccNextRecord;
             ullTotalBytes += ullBytes;
-
-            pByte2 += sizeof(FILEFINDBUF4);
+            // Can not use offset since we have merged lists - this should be equivalent
+            pffbFile = (PFILEFINDBUF4)((PBYTE)pffbFile + sizeof(FILEFINDBUF4));
           }
           if (ulTotal) {
@@ -933 +942 @@
             if (!WinSendMsg(hwndCnr, CM_INSERTRECORD,
                             MPFROMP(pciFirst), MPFROMP(&ri))) {
-              DosSleep(10);
+              DosSleep(10);             // Give GUI time to work
               WinSetFocus(HWND_DESKTOP, hwndCnr);
               if (!WinSendMsg(hwndCnr, CM_INSERTRECORD,
@@ -949 +958 @@
         if (ok) {
           ullReturnBytes += ullTotalBytes;
-          ulReturnFiles += ulFileCnt;
+          ulReturnFiles += ulFindCnt;
         }
       }
+    }
+
+    if (rc && rc != ERROR_NO_MORE_FILES) {
+      Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+                GetPString(IDS_CANTFINDDIRTEXT), pszFileSpec);
     }
 
@@ -959 +973 @@
   }
 Abort:
-  if (paffbTotal || papffbSelected || paffbFound || pszFileSpec) {
-    if (paffbTotal)
-      free(paffbTotal);
-    if (pszFileSpec)
-      free(pszFileSpec);
-    if (paffbFound)
-      free(paffbFound);
-    if (papffbSelected)
-      free(papffbSelected);
-  }
+  if (paffbTotal)
+    free(paffbTotal);
+  if (pszFileSpec)
+    free(pszFileSpec);
+  if (paffbFound)
+    free(paffbFound);
+  if (papffbSelected)
+    free(papffbSelected);
+
   if (recurse) {
     pci = WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pciParent),
@@ -1231 +1244 @@
       }
       pci->rc.flRecordAttr |= CRA_RECORDREADONLY;
-      pci = (PCNRITEM) pci->rc.preccNextRecord; /* next rec */
+      pci = (PCNRITEM) pci->rc.preccNextRecord; // next rec
     }
     else if (!(ulDriveMap & (1L << x)))
@@ -1240 +1253 @@
   drivesbuilt = TRUE;
 
-  /* insert the drives */
+  // insert the drives
   if (numtoinsert && pciFirst) {
     RECORDINSERT ri;
@@ -1259 +1272 @@
   }
 
-  /* move cursor onto the default drive rather than the first drive */
+  // move cursor onto the default drive rather than the first drive
   if (!fSwitchTree) {
     pci = (PCNRITEM) WinSendMsg(hwndCnr,
@@ -1446 +1459 @@
   if (!drivesbuilt && hwndMain)
     PostMsg(hwndMain, UM_BUILDDRIVEBAR, MPVOID, MPVOID);
-  DosSleep(16);//05 Aug 07 GKY 33
+  DosSleep(16);                         // 05 Aug 07 GKY 33
   fDummy = FALSE;
   DosPostEventSem(CompactSem);
@@ -1583 +1596 @@
     Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,
               "CM_FREERECORD hwnd %x pci %p file %s",
-              hwnd, pci,
+              hwnd, pci,
               pci && pci->pszFileName ? pci->pszFileName : "n/a");
   }
@@ -1664 +1677 @@
 }
 
+#pragma alloc_text(FILLDIR,FillInRecordFromFFB,FillInRecordFromFSA,IDFile)
+#pragma alloc_text(FILLDIR1,ProcessDirectory,FillDirCnr,FillTreeCnr,FileAttrToString)
+#pragma alloc_text(EMPTYCNR,EmptyCnr,FreeCnrItemData,FreeCnrItem,FreeCnrItemList,RemoveCnrItems)
+

trunk/dll/fm3res.dlg

@@ -28 +28 @@
   19 Jun 07 SHL Update ABT_FRAME to include netlabs URL and built with OpenWatcom
   03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
+  13 Aug 07 SHL Tweak scanning page
 
 ***********************************************************************/
@@ -1874 +1875 @@
         AUTOCHECKBOX    "Lowercase names", CFGS_FORCELOWER, 4, 68, 106, 10
         AUTOCHECKBOX    "Remote find bug", CFGS_REMOTEBUG, 4, 56, 106, 10
-        AUTOCHECKBOX    "Don't scan remov.", CFGS_NOREMOVABLESCAN, 4, 44,
+        AUTOCHECKBOX    "Don't scan removables", CFGS_NOREMOVABLESCAN, 4, 44,
                         106, 10
-        LTEXT           "Findbuf:", -1, 4, 28, 54, 12, NOT WS_GROUP
+        LTEXT           "Find count", -1, 4, 28, 54, 12, NOT WS_GROUP
         CONTROL         "", CFGS_FILESTOGET, 44, 30, 64, 12, WC_SPINBUTTON,
                         SPBS_NUMERICONLY | SPBS_MASTER | SPBS_SERVANT |

trunk/dll/grep.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2006 Steven H. Levine
+  Copyright (c) 2001, 2007 Steven H. Levine
 
   12 Feb 03 SHL insert_grepfile: standardize EA math
@@ -21 +21 @@
   03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
-
+  13 Aug 07 SHL Avoid pointer errors; sanitize code
+  13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
 
 ***********************************************************************/
@@ -27 +28 @@
 #define INCL_DOS
 #define INCL_WIN
+#define INCL_DOSERRORS
 #define INCL_LONGLONG
 #include <os2.h>
@@ -44 +46 @@
 static PSZ pszSrcFile = __FILE__;
 
-#pragma alloc_text(GREP,SecsSince1980,match,mmatch,GrepThread)
-#pragma alloc_text(GREP,doallsubdirs,domatchingfiles)
-
-/*****************************/
-/*   Function Prototypes     */
-/*****************************/
-
-static VOID doallsubdirs(GREP * grep, CHAR * searchPath, BOOL recursing,
+static VOID doallsubdirs(GREP *grep, CHAR *searchPath, BOOL recursing,
                          char **fle, int numfls);
-static INT domatchingfiles(GREP * grep, CHAR * path, char **fle, int numfls);
-static BOOL doonefile(GREP * grep, CHAR * fileName, FILEFINDBUF4 * f);
-static BOOL doinsertion(GREP * grep);
-static BOOL InsertDupe(GREP * grep, CHAR * dir, FILEFINDBUF4 * f);
-static VOID FillDupes(GREP * g);
-static VOID FreeDupes(GREP * g);
+static INT domatchingfiles(GREP *grep, CHAR *path, char **fle, int numfls);
+static BOOL doonefile(GREP *grep, CHAR *fileName, FILEFINDBUF4 *pffb);
+static BOOL doinsertion(GREP *grep);
+static BOOL InsertDupe(GREP *grep, CHAR *dir, FILEFINDBUF4 *pffb);
+static VOID FillDupes(GREP *grep);
+static VOID FreeDupes(GREP *grep);
 
 #define GREPCHARS "*?[] \\"
 
 #define isleap(year) ((((year%4)==0) && ((year%100)!=0)) || \
-        ((year%400)==0))
+        ((year%400)==0))
 
 static INT monthdays[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
@@ -99 +94 @@
                     LONG len)
 {
-
-  /* return TRUE if pattern found in string */
-
+  // return TRUE if pattern found in string
   register CHAR *tn = pattern;
   register LONG len2 = 0;
@@ -108 +101 @@
 
   if (len && string && pattern) {
-    if (absolute)                       /* no pattern matching */
+    if (absolute)                       // no pattern matching
       return (findstring(pattern, strlen(pattern), string, len,
                          (ignore == FALSE)) != NULL);
@@ -180 +173 @@
         if (!*tn)
           return FALSE;
-        /* else intentional fallthru */
+        // else intentional fallthru
       default:
         if (ignore) {
@@ -217 +210 @@
                   LONG len, ULONG numlines, CHAR * matched, BOOL matchall)
 {
-
   BOOL ret = FALSE;
   register CHAR *p;
@@ -229 +221 @@
     if (matched && ret && x < numlines)
       matched[x] = 1;
-    p += strlen(p);                     /* check each pattern in 0-terminated list */
+    p += strlen(p);                     // check each pattern in 0-terminated list
     p++;
     x++;
@@ -245 +237 @@
   CHAR *p, *pp, searchPath[CCHMAXPATH * 2];
 
-  if (!arg)
+  if (!arg) {
+    Runtime_Error(pszSrcFile, __LINE__, "no data");
     return;
-  grep = *(GREP *) arg;
-  *grep.stopflag = 0;                   /* reset thread-killing flag */
+  }
+
+  grep = *(GREP *)arg;
+  *grep.stopflag = 0;                   // reset thread-killing flag
   grep.FilesToGet = FilesToGet;
   DosError(FERR_DISABLEHARDERR);
@@ -268 +263 @@
       while (*pp) {
         if (!grep.absFlag) {
-          p = GREPCHARS;                /* see if any sense in pattern matching */
+          p = GREPCHARS;                // see if any sense in pattern matching
           while (*p) {
             if (strchr(pp, *p))
@@ -274 +269 @@
             p++;
           }
-          if (!*p)                      /* nope, turn it off */
+          if (!*p)                      // nope, turn it off
             grep.absFlag = TRUE;
         }
@@ -300 +295 @@
       }
 
-      while (x < numfls) {              /* loop through search masks */
-
-        if (*fle[x] == '/')             /* is an exclude mask only */
+      while (x < numfls) {              // loop through search masks
+
+        if (*fle[x] == '/')             // is an exclude mask only
           goto ExcludeSkip;
 
-        /* first, separate any path from mask */
+        // first, separate any path from mask
 
         p = (char *)(fle[x] + (strlen(fle[x]) - 1));
@@ -311 +306 @@
           --p;
 
-        if (p == fle[x]) {              /* no path */
+        if (p == fle[x]) {              // no path
           strcpy(searchPath, grep.curdir);
           strncpy(grep.fileMask, fle[x], CCHMAXPATH);
           grep.fileMask[CCHMAXPATH - 1] = 0;
         }
-        else {                          /* got to deal with a path */
-          if (*p == ':') {              /* just a drive, start in root dir */
+        else {                          // got to deal with a path
+          if (*p == ':') {              // just a drive, start in root dir
             *p = 0;
             p++;
@@ -325 +320 @@
             strcpy(grep.fileMask, p);
           }
-          if (*p == '\\') {             /* got a 'full' path */
+          if (*p == '\\') {             // got a 'full' path
 
             CHAR temp;
@@ -342 +337 @@
         if (*grep.stopflag)
           break;
-        /* do single directory */
+        // do single directory
         domatchingfiles(&grep, searchPath, fle, numfls);
-        if (grep.dirFlag)               /* do subdirs */
+        if (grep.dirFlag)               // do subdirs
           doallsubdirs(&grep, searchPath, FALSE, fle, numfls);
       ExcludeSkip:
@@ -351 +346 @@
         x++;
         if (WinIsWindow(grep.ghab, grep.hwndFiles))
-          doinsertion(&grep);           /* insert any remaining objects */
+          doinsertion(&grep);           // insert any remaining objects
       } // while
 
       if (WinIsWindow(grep.ghab, grep.hwndFiles))
-        doinsertion(&grep);             /* insert any remaining objects */
+        doinsertion(&grep);             // insert any remaining objects
 
       if (WinIsWindow(grep.ghab, grep.hwndFiles) && grep.finddupes &&
@@ -361 +356 @@
         FillDupes(&grep);
 
-      if (!PostMsg(grep.hwndFiles, UM_CONTAINER_FILLED, MPVOID, MPVOID))        /* tell window we're done */
+      if (!PostMsg(grep.hwndFiles, UM_CONTAINER_FILLED, MPVOID, MPVOID))        // tell window we're done
         WinSendMsg(grep.hwndFiles, UM_CONTAINER_FILLED, MPVOID, MPVOID);
       WinDestroyMsgQueue(ghmq);
@@ -379 +374 @@
 static BOOL IsExcluded(char *name, char **fle, int numfls)
 {
-  register int x;
+  int x;
   char *n;
 
@@ -401 +396 @@
                          char **fle, int numfls)
 {
-
-  /* process all subdirectories */
-
-  FILEFINDBUF4 findBuffer;
+  // process all subdirectories
+
+  FILEFINDBUF4 ffb;
   HDIR findHandle = HDIR_CREATE;
-  LONG findCount = 1L;
+  LONG ulFindCnt = 1;
   CHAR *p = NULL;
 
-  /* add a mask to search path */
+  // add a mask to search path
   if (searchPath[strlen(searchPath) - 1] != '\\')
     strcat(searchPath, "\\");
   strcat(searchPath, "*");
-  /* step through all subdirectories */
+  // step through all subdirectories
   DosError(FERR_DISABLEHARDERR);
   if (!DosFindFirst(searchPath, &findHandle, (MUST_HAVE_DIRECTORY |
                                               FILE_ARCHIVED | FILE_SYSTEM |
                                               FILE_HIDDEN | FILE_READONLY),
-                    &findBuffer, (ULONG) sizeof(findBuffer),
-                    (PULONG) & findCount, FIL_QUERYEASIZE)) {
-
-    /* get rid of mask portion, save end-of-directory */
+                    &ffb, (ULONG) sizeof(ffb),
+                    (PULONG) & ulFindCnt, FIL_QUERYEASIZE)) {
+
+    // get rid of mask portion, save end-of-directory
 
     p = strrchr(searchPath, '\\');
@@ -428 +422 @@
     else
       p = searchPath;
-    do {                                /* Process each directory that matches the mask */
+    do {                                // Process each directory that matches the mask
       priority_normal();
       if (*grep->stopflag)
         break;
       // Skip . and ..
-      if (findBuffer.achName[0] != '.' ||
-          (findBuffer.achName[1] &&
-           (findBuffer.achName[1] != '.' || findBuffer.achName[2]))) {
-        strcpy(p, findBuffer.achName);
+      if (ffb.achName[0] != '.' ||
+          (ffb.achName[1] &&
+           (ffb.achName[1] != '.' || ffb.achName[2]))) {
+        strcpy(p, ffb.achName);
         if (!grep->anyexcludes || !IsExcluded(searchPath, fle, numfls)) {
           domatchingfiles(grep, searchPath, fle, numfls);
@@ -443 +437 @@
         }
       }
-      findCount = 1;
+      ulFindCnt = 1;
     } while (!DosFindNext(findHandle,
-                          &findBuffer,
-                          sizeof(findBuffer), (PULONG) & findCount));
+                          &ffb,
+                          sizeof(ffb), (PULONG) & ulFindCnt));
     DosFindClose(findHandle);
     priority_normal();
   }
-  if (p)                                /* strip off last directory addition */
+  if (p)                                // strip off last directory addition
     *p = 0;
 }
@@ -456 +450 @@
 static INT domatchingfiles(GREP * grep, CHAR * path, char **fle, int numfls)
 {
-  /* process all matching files in a directory */
-
-  PFILEFINDBUF4 findBuffer;
+  // process all matching files in a directory
+
+  PFILEFINDBUF4 pffbArray;
   PFILEFINDBUF4 pffbFile;
-  register PBYTE fb;
-  register ULONG x;
+  ULONG x;
   HDIR findHandle = HDIR_CREATE;
-  ULONG findCount = grep->FilesToGet;
-  CHAR newPath[CCHMAXPATH], *p;
+  ULONG ulFindCnt;
+  CHAR szFindPath[CCHMAXPATH];
+  PSZ p;
   APIRET rc;
-
-  findBuffer =
-    xmalloc(grep->FilesToGet * sizeof(FILEFINDBUF4), pszSrcFile, __LINE__);
-  if (!findBuffer)
+  ULONG ulBufBytes = grep->FilesToGet * sizeof(FILEFINDBUF4);
+
+  pffbArray = xmalloc(ulBufBytes, pszSrcFile, __LINE__);
+  if (!pffbArray)
     return 0;
 
-  /* build filemask */
-
-  sprintf(newPath,
-          "%s%s%s",
-          path,
-          (path[strlen(path) - 1] == '\\') ? NullStr : "\\", grep->fileMask);
-
-  MakeFullName(newPath);
-
-  /* find and save end-of-dir position */
-  p = strrchr(newPath, '\\');
+  // build filemask
+  BldFullPathName(szFindPath, path, grep->fileMask);
+  // sprintf(szFindPath,
+  //      "%s%s%s",
+  //      path,
+  //      (path[strlen(path) - 1] == '\\') ? NullStr : "\\", grep->fileMask);
+
+  MakeFullName(szFindPath);
+
+  // find and save end-of-dir position
+  p = strrchr(szFindPath, '\\');
   if (p)
     p++;
   else
-    p = newPath;
-
-  /* step through matching files */
+    p = szFindPath;
+
+  // step through matching files
   DosError(FERR_DISABLEHARDERR);
-  if (!DosFindFirst(newPath,
+  ulFindCnt = grep->FilesToGet;
+  rc = DosFindFirst(szFindPath,
                     &findHandle,
-                    (FILE_NORMAL | grep->attrFile | grep->antiattr),
-                    findBuffer,
-                    (ULONG) (grep->FilesToGet * sizeof(FILEFINDBUF4)),
-                    (PULONG) & findCount, FIL_QUERYEASIZE)) {
-
-    do {                                /* Process each file that matches the mask */
+                    FILE_NORMAL | grep->attrFile | grep->antiattr,
+                    pffbArray,
+                    ulBufBytes,
+                    &ulFindCnt,
+                    FIL_QUERYEASIZE);
+  if (!rc) {
+    do {
+      // Process each file that matches the mask
       priority_normal();
-      fb = (PBYTE) findBuffer;
-      for (x = 0L; x < findCount; x++) {
-        pffbFile = (PFILEFINDBUF4) fb;
+      pffbFile = pffbArray;
+      for (x = 0; x < ulFindCnt; x++) {
         if (*grep->stopflag)
           break;
         if (*pffbFile->achName != '.' ||
             (pffbFile->achName[1] && pffbFile->achName[1] != '.')) {
-          strcpy(p, pffbFile->achName); /* build filename */
-          if (!grep->anyexcludes || !IsExcluded(newPath, fle, numfls)) {
+          strcpy(p, pffbFile->achName); // build filename
+          if (!grep->anyexcludes || !IsExcluded(szFindPath, fle, numfls)) {
             if (!grep->finddupes)
-              doonefile(grep, newPath, pffbFile);
-            else if (!InsertDupe(grep, newPath, pffbFile)) {
+              doonefile(grep, szFindPath, pffbFile);
+            else if (!InsertDupe(grep, szFindPath, pffbFile)) {
               DosFindClose(findHandle);
-              free(findBuffer);
+              free(pffbArray);
               return 1;
             }
@@ -519 +515 @@
         if (!pffbFile->oNextEntryOffset)
           break;
-        fb += pffbFile->oNextEntryOffset;
-      }
-      findCount = grep->FilesToGet;
-      rc = DosFindNext(findHandle,
-                       findBuffer,
-                       (ULONG) (grep->FilesToGet * sizeof(FILEFINDBUF4)),
-                       (PULONG) & findCount);
-      if (!rc)
-        DosSleep(1);
+        pffbFile = (PFILEFINDBUF4)((PBYTE)pffbFile + pffbFile->oNextEntryOffset);
+      } // for
+      if (*grep->stopflag)
+        break;
+      DosSleep(1);
+      ulFindCnt = grep->FilesToGet;
+      rc = DosFindNext(findHandle, pffbArray, ulBufBytes, &ulFindCnt);
     } while (!rc);
+
     DosFindClose(findHandle);
     priority_normal();
-  }
-  free(findBuffer);
+  } // if
+
+  if (rc && rc != ERROR_NO_MORE_FILES) {
+    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              GetPString(IDS_CANTFINDDIRTEXT), szFindPath);
+  }
+
+  free(pffbArray);
   return 0;
 }
 
-#pragma alloc_text(GREP,insert_grepfile,doonefile,doinsertion,freegreplist)
-
 static VOID freegreplist(GREP * grep)
 {
-  register INT x;
+  INT x;
 
   if (grep) {
@@ -607 +606 @@
 }
 
-static BOOL insert_grepfile(GREP * grep, CHAR * filename, FILEFINDBUF4 * f)
-{
-  CHAR *p, szDirectory[CCHMAXPATH];
+static BOOL insert_grepfile(GREP *grep, CHAR *filename, PFILEFINDBUF4 pffb)
+{
+  PSZ p;
+  CHAR szDirectory[CCHMAXPATH];
 
   if (WinIsWindow(grep->ghab, grep->hwndFiles)) {
@@ -620 +620 @@
       *p = 0;
       if (!grep->insertffb) {
-        grep->insertffb = xmallocz(sizeof(FILEFINDBUF4 *) *
-                                   (grep->FilesToGet + 1), pszSrcFile,
-                                   __LINE__);
+        // Allocate 1 extra for end marker?
+        grep->insertffb =
+          xmallocz(sizeof(PFILEFINDBUF4) * (grep->FilesToGet + 1),
+                          pszSrcFile, __LINE__);
         if (!grep->insertffb)
           return FALSE;
         grep->dir =
-          xmallocz(sizeof(CHAR *) * (grep->FilesToGet + 1), pszSrcFile,
-                   __LINE__);
+          xmallocz(sizeof(CHAR *) * (grep->FilesToGet + 1),
+                   pszSrcFile, __LINE__);
         if (!grep->dir) {
           free(grep->insertffb);
@@ -637 +638 @@
       if (!grep->insertffb[grep->toinsert])
         return FALSE;
-      memcpy(grep->insertffb[grep->toinsert], f, sizeof(FILEFINDBUF4));
+      memcpy(grep->insertffb[grep->toinsert], pffb, sizeof(FILEFINDBUF4));
       grep->dir[grep->toinsert] = xstrdup(szDirectory, pszSrcFile, __LINE__);
       if (!grep->dir) {
@@ -643 +644 @@
         return FALSE;
       }
-      grep->insertedbytes += f->cbFile + CBLIST_TO_EASIZE(f->cbList);
+      grep->insertedbytes += pffb->cbFile + CBLIST_TO_EASIZE(pffb->cbList);
       grep->toinsert++;
       if (grep->toinsert == grep->FilesToGet)
@@ -655 +656 @@
 }
 
-static BOOL doonefile(GREP * grep, CHAR * filename, FILEFINDBUF4 * f)
-{
-  /* process a single file */
-
+static BOOL doonefile(GREP *grep, CHAR *filename, FILEFINDBUF4 * pffb)
+{
+  // process a single file
   CHAR *input;
   FILE *inputFile;
@@ -673 +673 @@
     ULONG adjsize;
 
-    adjsize = f->cbFile + (grep->searchEAs ? CBLIST_TO_EASIZE(f->cbList) : 0);
+    adjsize = pffb->cbFile + (grep->searchEAs ? CBLIST_TO_EASIZE(pffb->cbList) : 0);
     if (grep->greaterthan) {
       if (adjsize < grep->greaterthan)
@@ -691 +691 @@
     ULONG numsecs;
 
-    numsecs = SecsSince1980(&f->fdateLastWrite, &f->ftimeLastWrite);
+    numsecs = SecsSince1980(&pffb->fdateLastWrite, &pffb->ftimeLastWrite);
     if (grep->newerthan) {
       if (numsecs < grep->newerthan)
@@ -704 +704 @@
   }
 
-  if ((!grep->searchEAs && !grep->searchFiles) || !*grep->searchPattern)        /* just a find */
-    return insert_grepfile(grep, filename, f);
+  if ((!grep->searchEAs && !grep->searchFiles) || !*grep->searchPattern)        // just a find
+    return insert_grepfile(grep, filename, pffb);
 
   if (grep->searchEAs) {
@@ -849 +849 @@
 
   if (strmatch)
-    ret = insert_grepfile(grep, filename, f);
+    ret = insert_grepfile(grep, filename, pffb);
   return ret;
 }
 
-#pragma alloc_text(DUPES,InsertDupe,FillDupes,FreeDupes,CRCFile,CRCBlock)
-#pragma alloc_text(DUPES,comparenamesq,comparenamesqe,comparenamesb)
-#pragma alloc_text(DUPES,comparenamesbe,comparesizesq,comparesizesb)
-
-static LONG cr3tab[] = {        /* CRC polynomial 0xEDB88320 */
+static LONG cr3tab[] = {        // CRC polynomial 0xEDB88320
 
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
@@ -966 +962 @@
 }
 
-static VOID FreeDupes(GREP * g)
+static VOID FreeDupes(GREP *grep)
 {
   DUPES *i, *next;
 
-  i = g->dupehead;
+  i = grep->dupehead;
   while (i) {
     next = i->next;
@@ -978 +974 @@
     i = next;
   }
-  g->dupehead = g->dupelast = NULL;
-  if (g->dupenames)
-    free(g->dupenames);
-  if (g->dupesizes)
-    free(g->dupesizes);
-  g->dupesizes = g->dupenames = NULL;
+  grep->dupehead = grep->dupelast = NULL;
+  if (grep->dupenames)
+    free(grep->dupenames);
+  if (grep->dupesizes)
+    free(grep->dupesizes);
+  grep->dupesizes = grep->dupenames = NULL;
 }
 
@@ -1110 +1106 @@
 }
 
-static VOID FillDupes(GREP * g)
+static VOID FillDupes(GREP * grep)
 {
   DUPES *c, *i, **r;
@@ -1119 +1115 @@
   ULONG cntr = 100;
 
-  if (g->CRCdupes)
+  if (grep->CRCdupes)
     cntr = 50;
-  i = g->dupehead;
+  i = grep->dupehead;
   while (i) {
     x++;
@@ -1127 +1123 @@
   }
   if (x) {
-    WinSetWindowText(g->hwndCurFile, GetPString(IDS_GREPDUPESORTINGTEXT));
+    WinSetWindowText(grep->hwndCurFile, GetPString(IDS_GREPDUPESORTINGTEXT));
     DosSleep(1);
-    g->dupenames = xmalloc(sizeof(DUPES *) * (x + 1), pszSrcFile, __LINE__);
-    if (!g->nosizedupes)
-      g->dupesizes = xmalloc(sizeof(DUPES *) * (x + 1), pszSrcFile, __LINE__);
-    if (g->dupenames && (g->nosizedupes || g->dupesizes)) {
-      i = g->dupehead;
+    grep->dupenames = xmalloc(sizeof(DUPES *) * (x + 1), pszSrcFile, __LINE__);
+    if (!grep->nosizedupes)
+      grep->dupesizes = xmalloc(sizeof(DUPES *) * (x + 1), pszSrcFile, __LINE__);
+    if (grep->dupenames && (grep->nosizedupes || grep->dupesizes)) {
+      i = grep->dupehead;
       while (i) {
-        g->dupenames[y] = i;
-        if (!g->nosizedupes)
-          g->dupesizes[y] = i;
+        grep->dupenames[y] = i;
+        if (!grep->nosizedupes)
+          grep->dupesizes[y] = i;
         i = i->next;
         y++;
       }
-      g->dupenames[y] = NULL;
-      if (!g->nosizedupes)
-        g->dupesizes[y] = NULL;
+      grep->dupenames[y] = NULL;
+      if (!grep->nosizedupes)
+        grep->dupesizes[y] = NULL;
       DosSleep(1);
-      qsort(g->dupenames,
+      qsort(grep->dupenames,
             x,
             sizeof(DUPES *),
-            ((g->ignoreextdupes) ? comparenamesqe : comparenamesq));
+            ((grep->ignoreextdupes) ? comparenamesqe : comparenamesq));
       DosSleep(1);
-      if (!g->nosizedupes) {
-        qsort(g->dupesizes, x, sizeof(DUPES *), comparesizesq);
+      if (!grep->nosizedupes) {
+        qsort(grep->dupesizes, x, sizeof(DUPES *), comparesizesq);
         DosSleep(1);
       }
-      WinSetWindowText(g->hwndCurFile, GetPString(IDS_GREPDUPECOMPARINGTEXT));
-
-      i = g->dupehead;
+      WinSetWindowText(grep->hwndCurFile, GetPString(IDS_GREPDUPECOMPARINGTEXT));
+
+      i = grep->dupehead;
       y = 0;
       while (i) {
-        if (*g->stopflag)
+        if (*grep->stopflag)
           break;
         if (!(i->flags & GF_SKIPME)) {
-          r = (DUPES **) bsearch(i, g->dupenames, x, sizeof(DUPES *),
-                                 ((g->ignoreextdupes) ? comparenamesbe :
+          r = (DUPES **) bsearch(i, grep->dupenames, x, sizeof(DUPES *),
+                                 ((grep->ignoreextdupes) ? comparenamesbe :
                                   comparenamesb));
           if (r) {
-            while (r > g->dupenames && ((g->ignoreextdupes) ?
+            while (r > grep->dupenames && ((grep->ignoreextdupes) ?
                                         !comparenamesqe((r - 1), &i) :
                                         !comparenamesq((r - 1), &i)))
               r--;
-            while (*r && ((g->ignoreextdupes) ?
+            while (*r && ((grep->ignoreextdupes) ?
                           !comparenamesqe(r, &i) : !comparenamesq(r, &i))) {
               if (*r == i || ((*r)->flags & (GF_INSERTED | GF_SKIPME))) {
@@ -1176 +1172 @@
                 continue;
               }
-              if (g->CRCdupes) {
+              if (grep->CRCdupes) {
                 if ((*r)->CRC == -1L) {
                   (*r)->CRC = CRCFile((*r)->name, &error);
@@ -1200 +1196 @@
               if (!AddToList((*r)->name, &list, &numfiles, &numalloced)) {
                 (*r)->flags |= GF_INSERTED;
-                if (g->sayfiles)
-                  WinSetWindowText(g->hwndFiles, (*r)->name);
+                if (grep->sayfiles)
+                  WinSetWindowText(grep->hwndFiles, (*r)->name);
                 if ((*r)->size == i->size &&
                     (i->date.year == (*r)->date.year &&
@@ -1221 +1217 @@
             }
           }
-          if (!g->nosizedupes) {
+          if (!grep->nosizedupes) {
             r = (DUPES **) bsearch(i,
-                                   g->dupesizes,
+                                   grep->dupesizes,
                                    x, sizeof(DUPES *), comparesizesb);
             if (r) {
-              while (r > g->dupesizes && !comparesizesq((r - 1), &i))
+              while (r > grep->dupesizes && !comparesizesq((r - 1), &i))
                 r--;
               while (*r && !comparesizesq(r, &i)) {
@@ -1239 +1235 @@
                   continue;
                 }
-                if (g->CRCdupes) {
+                if (grep->CRCdupes) {
                   if ((*r)->CRC == -1L) {
                     (*r)->CRC = CRCFile((*r)->name, &error);
@@ -1261 +1257 @@
                 }
                 if (!AddToList((*r)->name, &list, &numfiles, &numalloced)) {
-                  if (g->sayfiles)
-                    WinSetWindowText(g->hwndCurFile, (*r)->name);
+                  if (grep->sayfiles)
+                    WinSetWindowText(grep->hwndCurFile, (*r)->name);
                   (*r)->flags |= GF_INSERTED;
-                  if (((g->ignoreextdupes) ?
+                  if (((grep->ignoreextdupes) ?
                        comparenamesqe(r, &i) : comparenamesq(r, &i)))
                     (*r)->flags |= GF_SKIPME;
@@ -1286 +1282 @@
           CHAR s[44];
 
-          sprintf(s, GetPString(IDS_GREPDUPECHECKPROGTEXT), y, g->numfiles);
-          WinSetWindowText(g->hwndCurFile, s);
-          DosSleep(100); //05 Aug 07 GKY 128
+          sprintf(s, GetPString(IDS_GREPDUPECHECKPROGTEXT), y, grep->numfiles);
+          WinSetWindowText(grep->hwndCurFile, s);
+          DosSleep(100);                //05 Aug 07 GKY 128
         }
         DosSleep(y % 2);
@@ -1296 +1292 @@
       // Insufficient memory - fall back
       DosBeep(50, 100);
-      WinSetWindowText(g->hwndCurFile, GetPString(IDS_GREPDUPECOMPARINGTEXT));
+      WinSetWindowText(grep->hwndCurFile, GetPString(IDS_GREPDUPECOMPARINGTEXT));
       x = y = 0;
-      if (g->dupenames) {
-        free(g->dupenames);
-        g->dupenames = NULL;
+      if (grep->dupenames) {
+        free(grep->dupenames);
+        grep->dupenames = NULL;
       }
-      if (g->dupesizes) {
-        free(g->dupesizes);
-        g->dupesizes = NULL;
+      if (grep->dupesizes) {
+        free(grep->dupesizes);
+        grep->dupesizes = NULL;
       }
-      i = g->dupehead;
+      i = grep->dupehead;
       while (i) {
-        if (*g->stopflag)
+        if (*grep->stopflag)
           break;
         if (!(i->flags & GF_SKIPME)) {
@@ -1315 +1311 @@
             CHAR s[44];
 
-            sprintf(s, GetPString(IDS_GREPDUPECHECKPROGTEXT), y, g->numfiles);
-            WinSetWindowText(g->hwndCurFile, s);
+            sprintf(s, GetPString(IDS_GREPDUPECHECKPROGTEXT), y, grep->numfiles);
+            WinSetWindowText(grep->hwndCurFile, s);
             DosSleep(1);
           }
@@ -1325 +1321 @@
           else
             pi = i->name;
-          c = g->dupehead;
+          c = grep->dupehead;
           while (c) {
-            if (*g->stopflag)
+            if (*grep->stopflag)
               break;
             if (c != i && !(c->flags & (GF_INSERTED | GF_SKIPME))) {
@@ -1336 +1332 @@
               else
                 pc = c->name;
-              if ((!g->nosizedupes && i->size == c->size && i->date.year == c->date.year && i->date.month == c->date.month && i->date.day == c->date.day && i->time.hours == c->time.hours && i->time.minutes == c->time.minutes && i->time.twosecs == c->time.twosecs) || !stricmp(pc, pi)) {  /* potential dupe */
-                if (g->CRCdupes) {
-                  if (g->CRCdupes) {
+              if ((!grep->nosizedupes && i->size == c->size && i->date.year == c->date.year && i->date.month == c->date.month && i->date.day == c->date.day && i->time.hours == c->time.hours && i->time.minutes == c->time.minutes && i->time.twosecs == c->time.twosecs) || !stricmp(pc, pi)) {       // potential dupe
+                if (grep->CRCdupes) {
+                  if (grep->CRCdupes) {
                     if (c->CRC == -1L) {
                       c->CRC = CRCFile(c->name, &error);
@@ -1367 +1363 @@
                     goto BreakOut;      // Failed
                 }
-                if (g->sayfiles)
-                  WinSetWindowText(g->hwndCurFile, pc);
+                if (grep->sayfiles)
+                  WinSetWindowText(grep->hwndCurFile, pc);
                 c->flags |= GF_INSERTED;
                 i->flags |= GF_INSERTED;
@@ -1387 +1383 @@
   }
 BreakOut:
-  FreeDupes(g);
+  FreeDupes(grep);
   if (numfiles && list) {
-    if (!PostMsg(g->hwndFiles,
+    if (!PostMsg(grep->hwndFiles,
                  WM_COMMAND, MPFROM2SHORT(IDM_COLLECTOR, 0), MPFROMP(list)))
       FreeList(list);
@@ -1397 +1393 @@
 }
 
-static BOOL InsertDupe(GREP * g, CHAR * dir, FILEFINDBUF4 * f)
+static BOOL InsertDupe(GREP *grep, CHAR *dir, FILEFINDBUF4 *pffb)
 {
   DUPES *info;
@@ -1405 +1401 @@
     if (!info)
       return FALSE;
-    else {
-      info->name = xstrdup(dir, pszSrcFile, __LINE__);
-      if (!info->name) {
-        free(info);
-        return FALSE;
-      }
-      else {
-        info->size = f->cbFile;
-        info->date = f->fdateLastWrite;
-        info->time = f->ftimeLastWrite;
-        info->CRC = -1L;
-        g->numfiles++;
-        if (!g->dupehead)
-          g->dupehead = info;
-        if (g->dupelast)
-          g->dupelast->next = info;
-        g->dupelast = info;
-        info->next = NULL;
-      }
-    }
+
+    info->name = xstrdup(dir, pszSrcFile, __LINE__);
+    if (!info->name) {
+      free(info);
+      return FALSE;
+    }
+
+    info->size = pffb->cbFile;
+    info->date = pffb->fdateLastWrite;
+    info->time = pffb->ftimeLastWrite;
+    info->CRC = -1L;
+    grep->numfiles++;
+    if (!grep->dupehead)
+      grep->dupehead = info;
+    if (grep->dupelast)
+      grep->dupelast->next = info;
+    grep->dupelast = info;
+    info->next = NULL;
   }
   return TRUE;
 }
+
+#pragma alloc_text(GREP,insert_grepfile,doonefile,doinsertion,freegreplist)
+#pragma alloc_text(GREP,SecsSince1980,match,mmatch,GrepThread)
+#pragma alloc_text(GREP,doallsubdirs,domatchingfiles,InsertDupes,FreeDupes)
+
+#pragma alloc_text(DUPES,InsertDupe,FillDupes,FreeDupes,CRCFile,CRCBlock)
+#pragma alloc_text(DUPES,comparenamesq,comparenamesqe,comparenamesb)
+#pragma alloc_text(DUPES,comparenamesbe,comparesizesq,comparesizesb)

trunk/dll/init.c

@@ -28 +28 @@
   03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
-
+  13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
 
 ***********************************************************************/
@@ -56 +56 @@
 #include "version.h"
 
-#ifdef __WATCOMC__
+#ifdef __IBMC__
 #pragma alloc_text(INIT,LibMain,InitFM3DLL,DeInitFM3DLL)
-#else // __IBMC__
-#pragma alloc_text(INIT,_DLL_InitTerm,InitFM3DLL,DeInitFM3DLL)
+#pragma alloc_text(INIT1,StartFM3,FindSwapperDat)
 #endif
-
-#pragma alloc_text(INIT1,StartFM3,FindSwapperDat)
 
 extern int _CRT_init(void);
@@ -174 +171 @@
 
 unsigned APIENTRY LibMain(unsigned hModule,
-                          unsigned ulFlag)
+                          unsigned ulFlag)
 {
   CHAR *env;
@@ -1408 +1405 @@
   return ok;
 }
+
+#ifdef __WATCOMC__
+#pragma alloc_text(INIT,LibMain,InitFM3DLL,DeInitFM3DLL)
+#pragma alloc_text(INIT1,StartFM3,FindSwapperDat)
+#endif
+

trunk/dll/ipf/notebook.ipf

@@ -6 +6 @@
 .*
 .* Copyright (c) 1993-98 M. Kimes
-.* Copyright (c) 2006-07 Steven H.Levine
+.* Copyright (c) 2006, 2007 Steven H.Levine
 .*
 .* 30 Dec 06 GKY Corrected statement re copy/move "toggle" in OS/2
 .* 03 Mar 07 GKY Update that file systems other than HPFS support long names
-.* 20 Mar 07 DG  Add discribtion for Mommy make it stop
+.* 20 Mar 07 DG  Add description for Mommy make it stop
+.* 13 Aug 07 SHL Tweak scanning page
 .*
 .***********************************************************************
@@ -698 +699 @@
 from the INI (which will cause FM/2 to revert to the default setting).
 :p.
-If the :hp6.Don't scan remov.:ehp6. is checked, FM/2 won't attempt to
+If the :hp6.Don't scan removables:ehp6. is checked, FM/2 won't attempt to
 find subdirectories on removable drives until you double-click the drive
 in the Drive Tree, so you won't see a [+] sign beside removable drives
@@ -707 +708 @@
 loaded and scanned automatically at FM/2 startup.
 :p.
-The :hp6.Findbuf:ehp6. spin button controls how many files FM/2 searches
+The :hp6.Find count:ehp6. spin button controls how many files FM/2 searches
 for in one system call. The higher this number, the faster FM/2 works
 (with properly operating FSDs that support "finding" more than one file
@@ -716 +717 @@
 memory, boosting this may be a good idea. On the other hand, if you are
 extremely limited in memory (less than 16 megs), reducing this might be
-the thing to do. The range is 2048 to 102400, with 10240 the default.
+the thing to do. The range is 512 to 4096, with 4096 being the default.
 
 

trunk/dll/notebook.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2006 Steven H. Levine
+  Copyright (c) 2004, 2007 Steven H. Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
@@ -16 +16 @@
   15 Aug 06 SHL Rework SetMask args
   03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
+  13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
+  13 Aug 07 SHL Rework FileToGet min/max to match how DosFindFirst/Next works
 
 ***********************************************************************/
@@ -31 +33 @@
 #include "fm3str.h"
 
+#define FILESTOGET_MIN  256
+#define FILESTOGET_MAX  4096
+
 #pragma data_seg(DATA2)
 
 static PSZ pszSrcFile = __FILE__;
-
-#pragma alloc_text(NOTEBOOK,CfgTDlgProc,CfgTSDlgProc,CfgMDlgProc)
-#pragma alloc_text(NOTEBOOK2,CfgADlgProc,CfgSDlgProc,CfgVDlgProc)
-#pragma alloc_text(NOTEBOOK3,CfgDDlgProc,Cfg5DlgProc,Cfg6DlgProc)
-#pragma alloc_text(NOTEBOOK4,Cfg7DlgProc,Cfg8DlgProc,CfgCDlgProc)
-#pragma alloc_text(NOTEBOOK5,CfgGDlgProc,CfgDlgProc,CfgBDlgProc)
 
 typedef struct
@@ -226 +225 @@
                       MPFROMSHORT(8), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGS_FILESTOGET, SPBM_OVERRIDESETLIMITS,
-                      MPFROMLONG(102400), MPFROMLONG(2048));
+                      MPFROMLONG(FILESTOGET_MAX), MPFROMLONG(FILESTOGET_MIN));
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
     break;
@@ -319 +318 @@
       WinSendDlgItemMsg(hwnd, CFGS_FILESTOGET, SPBM_QUERYVALUE,
                         MPFROMP(&temp), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
-      if (temp < 2048)
-        temp = 2048;
-      else if (temp > 102400)
-        temp = 102400;
+      if (temp < FILESTOGET_MIN)
+        temp = FILESTOGET_MIN;
+      else if (temp > FILESTOGET_MAX)
+        temp = FILESTOGET_MAX;
       FilesToGet = temp;
       PrfWriteProfileData(fmprof,
@@ -2184 +2183 @@
       fVerify = FALSE;
       DosSetVerify(FALSE);
-      FilesToGet = 10240;
+      FilesToGet = FILESTOGET_MAX;
       fQuickArcFind = TRUE;
       fMinOnOpen = TRUE;
@@ -2235 +2234 @@
       fQuickArcFind = TRUE;
       fNoRemovableScan = TRUE;
-      FilesToGet = 2048;
+      FilesToGet = FILESTOGET_MIN;
       fFreeTree = FALSE;
       fSplitStatus = TRUE;
@@ -2354 +2353 @@
       fQuickArcFind = TRUE;
       fNoRemovableScan = FALSE;
-      FilesToGet = 10240;
+      FilesToGet = FILESTOGET_MAX;
       fFreeTree = FALSE;
       fSplitStatus = TRUE;
@@ -2930 +2929 @@
   return WinDefDlgProc(hwnd, msg, mp1, mp2);
 }
+
+#pragma alloc_text(NOTEBOOK,CfgTDlgProc,CfgTSDlgProc,CfgMDlgProc)
+#pragma alloc_text(NOTEBOOK2,CfgADlgProc,CfgSDlgProc,CfgVDlgProc)
+#pragma alloc_text(NOTEBOOK3,CfgDDlgProc,Cfg5DlgProc,Cfg6DlgProc)
+#pragma alloc_text(NOTEBOOK4,Cfg7DlgProc,Cfg8DlgProc,CfgCDlgProc)
+#pragma alloc_text(NOTEBOOK5,CfgGDlgProc,CfgDlgProc,CfgBDlgProc)
+

trunk/dll/objcnr.c

@@ -18 +18 @@
   03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
-
+  13 Aug 07 SHL Avoid realloc - not needed; sanitize code
+  13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
 
 ***********************************************************************/
@@ -24 +25 @@
 #define INCL_DOS
 #define INCL_WIN
+#define INCL_DOSERRORS
 #include <os2.h>
 
@@ -59 +61 @@
 static HWND objcnrwnd;
 
-#pragma alloc_text(OBJCNR,ProcessDir,FillCnrsThread,ObjCnrDlgProc)
-
-static VOID ProcessDir(HWND hwndCnr, CHAR * filename, PCNRITEM pciParent,
-                       CHAR * stopflag)
+static VOID ProcessDir(HWND hwndCnr,
+                       CHAR *filename,
+                       PCNRITEM pciParent,
+                       CHAR *stopflag)
 {
   CHAR maskstr[CCHMAXPATH], *endpath, *p;
-  ULONG nm, ulM;
+  ULONG ulFindCnt, ulFindMax;
+  ULONG ulBufBytes;
   HDIR hdir;
-  FILEFINDBUF3 *ffb, *fft;
+  PFILEFINDBUF3 pffbArray;
   APIRET rc;
   RECORDINSERT ri;
   PCNRITEM pciP;
-
-  ffb = xmalloc(sizeof(FILEFINDBUF3), pszSrcFile, __LINE__);
-  if (!ffb)
-    return;
+  HPOINTER hptr;
+
+  ulBufBytes = sizeof(FILEFINDBUF3) * FilesToGet;
+  pffbArray = xmalloc(ulBufBytes, pszSrcFile, __LINE__);
+  if (!pffbArray)
+    return;                             // Error already reported
   strcpy(maskstr, filename);
   if (maskstr[strlen(maskstr) - 1] != '\\')
@@ -81 +86 @@
   strcat(maskstr, "*");
   hdir = HDIR_CREATE;
-  nm = 1;
+  ulFindCnt = 1;
   rc = DosFindFirst(filename, &hdir,
                     FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
                     FILE_SYSTEM | FILE_HIDDEN | MUST_HAVE_DIRECTORY,
-                    ffb, sizeof(FILEFINDBUF3), &nm, FIL_STANDARD);
+                    pffbArray, ulBufBytes, &ulFindCnt, FIL_STANDARD);
   if (!rc)
     DosFindClose(hdir);
-
-  if (rc) {                             /* work around furshluginer FAT bug... */
-    if (IsRoot(filename))
-      rc = 0;
-  }
-
-  if ((!rc && (ffb->attrFile & FILE_DIRECTORY))) {
+  // work around furshluginer FAT root bug
+  else if (IsRoot(filename))
+    rc = 0;
+
+  if ((!rc && (pffbArray->attrFile & FILE_DIRECTORY))) {
     pciP = WinSendMsg(hwndCnr,
                       CM_ALLOCRECORD,
@@ -100 +103 @@
                       MPFROMLONG(1));
     if (!pciP) {
-      free(ffb);
+      Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, "CM_ALLOCRECORD");
+      free(pffbArray);
       return;
     }
@@ -125 +129 @@
   }
   else {
-    free(ffb);
-    Dos_Error(MB_ENTER,
-              rc,
-              HWND_DESKTOP,
-              pszSrcFile,
-              __LINE__, GetPString(IDS_CANTFINDDIRTEXT), filename);
+    free(pffbArray);
+    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              GetPString(IDS_CANTFINDDIRTEXT), filename);
     return;
   }
-  {
-    HPOINTER hptr;
-
-    hptr = WinLoadFileIcon(pciP->pszFileName, FALSE);
-    if (hptr)
-      pciP->rc.hptrIcon = hptr;
-  }
+
+  hptr = WinLoadFileIcon(pciP->pszFileName, FALSE);
+  if (hptr)
+    pciP->rc.hptrIcon = hptr;
+
   if (!pciP->rc.hptrIcon || pciP->rc.hptrIcon == hptrFile)      /* OS/2 bug bug bug bug */
     pciP->rc.hptrIcon = hptrDir;
+
   memset(&ri, 0, sizeof(RECORDINSERT));
   ri.cb = sizeof(RECORDINSERT);
@@ -150 +150 @@
   ri.fInvalidateRecord = TRUE;
   if (!WinSendMsg(hwndCnr, CM_INSERTRECORD, MPFROMP(pciP), MPFROMP(&ri))) {
-    free(ffb);
+    free(pffbArray);
     return;
   }
@@ -156 +156 @@
   if (!isalpha(*maskstr) || maskstr[1] != ':' || maskstr[2] != '\\' ||
       ((driveflags[toupper(*maskstr) - 'A'] & DRIVE_REMOTE) && fRemoteBug))
-    ulM = 1;
+    ulFindMax = 1;
   else
-    ulM = FilesToGet;
-  if (ulM > 1) {
-    fft = xrealloc(ffb, sizeof(FILEFINDBUF3) * ulM, pszSrcFile, __LINE__);
-    if (!fft)
-      ulM = 1;
-    else
-      ffb = fft;
-  }
-  nm = ulM;
+    ulFindMax = FilesToGet;
+  ulFindCnt = ulFindMax;
   rc = DosFindFirst(maskstr, &hdir,
                     FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
-                    FILE_SYSTEM | FILE_HIDDEN | MUST_HAVE_DIRECTORY, ffb,
-                    sizeof(FILEFINDBUF3) * ulM, &nm, FIL_STANDARD);
+                    FILE_SYSTEM | FILE_HIDDEN | MUST_HAVE_DIRECTORY,
+                    pffbArray, ulBufBytes, &ulFindCnt, FIL_STANDARD);
   if (!rc) {
-
-    register PBYTE fb = (PBYTE) ffb;
-    FILEFINDBUF3 *pffbFile;
+    PFILEFINDBUF3 pffbFile;
     ULONG x;
 
     while (!rc) {
-      for (x = 0; x < nm; x++) {
-        pffbFile = (FILEFINDBUF3 *) fb;
+      pffbFile = pffbArray;
+      for (x = 0; x < ulFindCnt; x++) {
         if (*stopflag)
           break;
@@ -192 +183 @@
         if (!pffbFile->oNextEntryOffset)
           break;
-        fb += pffbFile->oNextEntryOffset;
-      }
+        pffbFile = (PFILEFINDBUF3)((PBYTE)pffbFile + pffbFile->oNextEntryOffset);
+      } // for
       DosSleep(1);
       if (*stopflag)
         break;
-      nm = ulM;
-      rc = DosFindNext(hdir, ffb, sizeof(FILEFINDBUF3) * ulM, &nm);
-    }
+      ulFindCnt = ulFindMax;
+      rc = DosFindNext(hdir, pffbArray, ulBufBytes, &ulFindCnt);
+    } // while
     DosFindClose(hdir);
   }
-  free(ffb);
+
+  if (rc && rc != ERROR_NO_MORE_FILES) {
+    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              GetPString(IDS_CANTFINDDIRTEXT), filename);
+  }
+
+  free(pffbArray);
   WinSendMsg(hwndCnr, CM_INVALIDATERECORD, MPFROMP(&pciP),
              MPFROM2SHORT(1, 0));
@@ -211 +208 @@
   HAB hab;
   HMQ hmq;
-  DIRSIZE *dirsize = (DIRSIZE *) args;
-
-  if (!dirsize)
+  DIRSIZE *dirsize = (DIRSIZE *)args;
+
+  if (!dirsize) {
+    Runtime_Error(pszSrcFile, __LINE__, "no data");
     return;
+  }
 
   DosError(FERR_DISABLEHARDERR);
@@ -430 +429 @@
   return WinDefDlgProc(hwnd, msg, mp1, mp2);
 }
+
+#pragma alloc_text(OBJCNR,ProcessDir,FillCnrsThread,ObjCnrDlgProc)

trunk/dll/seeall.c

@@ -22 +22 @@
   03 Nov 06 SHL Count thread usage
   30 Mar 07 GKY Remove GetPString for window class names
-  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
+  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speeds file loading)
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
   07 Aug 07 SHL Use BldQuotedFullPathName and BldQuotedFileName
+  13 Aug 07 SHL Sync code with other FilesToGet usage
+  13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
 
 ***********************************************************************/
@@ -48 +50 @@
 
 static PSZ pszSrcFile = __FILE__;
-
-#pragma alloc_text(SEEALL,comparefullnames,comparenames,comparesizes)
-#pragma alloc_text(SEEALL,comparedates,compareexts,SeeStatusProc)
-#pragma alloc_text(SEEALL,InitWindow,PaintLine,SeeAllWndProc)
-#pragma alloc_text(SEEALL,UpdateList,CollectList,ReSort,Mark)
-#pragma alloc_text(SEEALL,BuildAList,RemoveDeleted,SeeFrameWndProc,FilterList)
-#pragma alloc_text(SEEALL2,SeeObjWndProc,MakeSeeObjWinThread,FindDupes,DupeDlgProc)
-#pragma alloc_text(SEEALL3,FreeAllFilesList,DoADir,FindAllThread,AFDrvsWndProc)
-#pragma alloc_text(SEEALL3,StartSeeAll)
 
 typedef struct
@@ -726 +719 @@
                   // Assume <2GB since file did not fit
                   clFreeBytes = fsa.cUnitAvail * fsa.cSectorUnit *
-                    fsa.cbSector;
+                                fsa.cbSector;
                   if (clFreeBytes) {
                     // Find item that will fit in available space
@@ -1413 +1406 @@
 }
 
-static BOOL UpdateList(HWND hwnd, CHAR ** list)
+static BOOL UpdateList(HWND hwnd, CHAR **list)
 {
   /* Updates files in the list */
 
   ALLDATA *ad = WinQueryWindowPtr(hwnd, QWL_USER);
-  register ULONG x, z;
+  ULONG x, z;
   BOOL ret, didone = FALSE;
   FILEFINDBUF3 ffb;
-  ULONG nm;
+  ULONG ulFindCnt;
   HDIR hdir;
   CHAR *p;
@@ -1437 +1430 @@
         didone = TRUE;
         hdir = HDIR_CREATE;
-        nm = 1;
+        ulFindCnt = 1;
         if (!DosFindFirst(list[z], &hdir, FILE_NORMAL | FILE_ARCHIVED |
                           FILE_DIRECTORY | FILE_READONLY | FILE_SYSTEM |
-                          FILE_HIDDEN, &ffb, sizeof(ffb), &nm,
+                          FILE_HIDDEN, &ffb, sizeof(ffb), &ulFindCnt,
                           FIL_STANDARD)) {
           DosFindClose(hdir);
@@ -1458 +1451 @@
         didone = TRUE;
         hdir = HDIR_CREATE;
-        nm = 1;
+        ulFindCnt = 1;
         if (!DosFindFirst(list[z], &hdir, FILE_NORMAL | FILE_ARCHIVED |
                           FILE_DIRECTORY | FILE_READONLY | FILE_SYSTEM |
-                          FILE_HIDDEN, &ffb, sizeof(ffb), &nm,
+                          FILE_HIDDEN, &ffb, sizeof(ffb), &ulFindCnt,
                           FIL_STANDARD)) {
           DosFindClose(hdir);
@@ -1893 +1886 @@
   ALLDATA *ad = WinQueryWindowPtr(hwnd, QWL_USER);
   CHAR *filename, *enddir;
-  FILEFINDBUF3 *pffb, *ffb;
+  PFILEFINDBUF3 pffbArray, pffbFile;
   HDIR hdir = HDIR_CREATE;
-  ULONG nm, uL;
-  register ULONG x;
-  register PBYTE fb;
+  ULONG ulFindCnt;
+  ULONG ulFindMax;
+  ULONG ulBufBytes;
+  ULONG x;
+  APIRET rc;
 
   filename = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__);
@@ -1903 +1898 @@
     return;
 
-  uL = ad->afFilesToGet;
+  ulFindMax = ad->afFilesToGet;
   if (fRemoteBug && isalpha(*pathname) && pathname[1] == ':' &&
       pathname[2] == '\\' &&
       (driveflags[toupper(*pathname) - 'A'] & DRIVE_REMOTE))
-    uL = 1;
-  pffb = xmalloc(sizeof(FILEFINDBUF3) * uL, pszSrcFile, __LINE__);
-  if (!pffb) {
+    ulFindMax = 1;
+
+  ulBufBytes = sizeof(FILEFINDBUF3) * ulFindMax;
+  pffbArray = xmalloc(ulBufBytes, pszSrcFile, __LINE__);
+  if (!pffbArray) {
     free(filename);
     return;
   }
-  nm = uL;
+
   strcpy(filename, pathname);
   enddir = &filename[strlen(filename) - 1];
@@ -1923 +1920 @@
   strcpy(enddir, "*");
   DosError(FERR_DISABLEHARDERR);
-  if (!DosFindFirst(filename, &hdir, FILE_NORMAL | FILE_ARCHIVED |
+  ulFindCnt = ulFindMax;
+  rc = DosFindFirst(filename, &hdir, FILE_NORMAL | FILE_ARCHIVED |
                     FILE_READONLY | FILE_DIRECTORY | FILE_SYSTEM |
-                    FILE_HIDDEN, pffb, sizeof(FILEFINDBUF3) * nm, &nm,
-                    FIL_STANDARD)) {
+                    FILE_HIDDEN,
+                    pffbArray, ulBufBytes, &ulFindCnt, FIL_STANDARD);
+  if (!rc) {
     do {
+#if 0 // 13 Aug 07 SHL fixme to be gone
+      {
+        static ULONG ulMaxCnt = 1;
+        if (ulFindCnt > ulMaxCnt) {
+          ulMaxCnt = ulFindCnt;
+          DbgMsg(pszSrcFile, __LINE__, "ulMaxCnt %u/%u", ulMaxCnt, ulFindMax);
+        }
+      }
+#endif // fixme to be gone
       priority_normal();
-      fb = (PBYTE) pffb;
-      for (x = 0; x < nm; x++) {
-        ffb = (FILEFINDBUF3 *) fb;
-        if (ffb->attrFile & FILE_DIRECTORY) {
+      pffbFile = pffbArray;
+      for (x = 0; x < ulFindCnt; x++) {
+        if (pffbFile->attrFile & FILE_DIRECTORY) {
           // Skip . and ..
-          if (ffb->achName[0] != '.' ||
-              (ffb->achName[1] &&
-               (ffb->achName[1] != '.' || ffb->achName[2]))) {
-            strcpy(enddir, ffb->achName);
+          if (pffbFile->achName[0] != '.' ||
+              (pffbFile->achName[1] &&
+               (pffbFile->achName[1] != '.' || pffbFile->achName[2]))) {
+            strcpy(enddir, pffbFile->achName);
             DoADir(hwnd, filename);
           }
@@ -1943 +1950 @@
         else {
           *enddir = 0;
-          strcpy(enddir, ffb->achName);
+          strcpy(enddir, pffbFile->achName);
           if (!ad->afalloc || ad->affiles > ad->afalloc - 1) {
 
@@ -1970 +1977 @@
             ad->afhead[ad->affiles].filename =
               ad->afhead[ad->affiles].fullname + (enddir - filename);
-            ad->afhead[ad->affiles].cbFile = ffb->cbFile;
-            ad->afhead[ad->affiles].date = ffb->fdateLastWrite;
-            ad->afhead[ad->affiles].time = ffb->ftimeLastWrite;
-            ad->afhead[ad->affiles].attrFile = (USHORT) ffb->attrFile;
+            ad->afhead[ad->affiles].cbFile = pffbFile->cbFile;
+            ad->afhead[ad->affiles].date = pffbFile->fdateLastWrite;
+            ad->afhead[ad->affiles].time = pffbFile->ftimeLastWrite;
+            ad->afhead[ad->affiles].attrFile = (USHORT) pffbFile->attrFile;
             ad->afhead[ad->affiles].flags = 0;
             ad->affiles++;
-            if (ad->longest < ffb->cchName)
-              ad->longest = ffb->cchName;
-            if (ad->longestw < ffb->cchName + (enddir - filename))
-              ad->longestw = ffb->cchName + (enddir - filename);
-          }
-        }
-        fb += ffb->oNextEntryOffset;
-      }
-      nm = uL;
-    } while (!ad->stopflag &&
-             !DosFindNext(hdir, pffb, sizeof(FILEFINDBUF3) * nm, &nm));
+            if (ad->longest < pffbFile->cchName)
+              ad->longest = pffbFile->cchName;
+            if (ad->longestw < pffbFile->cchName + (enddir - filename))
+              ad->longestw = pffbFile->cchName + (enddir - filename);
+          }
+        }
+        pffbFile = (PFILEFINDBUF3)((PBYTE)pffbFile + pffbFile->oNextEntryOffset);
+      } // for
+      if (ad->stopflag)
+        break;
+      ulFindCnt = ulFindMax;
+      rc = DosFindNext(hdir, pffbArray, sizeof(FILEFINDBUF3) * ulFindCnt, &ulFindCnt);
+    } while (!rc);
     DosFindClose(hdir);
   }
-  free(pffb);
+
+  if (rc && rc != ERROR_NO_MORE_FILES) {
+    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              GetPString(IDS_CANTFINDDIRTEXT), filename);
+  }
+
+  free(pffbArray);
   free(filename);
 }
@@ -2216 +2231 @@
                       RECTL * Rectl)
 {
-
   ALLDATA *ad = WinQueryWindowPtr(hwnd, QWL_USER);
   POINTL ptl;
@@ -3802 +3816 @@
 
   case WM_COMMAND:
-    if (!pAD)
+    if (!pAD) {
+      Runtime_Error(pszSrcFile, __LINE__, "no data");
       return 0;
+    }
     switch (SHORT1FROMMP(mp1)) {
     case IDM_SETTARGET:
@@ -4272 +4288 @@
   return hwndFrame;
 }
+
+#pragma alloc_text(SEEALL,comparefullnames,comparenames,comparesizes)
+#pragma alloc_text(SEEALL,comparedates,compareexts,SeeStatusProc)
+#pragma alloc_text(SEEALL,InitWindow,PaintLine,SeeAllWndProc)
+#pragma alloc_text(SEEALL,UpdateList,CollectList,ReSort,Mark)
+#pragma alloc_text(SEEALL,BuildAList,RemoveDeleted,SeeFrameWndProc,FilterList)
+#pragma alloc_text(SEEALL2,SeeObjWndProc,MakeSeeObjWinThread,FindDupes,DupeDlgProc)
+#pragma alloc_text(SEEALL3,FreeAllFilesList,DoADir,FindAllThread,AFDrvsWndProc)
+#pragma alloc_text(SEEALL3,StartSeeAll)
+