Changeset 1862 for trunk/dll/treecnr.c

Timestamp:

Aug 23, 2015, 2:10:07 AM (10 years ago)

Author:

Gregg Young

Message:

Improve ability of maketop to get directory position in tree correct on first open of states with large and/or deep tree structures

File:

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

trunk/dll/treecnr.c

@@ -102 +102 @@
   07 Aug 15 SHL Rework to use AddFleshWorkRequest rather than direct calls to Stubby/Flesh/Unflesh
   20 Aug 15 SHL Sync with SetFleshFocusPath mods
+  22 Aug 15 GKY Improve ability of maketop to get directory position in tree correct on first
+                open of states with large and/or deep tree structures
 
 ***********************************************************************/
@@ -308 +310 @@
     goto MakeTop;
   }
-
-  WinEnableWindowUpdate(hwndCnr, FALSE);
-
-  // 2015-08-13 SHL add retry logic
-  for (found = FALSE, retries = 0; !found && retries < 10; retries++) {
+  // 2015-08-22 GKY Without this FM2 has NULL pci->pszFileName errors and switch failures
+  if (fInitialDriveScan)
+    DosSleep(1500); // 100 still had errors
+  if (fSwitchTreeOnDirChg)
+    DosSleep(200);
+  //WaitFleshWorkListEmpty(0);
+
+  // 2015-08-13 SHL add retry logic 2015-08-22 GKY increase retries from 10 to 100 to
+  // eliminate switch failures on deep or large tree state switches
+  for (found = FALSE, retries = 0; !found && retries < 100; retries++) {
 
     pci = FindCnrRecord(hwndCnr,
@@ -347 +354 @@
       if (!pciP || (INT)pciP == -1) {
         DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec FindCnrRecord(%s) returned %p", szDir, pciP); // 2015-08-04 SHL FIXME debug
-        WaitFleshWorkListEmpty(szDir);          // 2015-08-19 SHL
-        DosSleep(1000);
+        WaitFleshWorkListEmpty(szDir);          // 2015-08-19 SHL
         break;                                  // No match
       }
@@ -366 +372 @@
       }
 
-      WaitFleshWorkListEmpty(szDir);    // 2015-08-19 SHL
+      //WaitFleshWorkListEmpty(szDir);  // 2015-08-19 SHL
 
       // Add next component to path
@@ -429 +435 @@
         WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
       if (fTopDir || maketop)
-        ShowCnrRecord(hwndCnr, (PMINIRECORDCORE)pciToSelect);
+        ShowCnrRecord(hwndCnr, (PMINIRECORDCORE)pciToSelect);
 
       if (!quickbail) {
@@ -441 +447 @@
     }
   }
-
-  WinEnableWindowUpdate(hwndCnr, TRUE);
 }
 
@@ -2107 +2111 @@
           else {
             driveserial[x] = -1;
-            WaitFleshWorkListEmpty(NULL);       // 2015-08-13 SHL in case pci still in work list
+            //WaitFleshWorkListEmpty(NULL);     // 2015-08-13 SHL in case pci still in work list
             AddFleshWorkRequest(hwnd, pci, eUnFlesh);
             PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);