Changeset 907 for trunk/dll/seeall.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/seeall.c (modified) (6 diffs)

trunk/dll/seeall.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2007 Steven H. Levine
+  Copyright (c) 2001, 2008 Steven H. Levine
 
   16 Oct 02 SHL Handle large partitions
@@ -36 +36 @@
 ***********************************************************************/
 
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <process.h>
+
 #define INCL_DOS
 #define INCL_DOSERRORS
@@ -41 +46 @@
 #define INCL_GPI
 #define INCL_LONGLONG
-#include <os2.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <process.h>
-
-#include "fm3dll.h"
+
 #include "fm3dlg.h"
 #include "fm3str.h"
+#include "pathutil.h"                   // BldQuotedFullPathName...
+#include "makelist.h"                   // AddToList
+#include "errutil.h"                    // Dos_Error...
+#include "strutil.h"                    // GetPString
+#include "fm3dll.h"
 
 #pragma data_seg(DATA2)
@@ -262 +264 @@
     {
       CHAR **files = NULL, **list = (CHAR **) mp2, path[CCHMAXPATH];
-      INT numfiles = 0, numalloc = 0, plen = 0;
+      UINT numfiles = 0, numalloc = 0;
+      INT plen = 0;
       HWND hwndFrame = WinQueryWindowULong(hwnd, QWL_USER);
       CHAR message[CCHMAXPATH * 2], wildname[CCHMAXPATH];
@@ -1317 +1320 @@
   ULONG z = 0;
   CHAR **list = NULL;
-  INT numfiles = 0;
-  INT numalloc = 0;
+  UINT numfiles = 0;
+  UINT numalloc = 0;
   INT error;
 
@@ -1924 +1927 @@
   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();
       pffbFile = pffbArray;