Changeset 1882

Timestamp:

Oct 12, 2015, 9:59:34 PM (10 years ago)

Author:

Gregg Young

Message:

ExpandAll on a CDROM drive caused directory not found errors. Changed waits so they are longer on removable drives errors are gone performance on hard drives is unchanged.

Location:

trunk/dll

Files:

• flesh.c (modified) (1 diff)
• select.c (modified) (3 diffs)
• treecnr.c (modified) (2 diffs)

trunk/dll/flesh.c

@@ -79 +79 @@
 #include "common.h"                     // IncrThreadUsage DecrThreadUsage
 #include "pathutil.h"
-#include "treecnr.h"                    // fExpandAll
 #if 0
 #define  __PMPRINTF__

trunk/dll/select.c

@@ -72 +72 @@
 #include "fortify.h"
 #include "flesh.h"
+#include "treecnr.h"                    // fExpandAll
 #if 0
 #define  __PMPRINTF__
@@ -599 +600 @@
         fExpanding = TRUE;
         if (IsFleshWorkListEmpty())
-          DosSleep(0);       // Yield to EXPANDTREE and Flesh thread
+          DosSleep(fExpandAll ? 0 : 10);       // Yield to EXPANDTREE and Flesh thread
         if (!IsFleshWorkListEmpty()) {
-          WaitFleshWorkListEmpty(NULL, 10); // Let it expand
+          WaitFleshWorkListEmpty(NULL, fExpandAll ? 1 : 50); // Let it expand
         }
       }
@@ -608 +609 @@
       ExpandAll(hwndCnr, count, pci);
       if (count != 0 && !IsFleshWorkListEmpty())
-        WaitFleshWorkListEmpty(NULL, 10); // Wait for container to catch up
+        WaitFleshWorkListEmpty(NULL, fExpandAll ? 1 : 50); // Wait for container to catch up
       pci = (PCNRITEM) WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pci),
                                   MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));

trunk/dll/treecnr.c

@@ -795 +795 @@
       INT x = 0;
       BOOL fExpanding = TRUE;
-
+      PCNRITEM pci = (PCNRITEM) mp2;
+
+      if (!pci) {
+        Runtime_Error(pszSrcFile, __LINE__, NULL);
+        return 0;
+      }
       dcd->suspendview = TRUE;
       priority_idle();
       if (SHORT1FROMMP(mp1) == IDM_EXPAND) {
-        fExpandAll = TRUE;
+        if (!(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_REMOVABLE))
+          fExpandAll = TRUE;
         while (fExpanding) { // Not serialized not practical to wait on very large directories
           x++;
           if (!IsFleshWorkListEmpty()) {
-            WaitFleshWorkListEmpty(NULL, 10); // Let it expand
+            WaitFleshWorkListEmpty(NULL, fExpandAll ? 1 : 50); // Let it expand
           }
-          fExpanding = ExpandAll(dcd->hwndCnr, x, (PCNRITEM) mp2);
+          fExpanding = ExpandAll(dcd->hwndCnr, x, pci);
           DosSleep(240);
         }
@@ -811 +817 @@
       }
       else
-        CollapseAll(dcd->hwndCnr, (PCNRITEM) mp2);
+        CollapseAll(dcd->hwndCnr, pci);
       priority_normal();
       DosSleep(1); // Fixes tree epansion (dir text and icons all placed on