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

trunk/dll/newview.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2007 Steven H. Levine
+  Copyright (c) 2001, 2008 Steven H. Levine
 
   01 Dec 03 SHL Comments
@@ -32 +32 @@
 ***********************************************************************/
 
+#include <stdlib.h>
+#include <string.h>
+#include <process.h>
+#include <limits.h>
+#include <share.h>
+
 #define INCL_DOS
 #define INCL_WIN
 #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 <limits.h>
-#include <share.h>
-
-#include "fm3dll.h"
+
 #include "fm3dlg.h"
 #include "fm3str.h"
 #include "mle.h"
+#include "makelist.h"                   // AddToList
+#include "errutil.h"                    // Dos_Error...
+#include "strutil.h"                    // GetPString
+#include "fm3dll.h"
 
 #pragma data_seg(DATA2)
@@ -357 +357 @@
   CHAR **list = NULL, s[SEARCHSTRINGLEN], a;
   register CHAR *p, *e;
-  INT numlines = 0, numalloc = 0;
+  UINT numlines = 0, numalloc = 0;
 
   if (ad && ad->selected) {
@@ -396 +396 @@
             while (*e != '\r' && *e != '\n' && e < ad->text + ad->textsize)
               e++;
-/*
-   if((*e == '\r' || *e == '\n') && e > p)
-   e--;
- */
+            /* fixme to be gone?
+               if((*e == '\r' || *e == '\n') && e > p)
+               e--;
+            */
             width = e - p;
           }
@@ -434 +434 @@
   CHAR **list = NULL, s[SEARCHSTRINGLEN];
   SHORT x, z;
-  INT numlines = 0, numalloc = 0;
+  UINT numlines = 0, numalloc = 0;
 
   if (ad) {