Changeset 907 for trunk/dll/filldir.c

Timestamp:

Jan 6, 2008, 8:26:17 AM (18 years ago)

Author:

Steven Levine

Message:

Avoid out of memory traps in Compare Directories
Rework Compare Directories progress display for 2 second update rate
Start refactoring to reduce dependence on fm3dll.h
Add timer services (IsITimerExpired etc.)

File:

• trunk/dll/filldir.c (modified) (8 diffs)

trunk/dll/filldir.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2007 Steven H. Levine
+  Copyright (c) 2001, 2008 Steven H. Levine
 
   10 Jan 04 SHL ProcessDirectory: avoid most large drive failures
@@ -43 +43 @@
 ***********************************************************************/
 
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#if 0 // fixme to disable or to be configurable
+#include <malloc.h>                     // _heapchk
+#endif
+
 #define INCL_DOS
 #define INCL_WIN
 #define INCL_DOSERRORS
 #define INCL_LONGLONG
-#include <os2.h>
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <time.h>
-#include <time.h>
-
-#if 0 // fixme to disable or to be configurable
-#include <malloc.h>                     // _heapchk
-#endif
-
+
+#include "fm3str.h"
+#include "filldir.h"
+#include "errutil.h"                    // Dos_Error...
+#include "strutil.h"                    // GetPString
 #include "fm3dll.h"
-#include "fm3str.h"
 
 static PSZ pszSrcFile = __FILE__;
@@ -486 +484 @@
 
 ULONGLONG FillInRecordFromFSA(HWND hwndCnr, PCNRITEM pci,
-                              const PSZ pszFileName,
-                              const PFILESTATUS4L pfsa4,
-                              const BOOL partial, DIRCNRDATA * dcd)     // Optional
+                              const PSZ pszFileName,
+                              const PFILESTATUS4L pfsa4,
+                              const BOOL partial, DIRCNRDATA * dcd)     // Optional
 {
   HPOINTER hptr;
@@ -792 +790 @@
          * network file systems exhibit such a problem).
          */
-#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)
@@ -838 +827 @@
             }
             else {
+              // 04 Jan 08 SHL fixme like comp.c to handle less than ulSelCnt records
               pci = pciFirst;
               ullTotalBytes = 0;
@@ -937 +927 @@
         }
         else {
+          // 04 Jan 08 SHL fixme like comp.c to handle less than ulSelCnt records
           pci = pciFirst;
           ullTotalBytes = 0;
@@ -1105 +1096 @@
   if (!pciFirst) {
     Win_Error2(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, IDS_CMALLOCRECERRTEXT);
+    // 04 Jan 08 SHL fixme not just up and die
     exit(0);
   }
 
+  // 04 Jan 08 SHL fixme like comp.c to handle less than ulSelCnt records
   pci = pciFirst;
   for (x = 0; x < 26; x++) {
@@ -1680 +1673 @@
       while (pci) {
         // 12 Sep 07 SHL dwg drivebar crash testing - ticket# ???
-        static PCNRITEM pciLast;                // 12 Sep 07 SHL
-        ULONG ulSize = sizeof(*pci);
-        ULONG ulAttr;
+        static PCNRITEM pciLast;                // 12 Sep 07 SHL
+        ULONG ulSize = sizeof(*pci);
+        ULONG ulAttr;
         APIRET apiret = DosQueryMem((PVOID)pci, &ulSize, &ulAttr);
         if (apiret)
-          Dos_Error(MB_ENTER, apiret, HWND_DESKTOP, pszSrcFile, __LINE__,
+          Dos_Error(MB_ENTER, apiret, HWND_DESKTOP, pszSrcFile, __LINE__,
                     "DosQueryMem failed pci %p pciLast %p", pci, pciLast);
         FreeCnrItemData(pci);