Changeset 1615 for trunk/dll/collect.c

Timestamp:

Aug 13, 2011, 7:27:24 PM (14 years ago)

Author:

Gregg Young

Message:

Have collector file count and KIBs update at the same time. (Ticket 455)

File:

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

trunk/dll/collect.c

@@ -78 +78 @@
   29 May 11 SHL Tweak UM_COLLECT to bypass FindCnrRecord when container initially empty
   08 Aug 11 SHL Rework UM_COLLECT to avoid spurious container items free
+  13 Aug 11 GKY Have file count and KIBs update at the same time
 
 ***********************************************************************/
@@ -675 +676 @@
         ULONG ulRecsToInsert;
         ULONG ulRecsInserted = 0;
-        ULONGLONG ullTotalBytes;
+        ULONGLONG ullTotalBytes = 0;
         BOOL checkToInsert = FALSE;
         CNRINFO cnri;
@@ -761 +762 @@
             priority_normal();
             *fb4.achName = 0;
-            ullTotalBytes = FillInRecordFromFFB(dcd->hwndCnr,
+            ullTotalBytes += FillInRecordFromFFB(dcd->hwndCnr,
                                                 pci,
                                                 fullname, &fb4, FALSE, dcd);
-            dcd->ullTotalBytes += ullTotalBytes;
             pciPrev = pci;
             pci = (PCNRITEM) pci->rc.preccNextRecord;
@@ -807 +807 @@
               // 2011-05-29 SHL fixme to complain on failure
               PostMsg(dcd->hwndCnr, UM_RESCAN, MPVOID, MPVOID);
-              ulRecsInserted += ulRecsToInsert;
+              ulRecsInserted += ulRecsToInsert;
+              dcd->ullTotalBytes = ullTotalBytes;
               pciFirst = NULL;
               ulRecsToInsert = 0;
@@ -887 +888 @@
                 *p = 0;
             }
-            /* fullname now contains name of file to collect */
+            // fullname now contains name of file to collect
             DosError(FERR_DISABLEHARDERR);
             if (FindCnrRecord(dcd->hwndCnr,
@@ -901 +902 @@
                            MPFROM2SHORT(0, CMA_REPOSITION | CMA_ERASE));
               }
-              /*pci = (PCNRITEM) pci->rc.preccNextRecord;
-              if (pciPrev)
-                pciPrev->rc.preccNextRecord = (PMINIRECORDCORE) pci;
-              else
-                pciFirst = pci;*/
             }
             else if (IsFullName(fullname) &&
@@ -913 +909 @@
                                   &fs4,
                                   sizeof(fs4))) {
-              /* collect it */
+              // collect it
               pci = WinSendMsg(dcd->hwndCnr,
                                CM_ALLOCRECORD,