Changeset 1874 for trunk/dll/treecnr.c

Timestamp:

Sep 27, 2015, 7:20:10 PM (10 years ago)

Author:

Gregg Young

Message:

DosSleep times in WaitFleshWorkListEmpty set by caller; TOPDIR code calls WaitFleshWorkListEmpty before ShowCnrRecord and now actually exists for directory containers in tree view. These calls are made from the object windows.

File:

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

trunk/dll/treecnr.c

@@ -112 +112 @@
   26 Sep 15 GKY Remove fInitialDriveScan code
   26 Sep 15 GKY Changes to speed up ExpandAll
+  26 Sep 15 GKY Put UM_TOPDIR in the object window so it can call WaitFleshWorkListEmpty
+                while avoiding thread 1
+  27 Sep 15 GKY DosSleep times in WaitFleshWorkListEmpty set by caller
 
 ***********************************************************************/
@@ -353 +356 @@
       if (!pciP || (INT)pciP == -1) {
         //DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec FindCnrRecord(\"%s\") returned pciP %p", szDir, pciP); // 2015-08-04 SHL FIXME debug
-        WaitFleshWorkListEmpty(szDirArg);       // 2015-08-23 SHL
+        WaitFleshWorkListEmpty(szDirArg, 240);  // 2015-08-23 SHL
         break;                                  // No match
       }
@@ -385 +388 @@
         }
       }
-      WaitFleshWorkListEmpty(NULL);     // 2015-09-26 GKY Let Flesh thread catch up
+      WaitFleshWorkListEmpty(NULL, 240);     // 2015-09-26 GKY Let Flesh thread catch up
     } // while expanding
 
@@ -396 +399 @@
     if (~pci->rc.flRecordAttr & CRA_CURSORED) {
       if (collapsefirst) {
-        WaitFleshWorkListEmpty(NULL);
+        WaitFleshWorkListEmpty(NULL, 240);
         pciP = WinSendMsg(hwndCnr,
                           CM_QUERYRECORD,
@@ -441 +444 @@
       if (maketop || fTopDir) {
         if (fCollapseFirst && !quickbail) {
-          WaitFleshWorkListEmpty(NULL); //Let the root expand first otherwise it makes top
+          WaitFleshWorkListEmpty(NULL, 240); //Let the root expand first otherwise it makes top
         }
         // 2015-08-23 SHL FIXME debug
@@ -449 +452 @@
 
       if (!quickbail) {
-        WaitFleshWorkListEmpty(szDirArg);       // 2015-08-19 SHL try to ensure contents stable
+        WaitFleshWorkListEmpty(szDirArg, 240);  // 2015-08-19 SHL try to ensure contents stable
         //DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec WinSendMsg(CM_SETRECORDEMPHASIS, CRA_SELECTED | CRA_CURSORED) szDirArg \"%s\"", szDirArg); // 2015-08-04 SHL FIXME debug
         WinSendMsg(hwndCnr,
@@ -771 +774 @@
     return 0;
 
+  case UM_TOPDIR:
+    if (mp1) {
+      dcd = INSTDATA(hwnd);
+      if (dcd) {
+        PCNRITEM pci = (PCNRITEM) mp1;
+        WaitFleshWorkListEmpty(pci->pszFileName, 240);
+        ShowCnrRecord(dcd->hwndCnr, (PMINIRECORDCORE) pci);
+      }
+    }
+    return 0;
+
   case DM_PRINTOBJECT:
     return MRFROMLONG(DRR_TARGET);
@@ -813 +827 @@
           x++;
           if (!IsFleshWorkListEmpty()) {
-            WaitFleshWorkListEmpty(NULL); // Let it expand
+            WaitFleshWorkListEmpty(NULL, 10); // Let it expand
           }
           fExpanding = ExpandAll(dcd->hwndCnr, x, (PCNRITEM) mp2);
@@ -967 +981 @@
             pci = FindParentRecord(dcd->hwndCnr, pci);
             driveserial[toupper(*pci->pszFileName) - 'A'] = -1;
-            WaitFleshWorkListEmpty(pci->pszFileName);   // 2015-08-19 SHL in case pci still in work list
+            WaitFleshWorkListEmpty(pci->pszFileName, 240);      // 2015-08-19 SHL in case pci still in work list
             AddFleshWorkRequest(dcd->hwndCnr, pci, eUnFlesh);
           }
@@ -1959 +1973 @@
   case UM_TOPDIR:
     if (mp1) {
-      PCNRITEM pci = (PCNRITEM) mp1;
-      ShowCnrRecord(hwnd, (PMINIRECORDCORE) pci);
+      PostMsg(dcd->hwndObject, UM_TOPDIR, mp1, MPVOID);
     }
     return 0;
@@ -2077 +2090 @@
           else {
             driveserial[x] = -1;
-            //WaitFleshWorkListEmpty(NULL);     // 2015-08-13 SHL in case pci still in work list
+            //WaitFleshWorkListEmpty(NULL, 10); // 2015-08-13 SHL in case pci still in work list
             AddFleshWorkRequest(hwnd, pci, eUnFlesh);
             PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
@@ -3433 +3446 @@
                     driveserial[toupper(*pci->pszFileName) - 'A'] !=
                     volser.serial)
-                { 
-                  WaitFleshWorkListEmpty(pci->pszFileName);     // 2015-08-19 SHL in case pci still in work list
+                {
+                  WaitFleshWorkListEmpty(pci->pszFileName, 10); // 2015-08-19 SHL in case pci still in work list
                   AddFleshWorkRequest(dcd->hwndCnr, pci, eUnFlesh);
                 }
@@ -3441 +3454 @@
                      driveserial[toupper(*pci->pszFileName) - 'A'] !=
                      volser.serial)) {
+                  WaitFleshWorkListEmpty(pci->pszFileName, 10); // 2015-08-19 SHL in case pci still in work list
                   if (qmsg.msg == UM_EXPANDTREE && AddFleshWorkRequest(dcd->hwndCnr, pci, eFlesh)
-                      && !dcd->suspendview  && fTopDir && !fSwitchTreeOnDirChg) {
-                    DosSleep(1);
-                    WaitFleshWorkListEmpty(pci->pszFileName);
+                      && !dcd->suspendview  && fTopDir) {
                     PostMsg(dcd->hwndCnr, UM_TOPDIR, MPFROMP(pci), MPVOID);
                   }
@@ -3452 +3464 @@
               else {
                 driveserial[toupper(*pci->pszFileName) - 'A'] = -1;
-                WaitFleshWorkListEmpty(pci->pszFileName);       // 2015-08-19 SHL in case pci still in work list
+                WaitFleshWorkListEmpty(pci->pszFileName, 10);   // 2015-08-19 SHL in case pci still in work list
                 AddFleshWorkRequest(dcd->hwndCnr, pci, eUnFlesh);
                 PostMsg(dcd->hwndCnr, UM_RESCAN, MPVOID, MPVOID);
@@ -3466 +3478 @@
                 DosSleep(1);
               else {
-                while (!IsFleshWorkListEmpty())
-                  DosSleep(10); //Yield to Flesh thread
+                WaitFleshWorkListEmpty(pci->pszFileName, 10);   // 2015-08-19 SHL in case pci still in work list
               }
               AddFleshWorkRequest(dcd->hwndCnr, pci, eFlesh);   // forceFlesh
-              if (!dcd->suspendview && fTopDir && !fSwitchTreeOnDirChg) {
+              if (!dcd->suspendview && fTopDir) {
                 //DbgMsg(pszSrcFile, __LINE__, "TreeCnrWndProc UM_TOPDIR %p pci %p %s",
                 //       qmsg.hwnd, pci, pci->pszFileName);  // 2015-08-04 SHL FIXME debug