Changeset 1564 for trunk/dll/grep.c

Timestamp:

May 30, 2011, 10:05:56 PM (14 years ago)

Author:

Gregg Young

Message:

Rework filldir and grep directories to correctly support more than 65K records.
Collector was trapping. Added SleepIfNeeded to loops to improve WPS responsiveness.

File:

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

trunk/dll/grep.c

@@ -36 +36 @@
                 Mostly cast CHAR CONSTANT * as CHAR *.
   29 May 10 GKY Suppress ERROR_FILENAME_EXCED_RANGE error because of problem with NTFS
+  30 May 11 GKY Fixed potential trap caused by passing a nonexistant pci to FillInRecordFromFFB
+                in DoInsertion because pci is limited to 65535 files. (nRecord is a USHORT)
+                SHL's single loop fix.
 
 ***********************************************************************/
@@ -43 +46 @@
 #include <ctype.h>
 #include <share.h>
+#include <limits.h>
 
 #define INCL_DOS
@@ -718 +722 @@
   PCNRITEM pci, pciFirst;
   UINT x;
+  ULONG ulRecsToInsert;
 
   if (!grep || !grep->toinsert || !grep->insertffb || !grep->dir)
     return FALSE;
 
-  pci = WinSendMsg(grep->hwndFiles,
-                   CM_ALLOCRECORD,
-                   MPFROMLONG(EXTRA_RECORD_BYTES),
-                   MPFROMLONG(grep->toinsert));
-  if (!pci) {
-    Win_Error(grep->hwndFiles, grep->hwndFiles, pszSrcFile, __LINE__,
-              PCSZ_CM_ALLOCRECORD);
-  }
-  else {
-    if (grep->sayfiles) {
-      if (!hwndStatus)
-        WinSetWindowText(grep->hwndCurFile, (CHAR *) GetPString(IDS_GREPINSERTINGTEXT));
+  pci = NULL;
+  dcd = INSTDATA(grep->hwndFiles);
+  for (x = 0; grep->insertffb[x]; x++) {
+    if (pci == NULL) {
+      ulRecsToInsert = grep->toinsert - x < USHRT_MAX  ? grep->toinsert - x : USHRT_MAX;
+      pciFirst = WinSendMsg(grep->hwndFiles, CM_ALLOCRECORD,
+                       MPFROMLONG(EXTRA_RECORD_BYTES),
+                       MPFROMLONG(ulRecsToInsert));
+      if (!pciFirst) {
+        Win_Error(grep->hwndFiles, grep->hwndFiles, pszSrcFile, __LINE__,
+                  PCSZ_CM_ALLOCRECORD);
+        freegreplist(grep);
+        return FALSE;
+      }
       else {
-        if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
-          WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_GREPINSERTINGTEXT));
+        pci = pciFirst;
+        if (grep->sayfiles) {
+          if (!hwndStatus)
+            WinSetWindowText(grep->hwndCurFile, (CHAR *) GetPString(IDS_GREPINSERTINGTEXT));
+          else {
+            if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
+              WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_GREPINSERTINGTEXT));
+          }
+        }
       }
     }
-    pciFirst = pci;
-    dcd = INSTDATA(grep->hwndFiles);
-    for (x = 0; grep->insertffb[x]; x++) {
-      FillInRecordFromFFB(grep->hwndFiles,
-                          pci, grep->dir[x], grep->insertffb[x], FALSE, dcd);
-      pci = (PCNRITEM) pci->rc.preccNextRecord;
-      SleepIfNeeded(pitdSleep, 1);
-    } // for
-    memset(&ri, 0, sizeof(RECORDINSERT));
-    ri.cb = sizeof(RECORDINSERT);
-    ri.pRecordOrder = (PRECORDCORE) CMA_END;
-    ri.pRecordParent = (PRECORDCORE) NULL;
-    ri.zOrder = (USHORT) CMA_TOP;
-    ri.cRecordsInsert = grep->toinsert;
-    ri.fInvalidateRecord = TRUE;
-    WinSendMsg(grep->hwndFiles,
-               CM_INSERTRECORD, MPFROMP(pciFirst), MPFROMP(&ri));
-    if (dcd) {
-      //DosEnterCritSec(); //GKY 11-29-08
-      DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
-      dcd->ullTotalBytes += grep->insertedbytes;
-      DosReleaseMutexSem(hmtxFM2Globals);
-      //DosExitCritSec();
+    FillInRecordFromFFB(grep->hwndFiles,
+                        pci, grep->dir[x], grep->insertffb[x], FALSE, dcd);
+    pci = (PCNRITEM) pci->rc.preccNextRecord;
+    //SleepIfNeeded(pitdSleep, 1);
+    if (pci == NULL && ulRecsToInsert) {
+      memset(&ri, 0, sizeof(RECORDINSERT));
+      ri.cb = sizeof(RECORDINSERT);
+      ri.pRecordOrder = (PRECORDCORE) CMA_END;
+      ri.pRecordParent = (PRECORDCORE) NULL;
+      ri.zOrder = (USHORT) CMA_TOP;
+      ri.cRecordsInsert = ulRecsToInsert;
+      ri.fInvalidateRecord = TRUE;
+      WinSendMsg(grep->hwndFiles,
+                 CM_INSERTRECORD, MPFROMP(pciFirst), MPFROMP(&ri));
+      if (dcd) {
+        DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
+        dcd->ullTotalBytes += grep->insertedbytes;
+        DosReleaseMutexSem(hmtxFM2Globals);
+      }
+      pciFirst = NULL;
     }
     SleepIfNeeded(pitdSleep, 1);
+  }//for
     // if (grep->toinsert == FilesToGet)        // 07 Feb 08 SHL
     //  DosSleep(0);  //26 Aug 07 GKY 1 // 07 Feb 08 SHL
@@ -769 +781 @@
     PostMsg(grep->hwndFiles, UM_RESCAN, MPVOID, MPVOID);
     return TRUE;
-  }
-  freegreplist(grep);
-  return FALSE;
 }