Changeset 1759

Timestamp:

Mar 20, 2014, 3:47:49 AM (12 years ago)

Author:

Steven Levine

Message:

RemoveCnrItems: clean up odd code

File:

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

trunk/dll/filldir.c

@@ -96 +96 @@
   31 May 11 SHL Disable antique debug code in RemoveCnrItems - really speeds up container close
   12 Jun 11 GKY Added IdleIfNeeded to the container "free" loops to improve system
-                responsiveness when closing containers with large numbers of items
+                responsiveness when closing containers with large numbers of items
   12 Jun 11 GKY Replaced SleepIfNeeded with IdleIfNeeded in the container loade loop
   22 Oct 11 GKY Removing unneeded UnFlesh call from StubbyScanThread appears to significantly speed opening of FM/2
   02 Mar 14 GKY !didone for fFirstTime so the suggest code works again. Also clear out the
-                garbage that was appearing in the string.
+                garbage that was appearing in the string.
   02 Mar 14 GKY Speed up intial drive scans Ticket 528
+  19 Mar 14 SHL RemoveCnrItems: clean up odd code
 
 ***********************************************************************/
@@ -259 +260 @@
                            (fRScanSlow ? 0 : DRIVE_SLOW)))) {
               Flesh(StubbyScan->hwndCnr, StubbyScan->pci);
-            }
-            else {
-              Stubby(StubbyScan->hwndCnr, StubbyScan->pci);
-            }
+            }
+            else {
+              Stubby(StubbyScan->hwndCnr, StubbyScan->pci);
+            }
           }
           else {
@@ -283 +284 @@
        // Keep drive tree in sync with directory container
       if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszFocusDir), MPVOID))
-        free(pszFocusDir);
+        free(pszFocusDir);
     }
     ProcessDirCount = 0;
@@ -325 +326 @@
              cmp == *(ULONG *) ".TAR" || cmp == *(ULONG *) ".TGZ" ||
              cmp == *(ULONG *) ".GZ"  || cmp == *(ULONG *) ".Z"   ||
-             cmp == *(ULONG *) ".CAB" || cmp == *(ULONG *) ".BZ2" ||
-             cmp == *(ULONG *) ".WPI" || cmp == *(ULONG *) ".7Z")
+             cmp == *(ULONG *) ".CAB" || cmp == *(ULONG *) ".BZ2" ||
+             cmp == *(ULONG *) ".WPI" || cmp == *(ULONG *) ".7Z")
       hptr = hptrArc;
     else if (cmp == *(ULONG *) PCSZ_DOTBMP  ||
@@ -1087 +1088 @@
           goto Abort;
 
-        InitITimer(&itdSleep, 500);
+        InitITimer(&itdSleep, 500);
         pci = NULL;
         ullTotalBytes = 0;
@@ -1127 +1128 @@
           pffbFile = (PFILEFINDBUF4L)((PBYTE)pffbFile + sizeof(FILEFINDBUF4L));
 
-          if (!IdleIfNeeded(&itdSleep, 30)) {
-            for (x = x+1; x < cAffbTotal; x++) {
-              ullBytes = FillInRecordFromFFB(hwndCnr, pci, pszFileSpec,
-                                          pffbFile, partial, dcd);
-              pci = (PCNRITEM) pci->rc.preccNextRecord;
-              ullTotalBytes += ullBytes;
-              if (dcd) {
-                dcd->totalfiles = x;
-                dcd->ullTotalBytes = ullTotalBytes;
-              }
-              pffbFile = (PFILEFINDBUF4L)((PBYTE)pffbFile + sizeof(FILEFINDBUF4L));
-              if (pci == NULL) {
-                priority_normal();
-                InitITimer(&itdSleep, 500);
-                break;
-              }
-            }
-          }
+          if (!IdleIfNeeded(&itdSleep, 30)) {
+            for (x = x+1; x < cAffbTotal; x++) {
+              ullBytes = FillInRecordFromFFB(hwndCnr, pci, pszFileSpec,
+                                          pffbFile, partial, dcd);
+              pci = (PCNRITEM) pci->rc.preccNextRecord;
+              ullTotalBytes += ullBytes;
+              if (dcd) {
+                dcd->totalfiles = x;
+                dcd->ullTotalBytes = ullTotalBytes;
+              }
+              pffbFile = (PFILEFINDBUF4L)((PBYTE)pffbFile + sizeof(FILEFINDBUF4L));
+              if (pci == NULL) {
+                priority_normal();
+                InitITimer(&itdSleep, 500);
+                break;
+              }
+            }
+          }
 
           if (pci == NULL && ulRecsToInsert) {
@@ -1174 +1175 @@
           }
           //SleepIfNeeded(&itdSleep, 1);
-        }
-        priority_normal();
+        }
+        priority_normal();
         if (ok) {
           ullReturnBytes += ullTotalBytes;
@@ -1649 +1650 @@
           ULONG flags = driveflags[iDrvNum];    // Speed up
           if (~flags & DRIVE_INVALID &&
-              ~flags & DRIVE_NOPRESCAN && (!fNoRemovableScan || ~flags & DRIVE_REMOVABLE)) {
-            // DbgMsg(pszSrcFile, __LINE__, "Begin Thread %s", pci->pszFileName);
-            if (xbeginthread(StubbyScanThread,
+              ~flags & DRIVE_NOPRESCAN && (!fNoRemovableScan || ~flags & DRIVE_REMOVABLE)) {
+            // DbgMsg(pszSrcFile, __LINE__, "Begin Thread %s", pci->pszFileName);
+            if (xbeginthread(StubbyScanThread,
                              65536,
                              stubbyScan,
                              pszSrcFile, __LINE__) == -1)
-              xfree(stubbyScan, pszSrcFile, __LINE__);
+              xfree(stubbyScan, pszSrcFile, __LINE__);
 
           } // if drive needs to be scanned
@@ -1740 +1741 @@
       strcat(szSuggest, " %*");
       rc = saymsg(MB_YESNOCANCEL | MB_ICONEXCLAMATION,
-                  hwndParent ? hwndParent : hwndCnr,
-                  GetPString(IDS_SUGGESTTITLETEXT),
-                  GetPString(IDS_SUGGEST1TEXT),
-                  (includesyours) ? GetPString(IDS_SUGGEST2TEXT) : NullStr,
-                  szSuggest);
+                  hwndParent ? hwndParent : hwndCnr,
+                  GetPString(IDS_SUGGESTTITLETEXT),
+                  GetPString(IDS_SUGGEST1TEXT),
+                  (includesyours) ? GetPString(IDS_SUGGEST2TEXT) : NullStr,
+                  szSuggest);
       if (rc == MBID_YES) {
         HOBJECT hFM2Object;
@@ -1965 +1966 @@
     if (!IdleIfNeeded(&itdSleep, 30)) {
       for (usCount = usCount + 1; pci; usCount++) {
-        pciNext = (PCNRITEM) pci->rc.preccNextRecord;
-        FreeCnrItemData(pci);
-        pci = pciNext;
+        pciNext = (PCNRITEM) pci->rc.preccNextRecord;
+        FreeCnrItemData(pci);
+        pci = pciNext;
       }
       break;
@@ -1993 +1994 @@
   PCNRITEM pci;
   ITIMER_DESC itdSleep = { 0 };         // 30 May 11 GKY
-
 
   if ((usCnt && !pciFirst) || (!usCnt && pciFirst)) {
@@ -2015 +2015 @@
       InitITimer(&itdSleep, 500);
       while (pci) {
-#if 0 // 12 Sep 07 SHL dwg drivebar crash testing - ticket# ??? - fixme to be gone
-        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__,
-                    "DosQueryMem failed pci %p pciLast %p", pci, pciLast);
-#endif
         FreeCnrItemData(pci);
-#if 0 // 12 Sep 07 SHL dwg drivebar crash testing - ticket# ??? - fixme to be gone
-        pciLast = pci;
-#endif
         pci = (PCNRITEM)pci->rc.preccNextRecord;
+        if (!pci)
+          break;
         if (remaining && --remaining == 0)
           break;
-        if (!IdleIfNeeded(&itdSleep, 30)) {
-          while (pci) {
-            FreeCnrItemData(pci);
-            pci = (PCNRITEM)pci->rc.preccNextRecord;
-            if (remaining && --remaining == 0)
-              break;
-          }
-        }
-      }
+        IdleIfNeeded(&itdSleep, 30);
+      } // while
       priority_normal();
       DosPostEventSem(CompactSem);