Changeset 96 for trunk/dll

Timestamp:

May 21, 2004, 5:21:19 PM (21 years ago)

Author:

root

Message:

Avoid -1L byte counts

File:

• trunk/dll/collect.c (modified) (5 diffs)

trunk/dll/collect.c

@@ +1 @@
+
+/***********************************************************************
+
+  $Id$
+
+  Collector
+
+  Copyright (c) 1993-98 M. Kimes
+  Copyright (c) 2003 Steven H.Levine
+
+  Revisions     15 Oct 02 MK - Baseline
+                10 Jan 04 SHL - Avoid -1L byte counts
+
+***********************************************************************/
+
 #define INCL_DOS
 #define INCL_WIN
@@ -33 +48 @@
 
 
-MRESULT EXPENTRY CollectorTextProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY CollectorTextProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   static BOOL   emphasized      = FALSE;
   static HWND   hwndButtonPopup = (HWND)0;
@@ -560 +575 @@
       DosError(FERR_DISABLEHARDERR);
       dcd = WinQueryWindowPtr(hwnd,0);
-      if(dcd) {
-
+      if (dcd)
+      {
         LISTINFO    *li = (LISTINFO *)mp1;
         INT          x;
@@ -570 +585 @@
         RECORDINSERT ri;
         ULONG        ulMaxFiles;
+        ULONG        totalbytes;
         CHAR         fullname[CCHMAXPATH];
 
@@ -610 +626 @@
                 priority_normal();
                 *fb4.achName = 0;
-                dcd->totalbytes += FillInRecordFromFFB(dcd->hwndCnr,pci,
-                                                       fullname,
-                                                       &fb4,FALSE,
-                                                       dcd);
+                totalbytes = FillInRecordFromFFB(dcd->hwndCnr,pci,
+                                                 fullname,
+                                                 &fb4,FALSE,
+                                                 dcd);
+                if (totalbytes != -1) {
+                  dcd->totalbytes += totalbytes;
+                  if (dcd->totalbytes == -1)
+                    dcd->totalbytes--;          // fixme for real someday
+                }
                 pciP = pci;
                 pci = (PCNRITEM)pci->rc.preccNextRecord;