Changeset 1284

Timestamp:

Nov 19, 2008, 6:46:28 PM (17 years ago)

Author:

Steven Levine

Message:

Correct and sanitize 4 pass scan logic

File:

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

trunk/dll/filldir.c

@@ -51 +51 @@
   08 Sep 08 SHL Remove extra pszLongName logic in FreeCnrItemData
   18 Oct 08 GKY Scan drives in 4 passes (local, virtual, remote, flagged slow) to speed tree scans
+  19 Nov 08 SHL Correct and sanitize 4 pass scan logic
 
 ***********************************************************************/
@@ -1135 +1136 @@
   BOOL drivesbuilt = FALSE;
   ULONG startdrive = 3;
-  LONG TestFlags[3];
-
+  static LONG whenToCheck[] = {
+    0,
+    DRIVE_VIRTUAL,
+    DRIVE_REMOTE,
+    DRIVE_SLOW};
+  USHORT checked[26] = { 0 };
   static BOOL didonce = FALSE;
 
@@ -1315 +1320 @@
             pci->pszDispAttr = FileAttrToString(pci->attrFile);
           }
-          SelectDriveIcon(pci);
+          SelectDriveIcon(pci);
 #         ifdef FORTIFY
           // Will be freed by TreeCnrWndProc WM_DESTROY
@@ -1321 +1326 @@
 #         endif
         }
-        else {
+        else {
           pci->rc.hptrIcon = hptrDunno;
           pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
@@ -1480 +1485 @@
     }
   } // if show env
-  TestFlags[0] = DRIVE_SLOW | DRIVE_VIRTUAL | DRIVE_REMOTE;
-  TestFlags[1] = DRIVE_VIRTUAL;
-  TestFlags[2] = DRIVE_REMOTE;
-  TestFlags[3] = DRIVE_SLOW;
-  x = 0;
-  // Scan drives in 4 passes based on TestFlags
+  // Scan drives in 4 passes checking fastest to slowest
   for (x = 0; x < 4; x++) {
     pci = (PCNRITEM) WinSendMsg(hwndCnr,
-                                CM_QUERYRECORD,
-                                MPVOID,
-                                MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+                                CM_QUERYRECORD,
+                                MPVOID,
+                                MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
     while (pci && (INT)pci != -1) {
       pciNext = (PCNRITEM) WinSendMsg(hwndCnr,
-                                      CM_QUERYRECORD,
-                                      MPFROMP(pci),
-                                      MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
-      if (!(pci->flags & RECFLAGS_ENV)) {
-        if ((ULONG) (toupper(*pci->pszFileName) - '@') == ulCurDriveNum ||
-            toupper(*pci->pszFileName) > 'B') {
-          if (!(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_INVALID) &&
-              !(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOPRESCAN) &&
-              (!fNoRemovableScan ||
-              !(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_REMOVABLE)) &&
-              (x == 0 ? (!(TestFlags[x] & (driveflags[toupper(*pci->pszFileName) - 'A']))) :
-               x == 3 ? (TestFlags[x] & (driveflags[toupper(*pci->pszFileName) - 'A'])) :
-               ((TestFlags[x] & (driveflags[toupper(*pci->pszFileName) - 'A'])) &&
-                !((driveflags[toupper(*pci->pszFileName) - 'A']) & DRIVE_SLOW)))) {
-            if (!Stubby(hwndCnr, pci) && !DRIVE_RAMDISK) {
-              WinSendMsg(hwndCnr,
-                         CM_INVALIDATERECORD,
-                         MPFROMP(&pci),
-                         MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
-              goto SkipBadRec;
-            }
-          }
-        }
-        else {
-          WinSendMsg(hwndCnr,
-                     CM_INVALIDATERECORD,
-                     MPFROMP(&pci),
-                     MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
-        }
-        WinSendMsg(WinWindowFromID(WinQueryWindow(hwndParent, QW_PARENT),
-                                   MAIN_DRIVELIST),
-                   LM_INSERTITEM,
-                   MPFROM2SHORT(LIT_SORTASCENDING, 0),
-                   MPFROMP(pci->pszFileName));
+                                      CM_QUERYRECORD,
+                                      MPFROMP(pci),
+                                      MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
+      if (~pci->flags & RECFLAGS_ENV) {
+        ULONG drvNum = toupper(*pci->pszFileName) - 'A';        // 0..25
+        if (drvNum == ulCurDriveNum || drvNum >= 2) {
+          ULONG flags = driveflags[drvNum];     // Speed up
+          if (~flags & DRIVE_INVALID &&
+              ~flags & DRIVE_NOPRESCAN &&
+              !checked[drvNum] &&
+              (!fNoRemovableScan || (~flags & DRIVE_REMOVABLE)) &&
+              (flags & (DRIVE_SLOW | DRIVE_VIRTUAL | DRIVE_REMOTE)) ==
+                whenToCheck[x])
+          {
+            if (!Stubby(hwndCnr, pci) && !DRIVE_RAMDISK) {
+              WinSendMsg(hwndCnr,
+                         CM_INVALIDATERECORD,
+                         MPFROMP(&pci),
+                         MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
+              goto SkipBadRec;
+            }
+            checked[drvNum] = TRUE;
+          } // if this pass
+        }
+        else {
+          WinSendMsg(hwndCnr,
+                     CM_INVALIDATERECORD,
+                     MPFROMP(&pci),
+                     MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
+        }
+        if (x == 0) {
+          // Add to drives drop down
+          WinSendMsg(WinWindowFromID(WinQueryWindow(hwndParent, QW_PARENT),
+                                     MAIN_DRIVELIST),
+                     LM_INSERTITEM,
+                     MPFROM2SHORT(LIT_SORTASCENDING, 0),
+                     MPFROMP(pci->pszFileName));
+        }
       }
     SkipBadRec: