Changeset 1871 for trunk/dll/findrec.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/findrec.c (modified) (4 diffs)

trunk/dll/findrec.c

@@ -14 +14 @@
   06 Aug 15 SHL Clean up and comment
   23 Aug 15 SHL Protect FindCnrRecord filename arg
+  20 Sep 15 GKY Add a correction factor so directories don't get placed above the top of the
+                tree container when a large drive has been expanded.
 
 ***********************************************************************/
@@ -63 +65 @@
     pciParent = (PCNRITEM) CMA_FIRST;
   pci = WinSendMsg(hwndCnr,
-                   CM_SEARCHSTRING, MPFROMP(&srch), MPFROMP(pciParent));
+                   CM_SEARCHSTRING, MPFROMP(&srch), MPFROMP(pciParent));
+  //DbgMsg(pszSrcFile, __LINE__,"FindCnrItem pciParent %p pci %p file %s", pciParent,
+  //      pci, file);
   while (pci && (INT) pci != -1) {
     if (!noenv || (pci->flags & (RECFLAGS_ENV | RECFLAGS_UNDERENV)) == 0) {
@@ -123 +127 @@
   RECTL rcl;
   RECTL rclViewport;
+  RECTL rclFirst;
+  RECTL rclLast;
+  PMINIRECORDCORE pmiFirst;
+  PMINIRECORDCORE pmiLast;
+  INT correction;
 
+  pmiFirst = WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(NULL),
+                        MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+  pmiLast = WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(NULL),
+                       MPFROM2SHORT(CMA_LAST, CMA_ITEMORDER));
+  WinSendMsg(hwndCnr,
+             CM_QUERYVIEWPORTRECT,
+             MPFROMP(&rclViewport), MPFROM2SHORT(CMA_WINDOW , TRUE));
   memset(&qrecrct, 0, sizeof(QUERYRECORDRECT));
   qrecrct.cb = sizeof(QUERYRECORDRECT);
@@ -133 +149 @@
     WinSendMsg(hwndCnr, CM_QUERYRECORDRECT, MPFROMP(&rcl), MPFROMP(&qrecrct));
   }
+  qrecrct.pRecord = (PRECORDCORE) pmiFirst;
+  WinSendMsg(hwndCnr, CM_QUERYRECORDRECT, MPFROMP(&rclFirst), MPFROMP(&qrecrct));
+  qrecrct.pRecord = (PRECORDCORE) pmiLast;
+  WinSendMsg(hwndCnr, CM_QUERYRECORDRECT, MPFROMP(&rclLast), MPFROMP(&qrecrct));
+  correction = 5 + ((abs(rclFirst.yTop) + abs(rclLast.yTop)) / 22500);
   WinSendMsg(hwndCnr,
-             CM_QUERYVIEWPORTRECT,
-             MPFROMP(&rclViewport), MPFROM2SHORT(CMA_WINDOW, TRUE));
-  //DbgMsg(pszSrcFile, __LINE__, "TOPPORT %i TOPRCL %i", rclViewport.yTop , rcl.yTop);
+             CM_SCROLLWINDOW,
+             MPFROMSHORT(CMA_VERTICAL),
+             MPFROMLONG((rclViewport.yTop - (rcl.yTop) - correction)));
+#if 0
+  DbgMsg(pszSrcFile, __LINE__, "RECTLFIRST %i RECTLLAST %i %p",
+         rclFirst.yTop, rclLast.yTop, pmiLast);
+  DbgMsg(pszSrcFile, __LINE__, "TOPPORT %i TOPRCL %i RIGHTRCL %i",
+         rclViewport.yTop , rcl.yTop, rcl.xRight);
+#endif
   WinSendMsg(hwndCnr,
              CM_SCROLLWINDOW,
              MPFROMSHORT(CMA_HORIZONTAL), MPFROMLONG(rcl.xRight - rclViewport.xRight));
-  WinSendMsg(hwndCnr,
-             CM_SCROLLWINDOW,
-             MPFROMSHORT(CMA_VERTICAL),
-             MPFROMLONG((rclViewport.yTop - (rcl.yTop) - 4)));
+  
 }