Changeset 1871 for trunk/dll/select.c

Timestamp:

Sep 21, 2015, 12:57:02 AM (10 years ago)

Author:

Gregg Young

Message:

Create CollapseAll and modify ExpandAll to reduce code overhead both to try and speed drive expansion. Change ExpandAll to allow it to loop in UM_EXPAND until until drive is completely expanded. Changes were need to work with Flesh, Stubby and UnFlesh being moved to a thread. Add code for Flesh to skip the directory entry added by Stubby (eliminate use of NULL/Nullstr pszFileNames by Stubby). Add code in Stubby to insert a complete container item. Add a flag to indicate when a directory needed to be Fleshed. Get expand and switch code to work with Flesh, UnFlesh and Stubby running on a thread. Loop and idle ExpandAll; Move tree expand to a thread; Have ShowTreeRec wait for the Flesh thread. Add a correction factor so directories don't get placed above the top of the tree container when a large drive has been expanded. Debug is mostly still in but all turned off.

File:

• trunk/dll/select.c (modified) (4 diffs)

trunk/dll/select.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2011 Steven H. Levine
+  Copyright (c) 2004, 2015 Steven H. Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
@@ -34 +34 @@
   02 Aug 15 GKY Remove unneed SubbyScan code and improve suppression of blank lines and
                 duplicate subdirectory name caused by running Stubby in worker threads.
+                20 Sep 15 GKY Create CollapseAll and modify ExpandAll to reduce code overhead
+                both to try and speed drive expansion. Change ExpandAll to allow it to loop
+                in UM_EXPAND until until drive is completely expanded. Changes were need to
+                work with Flesh, Stubby and UnFlesh being moved to a thread
 
 ***********************************************************************/
@@ -65 +69 @@
 #include "stristr.h"                    // findstring
 #include "fortify.h"
+#include "flesh.h"
 #if 0
 #define  __PMPRINTF__
@@ -564 +569 @@
 }
 
-VOID ExpandAll(HWND hwndCnr, BOOL expand, PCNRITEM pciParent)
-{
-  PCNRITEM pci;
-
+BOOL ExpandAll(HWND hwndCnr, INT count, PCNRITEM pciParent)
+{
+  PCNRITEM pci;
+  static BOOL fExpanding = FALSE;
+  static INT counter = 1;
+
+  if (count != counter && count != 0) {
+    if (count > counter) {
+      fExpanding = FALSE;
+      counter++;
+    }
+    else if (count < counter) {
+      fExpanding = FALSE;
+      counter = 1;
+    }
+  }
   if (!pciParent)
     pciParent = WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(NULL),
                            MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
   if (pciParent) {
-    if (expand && ~pciParent->rc.flRecordAttr & CRA_EXPANDED)
+    pci = (PCNRITEM) WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pciParent),
+                                MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
+    // Only expand items that have childern
+    if (pci  && ~pciParent->rc.flRecordAttr & CRA_EXPANDED) {
       WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciParent), MPVOID);
-    else if (!expand && (pciParent->rc.flRecordAttr & CRA_EXPANDED))
+      if (count != 0) {
+        fExpanding = TRUE;
+        if (!IsFleshWorkListEmpty()) {
+          WaitFleshWorkListEmpty(NULL); // Let it expand
+        }
+      }
+    }
+    while (pci && (INT)pci != -1) {
+      ExpandAll(hwndCnr, count, pci);
+      if (!IsFleshWorkListEmpty())
+        WaitFleshWorkListEmpty(NULL); // Wait for container to catch up
+      pci = (PCNRITEM) WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pci),
+                                  MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
+    }
+  }
+  //DosSleep(0);
+  return fExpanding;
+}
+
+VOID CollapseAll(HWND hwndCnr, PCNRITEM pciParent)
+{
+  PCNRITEM pci;
+
+  if (!pciParent)
+    pciParent = WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(NULL),
+                           MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+  if (pciParent) {
+    pci = (PCNRITEM) WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pciParent),
+                                MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
+    if ((pciParent->rc.flRecordAttr & CRA_EXPANDED))
       WinSendMsg(hwndCnr, CM_COLLAPSETREE, MPFROMP(pciParent), MPVOID);
-    pci = (PCNRITEM) WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pciParent),
-                                MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
-      while (pci && (INT)pci != -1) {
-      ExpandAll(hwndCnr, expand, pci);
+    while (pci && (INT)pci != -1) {
+      CollapseAll(hwndCnr, pci);
       pci = (PCNRITEM) WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pci),
-                                  MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
+                                  MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
     }
   }