Changeset 787 for trunk/dll/treecnr.c

Timestamp:

Aug 19, 2007, 11:02:37 PM (18 years ago)

Author:

Steven Levine

Message:

Rework UM_FILLSETUPLIST IDM_SAVEDIRCNRSTATE and ..._setups() logic for ticket# 109 and #31
Add GetMSecTimer()
Use GetMSecTimer in DbgMsg
Tweak notebook.ipf scanning page
Move more #pragma alloc_text statements to end of files for OpenWatcom
Delete obsoletes
Revert ExpandAll() ShowTreeRec() DosSleeps to 0 - DosSleep(1) was slowing down inner loops
Drop afFilesToGet - use FilesToGet directly
Optimze ShowTreeRec() collapse logic - was really slow

File:

• trunk/dll/treecnr.c (modified) (8 diffs)

trunk/dll/treecnr.c

@@ -19 +19 @@
   15 Aug 06 SHL Rework SetMask args
   31 Aug 06 JS  Add more partitioning menu items
-  22 OCT 06 GKY Add NDFS32 support
+  22 Oct 06 GKY Add NDFS32 support
   29 Dec 06 GKY Fixed menu gray out for remote drives (added variable "remote")
   29 Dec 06 GKY Enabled edit of drive flags on "not ready" drives
@@ -36 +36 @@
   02 Aug 07 SHL Sync with CNRITEM mods
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
+  14 Aug 07 SHL Revert ShowTreeRec DosSleep to 0
+  14 Aug 07 SHL Optimze ShowTreeRec collapse - was really slow
 
 ***********************************************************************/
@@ -143 +145 @@
 }
 
-VOID ShowTreeRec(HWND hwndCnr, CHAR * dirname, BOOL collapsefirst,
+VOID ShowTreeRec(HWND hwndCnr,
+                 CHAR *dirname,
+                 BOOL collapsefirst,
                  BOOL maketop)
 {
@@ -153 +157 @@
   CHAR szDir[CCHMAXPATH], *p;
 
-  /* is it already the current record? */
+  // already positioned to requested record?
   pci = WinSendMsg(hwndCnr,
                    CM_QUERYRECORDEMPHASIS,
                    MPFROMLONG(CMA_FIRST), MPFROMSHORT(CRA_CURSORED));
   if (pci && (INT) pci != -1 && !stricmp(pci->pszFileName, dirname)) {
-    quickbail = TRUE;
-    goto MakeTop;                       /* skip lookup bullsh*t */
+    // DbgMsg(pszSrcFile, __LINE__, "already at %s collapse %u maketop %u", dirname, collapsefirst, maketop);   // 14 Aug 07 SHL fixme
+    quickbail = TRUE;                   // Bypass repositioning
+    goto MakeTop;
   }
   WinEnableWindowUpdate(hwndCnr, FALSE);
+  DbgMsg(pszSrcFile, __LINE__, "finding %s collapse %u maketop %u", dirname, collapsefirst, maketop);   // 14 Aug 07 SHL fixme
   pci = FindCnrRecord(hwndCnr, dirname, NULL, TRUE, FALSE, TRUE);
   if (!pci || (INT) pci == -1) {
@@ -168 +174 @@
     szDir[2] = '\\';
     szDir[3] = 0;
-    p = szDir + 3;
+    p = szDir + 3;                      // Point after root backslash
     for (;;) {
       pciP = FindCnrRecord(hwndCnr, szDir, NULL, TRUE, FALSE, TRUE);
       if (pciP && (INT) pciP != -1) {
         if (!stricmp(dirname, pciP->pszFileName))
-          break;
-        if (!(pciP->rc.flRecordAttr & CRA_EXPANDED))
+          break;                        // Found it
+        if (~pciP->rc.flRecordAttr & CRA_EXPANDED)
           WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
         strcpy(szDir, dirname);
         if (p - szDir >= strlen(szDir))
-          break;
+          break;                        // Not root dir
         p = strchr(p, '\\');
         if (p) {
-          *p = 0;
+          *p = 0;                       // fixme?
           p++;
         }
@@ -189 +195 @@
       else
         break;
-      DosSleep(1);
-    }
+      DosSleep(0);
+    } // for
     pci = FindCnrRecord(hwndCnr, dirname, NULL, TRUE, FALSE, TRUE);
   }
+  DbgMsg(pszSrcFile, __LINE__, "found");        // 14 Aug 07 SHL fixme
   if (pci && (INT) pci != -1) {
-    if (!(pci->rc.flRecordAttr & CRA_CURSORED)) {
+    if (~pci->rc.flRecordAttr & CRA_CURSORED) {
       if (collapsefirst) {
-        /* collapse top level of all branches */
+        DbgMsg(pszSrcFile, __LINE__, "collapsing");     // 14 Aug 07 SHL fixme
         pciP = WinSendMsg(hwndCnr,
                           CM_QUERYRECORD,
                           MPVOID, MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
         while (pciP && (INT) pciP != -1) {
-          if (toupper(*pciP->pszFileName) == toupper(*dirname))
-            /* collapse all levels if branch is our drive */
-            ExpandAll(hwndCnr, FALSE, pciP);
-          else if (pciP->rc.flRecordAttr & CRA_EXPANDED)
+#if 1
+          if (pciP->rc.flRecordAttr & CRA_EXPANDED) {
+            // collapse top level of all branches
             WinSendMsg(hwndCnr, CM_COLLAPSETREE, MPFROMP(pciP), MPVOID);
+          }
+#else // fixme to be gone
+          if (toupper(*pciP->pszFileName) == toupper(*dirname)) {
+            // collapse all levels if branch is our drive
+            if (pciP->rc.flRecordAttr & CRA_EXPANDED)
+              ExpandAll(hwndCnr, FALSE, pciP);
+          }
+          else if (pciP->rc.flRecordAttr & CRA_EXPANDED) {
+            // collapse top level of all branches
+            WinSendMsg(hwndCnr, CM_COLLAPSETREE, MPFROMP(pciP), MPVOID);
+          }
+#endif
           pciP = WinSendMsg(hwndCnr,
                             CM_QUERYRECORD,
                             MPFROMP(pciP),
                             MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
-        }
+        } // while
       }
       /* expand all parent branches */
+      DbgMsg(pszSrcFile, __LINE__, "expanding parents");        // 14 Aug 07 SHL fixme
       pciToSelect = pci;
       for (;;) {
@@ -226 +245 @@
         else
           break;
-        DosSleep(1);
-      }
+        DosSleep(1);                    // Let GUI update
+      } // for
     }
     /* make record visible */
   MakeTop:
+    DbgMsg(pszSrcFile, __LINE__, "moving into view");   // 14 Aug 07 SHL fixme
     pciToSelect = pci;
     if (pciToSelect && (INT) pciToSelect != -1) {
-      if (fTopDir || maketop)
+      if (fTopDir || maketop) {
         ShowCnrRecord(hwndCnr, (PMINIRECORDCORE) pciToSelect);
-      if (fSwitchTreeExpand && !(pciToSelect->rc.flRecordAttr & CRA_EXPANDED))
+      }
+      if (fSwitchTreeExpand && ~pciToSelect->rc.flRecordAttr & CRA_EXPANDED) {
+        DbgMsg(pszSrcFile, __LINE__, "expanding current");      // 14 Aug 07 SHL fixme
         WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
-      if (quickbail) {
-        WinEnableWindowUpdate(hwndCnr, TRUE);
-        return;
-      }
-      WinSendMsg(hwndCnr,
-                 CM_SETRECORDEMPHASIS,
-                 MPFROMP(pciToSelect),
-                 MPFROM2SHORT(TRUE, CRA_SELECTED | CRA_CURSORED));
+        DbgMsg(pszSrcFile, __LINE__, "expanded");       // 14 Aug 07 SHL fixme
+      }
+      if (!quickbail) {
+        WinSendMsg(hwndCnr,
+                   CM_SETRECORDEMPHASIS,
+                   MPFROMP(pciToSelect),
+                   MPFROM2SHORT(TRUE, CRA_SELECTED | CRA_CURSORED));
+      }
     }
   }
+  DbgMsg(pszSrcFile, __LINE__, "done"); // 14 Aug 07 SHL fixme
   WinEnableWindowUpdate(hwndCnr, TRUE);
+  DosSleep(1);                  // Let GUI update
 }
 
@@ -517 +541 @@
 
   case UM_SHOWME:
+    // DbgMsg(pszSrcFile, __LINE__, "UM_SHOWME mp1 %p mp2 %p", mp1, mp2);       // 14 Aug 07 SHL fixme
     if (mp1) {
       dcd = INSTDATA(hwnd);
+      // DbgMsg(pszSrcFile, __LINE__, "UM_SHOWME dcd %p", dcd); // 14 Aug 07 SHL fixme
       if (dcd) {
         BOOL tempsusp, tempfollow, temptop;