Changeset 1856

Timestamp:

Aug 18, 2015, 7:12:52 PM (10 years ago)

Author:

Steven Levine

Message:

Rework Flesh/Stubby etc. to avoid running on thread 1
Should be ready for release after spurious traps resolved
DbgMsg calls retained - delete/disable before release

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• dll/dircnrs.c (modified) (24 diffs)
• dll/filldir.c (modified) (29 diffs)
• dll/flesh.c (modified) (24 diffs)
• dll/flesh.h (modified) (3 diffs)
• dll/init.c (modified) (10 diffs)
• dll/init.h (modified) (3 diffs)
• dll/listutil.c (added)
• dll/listutil.h (added)
• dll/mainwnd.c (modified) (13 diffs)
• dll/mainwnd.h (modified) (3 diffs)
• dll/mainwnd2.c (modified) (4 diffs)
• dll/makefile (modified) (3 diffs)
• dll/treecnr.c (modified) (62 diffs)
• dll/update.c (modified) (8 diffs)

trunk/HISTORY

@@ -1 +1 @@
 New stuff at the top.  This list is not necessarily complete.
+
+3.24
+ o Rework Flesh/Stubby logic to avoid doing work on thread 1
+ o Add generic linked list support routines
 
 3.23 

trunk/dll/dircnrs.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2010 Steven H. Levine
+  Copyright (c) 2001, 2015 Steven H. Levine
 
   16 Oct 02 SHL Handle large partitions
@@ -85 +85 @@
   22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
   02 Mar 14 GKY Speed up intial drive scans Ticket 528
-  26 Jun 14 SHL Rework DirObjWndProc UM_RESCAN to avoid hanging FM/2 Lite when tree hidden
+  26 Jun 14 SHL Rework DirObjWndProc UM_RESCAN to avoid hanging FM/2 Lite when tree hidden
   30 Aug 14 GKY Add semaphore hmtxFiltering to prevent freeing dcd while filtering. Prevents
                 a trap when FM2 is shutdown while directory containers are still populating
@@ -92 +92 @@
   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.
+  07 Aug 15 SHL Rework to use AddFleshWorkRequest rather than direct calls to Stubby/Flesh/Unflesh
 
 ***********************************************************************/
@@ -139 +140 @@
                                         // SpecialSelect2
 #include "dirsize.h"                    // DirSizeProc
-#include "flesh.h"                      // Flesh, Stubby, UnFlesh
+#include "flesh.h"                      // AddFleshWorkRequest
 #include "valid.h"                      // IsValidDir
 #include "objwin.h"                     // MakeObjWin
@@ -766 +767 @@
 #     ifdef FORTIFY
       Fortify_BecomeOwner(dcd);         // We free dcd
-      if (GetTidForThread() != 1)
-      Fortify_ChangeScope(dcd, -1);
+      if (GetTidForThread())
+        Fortify_ChangeScope(dcd, -1);
 #     endif
       // set unique id
@@ -779 +780 @@
 #   ifdef FORTIFY
     // TID 1 will free data
-    if (GetTidForThread() != 1)
+    if (GetTidForThread())
       Fortify_LeaveScope();
 #   endif
@@ -844 +845 @@
                             MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
           if (!pciC) {
-            Stubby(dcd->hwndCnr, pci);
+            AddFleshWorkRequest(dcd->hwndCnr, pci, eStubby);
           }
         }
@@ -899 +900 @@
       // 2014-06-26 SHL FM/2 Lite may not have drive tree yet
       if (hwndTree) {
+        // 2015-08-12 SHL Optimze to update drive tree for only last saved state
+
+        // 2015-08-13 SHL
+        if (fSwitchTreeOnDirChg)
+          DbgMsg(pszSrcFile, __LINE__, "DirObjWndProc UM_RESCAN cDirectoriesRestored %u", cDirectoriesRestored); // 2015-08-04 SHL FIXME debug
+
         if (fSwitchTreeOnDirChg) {
           // Keep drive tree in sync with directory container
           PSZ pszTempDir;
+#if 0 // 2015-08-12 SHL FIXME to be gone fInitialDriveScan
           while (fInitialDriveScan)
-            DosSleep(10);                       // Allow to complete
-          DosSleep(50);
+            DosSleep(500);                      // Allow to complete
+          DosSleep(200);                        // Allow to complete
+#endif
           pszTempDir = xstrdup(dcd->directory, pszSrcFile, __LINE__);
           if (pszTempDir) {
             if (hwndMain) {
-              if (TopWindow(hwndMain, (HWND) 0) == dcd->hwndFrame)
+              if (TopWindow(hwndMain, (HWND)0) == dcd->hwndFrame) {
+                DbgMsg(pszSrcFile, __LINE__, "DirObjWndProc UM_RESCAN PostMsg(UM_SHOWME)"); // 2015-08-04 SHL FIXME debug
                 if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
                   free(pszTempDir);
+              }
             }
             else {
+              DbgMsg(pszSrcFile, __LINE__, "DirObjWndProc UM_RESCAN PostMsg(UM_SHOWME)"); // 2015-08-04 SHL FIXME debug
               if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
                 free(pszTempDir);
@@ -1229 +1241 @@
                         0,
                         0,
-                        SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
+                        SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
       FreeList(dcd->lastselection);
       WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);    // 13 Apr 10 SHL Set NULL before freeing dcd
@@ -1421 +1433 @@
       LastDir = hwnd;
       PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
+      // 2015-08-13 SHL
       if (fSwitchTreeOnFocus && hwndTree && dcd && *dcd->directory) {
         PSZ pszTempDir = xstrdup(dcd->directory, pszSrcFile, __LINE__);
+        DbgMsg(pszSrcFile, __LINE__, "DirCnrWndProc WM_SETFOCUS cDirectoriesRestored %u", cDirectoriesRestored); // 2015-08-04 SHL FIXME debug
         if (pszTempDir) {
+          DbgMsg(pszSrcFile, __LINE__, "DirCnrWndProc WM_SETFOCUS PostMsg(UM_SHOWME, %s)", pszTempDir); // 2015-08-04 SHL FIXME debug
           if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
             free(pszTempDir);           // Failed
@@ -1490 +1505 @@
       cnri.pszCnrTitle = dcd->directory;
       WinSendMsg(hwnd,
-                 CM_SETCNRINFO, MPFROMP(&cnri), MPFROMLONG(CMA_CNRTITLE));
+                 CM_SETCNRINFO, MPFROMP(&cnri), MPFROMLONG(CMA_CNRTITLE));
       DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
       dcd->totalfiles = cnri.cRecords;
@@ -1569 +1584 @@
       WinSendMsg(hwnd,
                  CM_QUERYCNRINFO,
-                 MPFROMP(&cnri), MPFROMLONG(sizeof(CNRINFO)));
+                 MPFROMP(&cnri), MPFROMLONG(sizeof(CNRINFO)));
       cnri.pSortRecord = (PVOID) SortDirCnr;
       WinSendMsg(hwnd,
@@ -1596 +1611 @@
         cnri.flWindowAttr &= (~(CV_TREE | CV_ICON | CV_DETAIL | CV_TEXT));
         cnri.flWindowAttr |= (CV_NAME | CA_DETAILSVIEWTITLES | CV_MINI |
-                              CV_FLOW);
+                              CV_FLOW);
         cnri.pSortRecord = (PVOID) SortDirCnr;
 
@@ -1653 +1668 @@
         WinEnableMenuItem(DirCnrMenu, IDM_FINDINTREE, (hwndTree != (HWND) 0));
       }
-      // 2014-06-11 SHL fm/2 lite can get here before drive scan completes
-      //if (!fInitialDriveScan) // 2014-08-30 GKY This doesn't seem to be needed
-        PostMsg(hwnd, UM_SETUP2, MPVOID, MPVOID);
+        // 2014-06-11 SHL fm/2 lite can get here before drive scan completes - may not be true anymore
+        PostMsg(hwnd, UM_SETUP2, MPVOID, MPVOID);
     }
     else {
@@ -1963 +1977 @@
 
           if (pszTempDir) {
+            DbgMsg(pszSrcFile, __LINE__, "DirCnrWndProc IDM_FINDINTREE PostMsg(UM_SHOWME)"); // 2015-08-04 SHL FIXME debug
             if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir),
                             MPFROMLONG(1L)))
@@ -2128 +2143 @@
             dcd->sortFlags |= SORT_REVERSE;
           break;
-        }
+        }
         WinSendMsg(hwnd, CM_SORTRECORD, MPFROMP(SortDirCnr),
                    MPFROMLONG(dcd->sortFlags));
@@ -2728 +2743 @@
               case IDM_PRINT:
               case IDM_SHADOW:
-              case IDM_SHADOW2:
-              case IDM_JAVAEXE:
+              case IDM_SHADOW2:
+              case IDM_JAVAEXE:
               case IDM_OBJECT:
               case IDM_VIEW:
@@ -2847 +2862 @@
                   DosBeep(250,100);
                 driveserial[toupper(*pci->pszFileName) - 'A'] = -1;
-                UnFlesh(hwnd, pci);
+                AddFleshWorkRequest(hwnd, pci, eUnFlesh);
                 PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
               }
@@ -2855 +2870 @@
                     driveserial[toupper(*pci->pszFileName) - 'A'] !=
                     volser.serial)
-                  UnFlesh(hwnd, pci);
+                  AddFleshWorkRequest(hwnd, pci, eUnFlesh);
                 if (SHORT2FROMMP(mp1) != CN_COLLAPSETREE ||
                     (!volser.serial ||
                      driveserial[toupper(*pci->pszFileName) - 'A'] !=
                      volser.serial)) {
-                  if (SHORT2FROMMP(mp1) == CN_EXPANDTREE && Flesh(hwnd, pci) &&
+                  // 2015-08-07 SHL FIXME to wait for Flesh to finish before PostMsg
+                  if (SHORT2FROMMP(mp1) == CN_EXPANDTREE && AddFleshWorkRequest(hwnd, pci, eFlesh) &&
                       !dcd->suspendview && fTopDir ) {
                     PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
@@ -2870 +2886 @@
             }
             else if (SHORT2FROMMP(mp1) == CN_EXPANDTREE) {
-              if (Flesh(hwnd, pci) && !dcd->suspendview && fTopDir) {
+              if (AddFleshWorkRequest(hwnd, pci, eFlesh) && !dcd->suspendview && fTopDir) {
+                // 2015-08-07 SHL FIXME to wait for Flesh to finish before PostMsg
                 PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
                 //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
@@ -3275 +3292 @@
           else {
 
-            MRESULT mre;
-
-            mre = CnrDirectEdit(hwnd, msg, mp1, mp2);
+            MRESULT mre;
+
+            mre = CnrDirectEdit(hwnd, msg, mp1, mp2);
             if (mre != (MRESULT) - 1)
               return mre;
@@ -3530 +3547 @@
     WinSendMsg(hwnd, WM_SAVEAPPLICATION, MPVOID, MPVOID);
     if (LastDir == hwnd)
-        LastDir = (HWND) 0;
+        LastDir = (HWND) 0;
     DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
     if (dcd) {
@@ -3549 +3566 @@
                         0,
                         0,
-                        SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
+                        SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
       FreeList(dcd->lastselection);
       WinSetWindowPtr(hwnd, QWL_USER, NULL);
@@ -3821 +3838 @@
           Win_Error(hwndClient, hwndClient, pszSrcFile, __LINE__,
                     PCSZ_WINCREATEWINDOW);
-          PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
-          DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
-          free(dcd);
-          DosReleaseMutexSem(hmtxFiltering);
+          PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
+          DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
+          free(dcd);
+          DosReleaseMutexSem(hmtxFiltering);
           hwndFrame = (HWND) 0;
         }

trunk/dll/filldir.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2011 Steven H. Levine
+  Copyright (c) 2001, 2015 Steven H. Levine
 
   10 Jan 04 SHL ProcessDirectory: avoid most large drive failures
@@ -56 +56 @@
   24 Nov 08 GKY Replace 4 pass drive scan code with StubyScanThread multithread scan
   28 Nov 08 SHL FreeCnrItemData: optimize and always NULL pointers
-  28 Nov 08 SHL StubbyScanThread: add else lost in translation
-  30 Nov 08 SHL StubbyScanThread: restore else - we want all drives listed
+  28 Nov 08 SHL StubbyThread: add else lost in translation
+  30 Nov 08 SHL StubbyThread: restore else - we want all drives listed
   30 Nov 08 SHL FreeCnrItemData: report double free with Runtime_Error
   04 Dec 08 GKY Use event semaphore to prevent scan of "last" directory container prior to
@@ -98 +98 @@
                 responsiveness when closing containers with large numbers of items
   12 Jun 11 GKY Replaced SleepIfNeeded with IdleIfNeeded in the container loade loop
-  22 Oct 11 GKY Removing unneeded UnFlesh call from StubbyScanThread appears to significantly speed opening of FM/2
+  22 Oct 11 GKY Removing unneeded UnFlesh call from StubbyThread appears to significantly speed opening of FM/2
   02 Mar 14 GKY !didone for fFirstTime so the suggest code works again. Also clear out the
                 garbage that was appearing in the string.
@@ -111 +111 @@
   02 Aug 15 GKY Serialize local hard drive scanning to reduce drive thrashing continue to scan
                 all other drive types in separate threads.
-  02 Aug 15 GKY Remove unneed SubbyScan code and improve suppression of blank lines and
+  02 Aug 15 GKY Remove unneeded SubbyScan code and improve suppression of blank lines and
                 duplicate subdirectory name caused by running Stubby in worker threads.
+  04 Aug 15 SHL Comments
+  04 Aug 15 SHL Move StubbyThread to flesh.c
+  07 Aug 15 SHL Rework to use AddFleshWorkRequest rather than direct calls to Stubby/Flesh/Unflesh
 
 ***********************************************************************/
@@ -142 +145 @@
 #include "fortify.h"                    // 06 May 08 SHL
 #include "notebook.h"                   // INI file fields
-#include "flesh.h"                      // FleshEnv, Stubby
+#include "flesh.h"                      // AddFleshWorkRequest
 #include "update.h"                     // SelectDriveIcon
 #include "valid.h"                      // CheckDrive
@@ -152 +155 @@
 #include "i18nutil.h"                   // CommaFmtULL
 #include "wrappers.h"                   // xDosFindNext
-#include "init.h"                       // GetTidForWindow
-#include "common.h"                     // IncrThreadUsage
+#include "init.h"
+#include "common.h"
 #include "excputil.h"                   // xbeginthread
 #include "fm3dlg.h"                     // INFO_LABEL
@@ -163 +166 @@
 #endif
 
-VOID StubbyScanThread(VOID * arg);
-
 // Data definitions
 static PSZ pszSrcFile = __FILE__;
@@ -178 +179 @@
 PCSZ FM3Tools = "<FM3_Tools>";
 PCSZ WPProgram = "WPProgram";
-
-typedef struct {
-  PCNRITEM      pci;
-  HWND          hwndCnr;                // hwnd you want the message posted to
-}
-STUBBYSCAN;
 
 /**
@@ -240 +235 @@
 
   return apszAttrString[fileAttr];
-
-}
-
-VOID StubbyScanThread(VOID * arg)
-{
-  STUBBYSCAN *StubbyScan;
-  HAB thab;
-  HMQ hmq = (HMQ) 0;
-  static INT ProcessDirCount = 0;
-
-  DosError(FERR_DISABLEHARDERR);
-
-# ifdef FORTIFY
-  Fortify_EnterScope();
-#  endif
-
-  StubbyScan = (STUBBYSCAN *)arg;
-  if (StubbyScan && StubbyScan->pci && StubbyScan->pci->pszFileName && StubbyScan->hwndCnr) {
-    thab = WinInitialize(0);
-    if (thab) {
-      hmq = WinCreateMsgQueue(thab, 0);
-      if (hmq) {
-        IncrThreadUsage();
-        priority_normal();
-        if (WinIsWindow((HAB)0, StubbyScan->hwndCnr)) {
-          ULONG flags = driveflags[toupper(*StubbyScan->pci->pszFileName) - 'A'];
-
-          if ((fRScanLocal && flags & DRIVE_LOCALHD ) ||
-               (fRScanRemote && flags & DRIVE_REMOTE) ||
-               (fRScanVirtual && flags & DRIVE_VIRTUAL)) {
-            if (!(flags & ((fRScanNoWrite ? 0 : DRIVE_NOTWRITEABLE) ||
-                           (fRScanSlow ? 0 : DRIVE_SLOW)))) {
-              Flesh(StubbyScan->hwndCnr, StubbyScan->pci);
-            }
-            else {
-              Stubby(StubbyScan->hwndCnr, StubbyScan->pci);
-            }
-          }
-          else {
-            Stubby(StubbyScan->hwndCnr, StubbyScan->pci);
-          }
-          if (flags & DRIVE_LOCALHD)
-            DosReleaseMutexSem(hmtxScanningLocalHD);
-        }
-        WinDestroyMsgQueue(hmq);
-      }
-      DecrThreadUsage();
-      WinTerminate(thab);
-    }
-    free(StubbyScan);
-  } // if StubbyScan
-  ProcessDirCount++;
-  // DbgMsg(pszSrcFile, __LINE__, "ProcessDirCount %i FixedVolume %i", ProcessDirCount, FixedVolume);
-  if (ProcessDirCount >= FixedVolume) {
-    DosReleaseMutexSem(hmtxScanning);
-    DosPostEventSem(hevTreeCnrScanComplete);    
-    ProcessDirCount = 0;
-    FixedVolume = 0;
-  }
-# ifdef FORTIFY
-  Fortify_LeaveScope();
-#  endif
 
 }
@@ -660 +593 @@
 #   ifdef FORTIFY
     {
-      unsigned tid = GetTidForWindow(hwndCnr);
+      UINT tid = GetTidForWindow(hwndCnr);
       if (tid == 1)
         Fortify_ChangeScope(pci->pszFmtFileSize, -1);
@@ -741 +674 @@
   pci->pszFileName = xstrdup(pszFileName, pszSrcFile, __LINE__);
 
-  // 13 Jul 09 SHL fixme to know if fetch can be bypassed if pszFSType already filled
+  // 13 Jul 09 SHL FIXME to know if fetch can be bypassed if pszFSType already filled
   // If FSType not supplied, assume don't need EAs either
   if (pfsa4->cbList > 4L && dcd &&
@@ -814 +747 @@
     pci->pszDisplayName = p;
 
-  // 13 Jul 09 SHL fixme to know why pszFSType check needed
+  // 13 Jul 09 SHL FIXME to know why pszFSType check needed
   // comma format the file size for large file support
   if (!pszFSType || *pszFSType == 0) {
@@ -1015 +948 @@
             }
             else {
-              // 04 Jan 08 SHL fixme like comp.c to handle less than ulSelCnt records
+              // 04 Jan 08 SHL FIXME like comp.c to handle less than ulSelCnt records
               pci = pciFirst;
               ullTotalBytes = 0;
@@ -1069 +1002 @@
                                  pszSrcFile, __LINE__);
             if (paffbTemp) {
-              // 13 Aug 07 SHL fixme to optimize copy
+              // 13 Aug 07 SHL FIXME to optimize copy
               paffbTotal = paffbTemp;
               ullTotalBytes = 0;        // 15 Sep 09 SHL
@@ -1135 +1068 @@
             }
             else {
-              // 04 Jan 08 SHL fixme like comp.c to handle less than ulSelCnt records
+              // 04 Jan 08 SHL FIXME like comp.c to handle less than ulSelCnt records
               if (hwndStatus && dcd &&
                   dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent)) {
@@ -1232 +1165 @@
     }
 
-    // 13 Oct 09 SHL fixme to be saymsg if ERROR_NOT_READY and first try on volume
+    // 13 Oct 09 SHL FIXME to be saymsg if ERROR_NOT_READY and first try on volume
     if (rc && rc != ERROR_NO_MORE_FILES && (fDontSuggestAgain || !fInitialDriveScan)) {
       Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
@@ -1257 +1190 @@
       }
       if ((pci->attrFile & FILE_DIRECTORY))
-        Stubby(hwndCnr, pci);
+        AddFleshWorkRequest(hwndCnr, pci, eStubby);
       pci = WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pci),
                        MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
@@ -1289 +1222 @@
   DosPostEventSem(CompactSem);
 
-#if 0 // 2011-05-31 SHL fixme to be gone or to be configurable
+#if 0 // 2011-05-31 SHL FIXME to be gone or to be configurable
   {
     int state = _heapchk();
@@ -1328 +1261 @@
   static ULONG ulLastDriveMap;
 
+  DbgMsg(pszSrcFile, __LINE__, "FillTreeCnr hwndCnr %x hwndParent %x", hwndCnr, hwndParent);     // 2015-08-03 SHL FIXME debug
+
   fDummy = TRUE;
   *szSuggest = 0;
@@ -1381 +1316 @@
   if (!pciFirst) {
     Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, GetPString(IDS_CMALLOCRECERRTEXT));
-    // 04 Jan 08 SHL fixme not just up and die
+    // 04 Jan 08 SHL FIXME not just up and die
     exit(0);
   }
 
-  // 04 Jan 08 SHL fixme like comp.c to handle less than ulSelCnt records
+  // 04 Jan 08 SHL FIXME like comp.c to handle less than ulSelCnt records
   pci = pciFirst;
   for (iDrvNum = 0; iDrvNum < 26; iDrvNum++) {
@@ -1407 +1342 @@
 
       if (iDrvNum > 1) {
-        // Hard drive (2..N)
+        // Hard drive, 2..N, C:..Z:
         if (~driveflags[iDrvNum] & DRIVE_NOPRESCAN) {
           *szFSType = 0;
@@ -1503 +1438 @@
           driveserial[iDrvNum] = -1;
         }
-        }
+      } // if not diskette
       else {
         // diskette drive (A or B)
@@ -1547 +1482 @@
   ulLastDriveMap = ulDriveMap;          // 13 Oct 09 SHL
 
-  // insert the drives
+  // insert the drives in container
   if (numtoinsert && pciFirst) {
     RECORDINSERT ri;
@@ -1662 +1597 @@
     }
   } // if show env
-  {
-    STUBBYSCAN *stubbyScan;
-
-    pci = (PCNRITEM) WinSendMsg(hwndCnr,
-                                CM_QUERYRECORD,
-                                MPVOID,
-                                MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
-    while (pci && (INT)pci != -1) {
-      stubbyScan = xmallocz(sizeof(STUBBYSCAN), pszSrcFile, __LINE__);
-      if (!stubbyScan)
-        break;
-      stubbyScan->pci = pci;
-      stubbyScan->hwndCnr = hwndCnr;
-      pciNext = (PCNRITEM) WinSendMsg(hwndCnr,
-                                      CM_QUERYRECORD,
-                                      MPFROMP(pci),
-                                      MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
-      if (~pci->flags & RECFLAGS_ENV) {
-        iDrvNum = toupper(*pci->pszFileName) - 'A';     // 0..25
-        if (iDrvNum == ulCurDriveNum || iDrvNum >= 2) {
-          // Hard drive or current drive
-          ULONG flags = driveflags[iDrvNum];    // Speed up
-          if (~flags & DRIVE_INVALID &&
-              ~flags & DRIVE_NOPRESCAN && (!fNoRemovableScan || ~flags & DRIVE_REMOVABLE)) {
-            // DbgMsg(pszSrcFile, __LINE__, "Begin Thread %s", pci->pszFileName);
-            if (flags & DRIVE_LOCALHD) {
-              DosRequestMutexSem(hmtxScanningLocalHD, SEM_INDEFINITE_WAIT );
-              if (xbeginthread(StubbyScanThread,
-                               65536,
-                               stubbyScan,
-                               pszSrcFile, __LINE__) == -1) {
-                DosReleaseMutexSem(hmtxScanningLocalHD);
-                xfree(stubbyScan, pszSrcFile, __LINE__);
-              }
-            }
-            else {
-              if (xbeginthread(StubbyScanThread,
-                               65536,
-                               stubbyScan,
-                               pszSrcFile, __LINE__) == -1)
-                xfree(stubbyScan, pszSrcFile, __LINE__);
-            }
-
-          } // if drive needs to be scanned
-        }
-        else {
-          // Diskette and not current drive
-          WinSendMsg(hwndCnr,
-                     CM_INVALIDATERECORD,
-                     MPFROMP(&pci),
-                     MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
-        }
-      }
-      pci = pciNext;
-    } // while
-  }
-
-  // 13 Oct 09 SHL
+
+  // Run Stubby on each hard drive to ensure expand/collapse buttons correct
+  pci = (PCNRITEM) WinSendMsg(hwndCnr,
+                              CM_QUERYRECORD,
+                              MPVOID,
+                              MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+  while (pci && (INT)pci != -1) {
+    pciNext = (PCNRITEM) WinSendMsg(hwndCnr,
+                                    CM_QUERYRECORD,
+                                    MPFROMP(pci),
+                                    MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
+    if (~pci->flags & RECFLAGS_ENV) {
+      iDrvNum = toupper(*pci->pszFileName) - 'A';       // 0..25
+      if (iDrvNum == ulCurDriveNum || iDrvNum >= 2) {
+        // Hard drive or current drive
+        ULONG flags = driveflags[iDrvNum];      // Speed up
+        if (~flags & DRIVE_INVALID &&
+            ~flags & DRIVE_NOPRESCAN &&
+            (!fNoRemovableScan || ~flags & DRIVE_REMOVABLE)) {
+          AddFleshWorkRequest(hwndCnr, pci, eFillDir);
+        } // if drive needs to be scanned
+      }
+      else {
+        // Diskette or not current drive
+        WinSendMsg(hwndCnr,
+                   CM_INVALIDATERECORD,
+                   MPFROMP(&pci),
+                   MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
+      }
+    }
+    pci = pciNext;
+  } // while pci
+
+  // Deselect all
   if (hwndDrivelist)
     WinSendMsg(hwndDrivelist, LM_SELECTITEM, MPFROM2SHORT(0, 0), MPFROMLONG(TRUE));
 
+  // Fill in environment CNRITEMs, if any
   pci = (PCNRITEM) WinSendMsg(hwndCnr,
                               CM_QUERYRECORD,
@@ -1740 +1652 @@
       while (pci && (INT)pci != -1) {
         if (pci->flags & RECFLAGS_ENV)
-          FleshEnv(hwndCnr, pci);
+          AddFleshWorkRequest(hwndCnr, pci, eFleshEnv);
         pci = (PCNRITEM) WinSendMsg(hwndCnr,
                                     CM_QUERYRECORD,
@@ -1756 +1668 @@
   if (hwndMain)
     PostMsg(hwndMain, UM_BUILDDRIVEBAR, MPVOID, MPVOID);
-  DosSleep(16);                         // 05 Aug 07 GKY 33
+
+  DosSleep(16);
   fDummy = FALSE;
+
   fInitialDriveScan = FALSE;
+  DbgMsg(pszSrcFile, __LINE__, "fInitialDriveScan now FALSE");   // 2015-08-03 SHL FIXME debug
   DosPostEventSem(CompactSem);
 
@@ -1777 +1692 @@
       }
     }
-    //DbgMsg(pszSrcFile, __LINE__, "szSuggest %x info %x", *szSuggest, info);
+    // DbgMsg(pszSrcFile, __LINE__, "szSuggest %x info %x", *szSuggest, info);
     if (*szSuggest) {
       APIRET rc;
@@ -1837 +1752 @@
   } // if !fDontSuggestAgain
   didonce = TRUE;
+
+  DbgMsg(pszSrcFile, __LINE__, "FillTreeCnr finished");  // 2015-08-03 SHL FIXME debug
+
 } // FillTreeCnr
 
@@ -2098 +2016 @@
 
 #pragma alloc_text(FILLDIR,FillInRecordFromFFB,FillInRecordFromFSA,IDFile)
-#pragma alloc_text(FILLDIR1,ProcessDirectory,FillDirCnr,FillTreeCnr,FileAttrToString,StubbyScanThread)
+#pragma alloc_text(FILLDIR1,ProcessDirectory,FillDirCnr,FillTreeCnr,FileAttrToString)
 #pragma alloc_text(EMPTYCNR,EmptyCnr,FreeCnrItemData,FreeCnrItem,FreeCnrItemList,RemoveCnrItems)
 

trunk/dll/flesh.c

@@ -4 +4 @@
   $Id$
 
-  Flesh
+  Drive tree container management
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2005-2012 Steven H. Levine
+  Copyright (c) 2005-2015 Steven H. Levine
 
   24 May 05 SHL Rework Win_Error usage
@@ -26 +26 @@
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
   13 Dec 09 GKY Fixed separate paramenters. Please note that appname should be used in
-                profile calls for user settings that work and are setable in more than one
-                miniapp; FM3Str should be used for setting only relavent to FM/2 or that
-                aren't user settable; realappname should be used for setting applicable to
-                one or more miniapp but not to FM/2
+                profile calls for user settings that work and are setable in more than one
+                miniapp; FM3Str should be used for setting only relavent to FM/2 or that
+                aren't user settable; realappname should be used for setting applicable to
+                one or more miniapp but not to FM/2
   17 Jan 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
   04 Aug 12 GKY Fix trap on close during drive scan
   02 Aug 15 GKY Fix trap in Stubby
+  03 Aug 15 SHL Document Stubby a bit better
+  07 Aug 15 SHL Rework to use AddFleshWorkRequest rather than direct calls to Stubby/Flesh/Unflesh
 
 ***********************************************************************/
@@ -58 +60 @@
 #include "flesh.h"
 #include "valid.h"                      // IsValidDir
-#include "misc.h"                       // LoadLibPath
+#include "misc.h"                       // LoadLibPath GetTidForThread
 #include "findrec.h"                    // FindCnrRecord
 #include "notify.h"                     // Notify
 #include "wrappers.h"                   // xfree
 #include "excputil.h"                   // xbeginthread
+#include "listutil.h"                   // List...
+#include "common.h"                     // IncrThreadUsage DecrThreadUsage
+
 #if 0
 #define  __PMPRINTF__
@@ -73 +78 @@
 static PSZ pszSrcFile = __FILE__;
 
+
+static INT tidFleshWorkListThread = -1; // 2015-08-08 SHL
+
+static CHAR chFleshFocusDrive;  // 2015-08-16 SHL A..Z or 0
+
+
+BOOL fNoFleshDbgMsg;    // 2015-08-09 SHL FIXME to be gone
+
 #pragma data_seg(GLOBAL1)
 ULONG NoBrokenNotify;
 BOOL fFilesInTree;
+
+BOOL Flesh(HWND hwndCnr, PCNRITEM pciParent);
+
+BOOL Stubby(HWND hwndCnr, PCNRITEM pciParent);
+BOOL FleshEnv(HWND hwndCnr, PCNRITEM pciParent);
+BOOL UnFlesh(HWND hwndCnr, PCNRITEM pciParent);
+
+/**
+ * Insert CNRITEMs for members of PATH-like environment variable
+ * @param hwndCnr is the container to be populated
+ * @param pciParent is CNRITEM defining PATH-like environment variable
+ * @return TRUE if OK, FALSE is error detected
+ */
 
 BOOL FleshEnv(HWND hwndCnr, PCNRITEM pciParent)
@@ -86 +112 @@
   if (!pciParent || (INT) pciParent == -1 || !hwndCnr)
     return FALSE;
+
   dcd = (DIRCNRDATA *) WinQueryWindowPtr(hwndCnr, QWL_USER);
   if (!dcd)
@@ -187 +214 @@
 }
 
+/**
+ * Insert CNRITEMs for all children of pciParent
+ * @param hwnCnr is container to receive CNRITEMs
+ * @param pciParent is CNRITEM to have children inserted
+ * @return TRUE if OK, FALSE is error detected
+ */
+
 BOOL Flesh(HWND hwndCnr, PCNRITEM pciParent)
 {
   PCNRITEM pciL;
   DIRCNRDATA *dcd;
-  BOOL includefiles = fFilesInTree;
-
-  if (!pciParent || (INT) pciParent == -1 || !hwndCnr)
+  BOOL includefiles;
+
+  if (!pciParent || (INT)pciParent == -1 || !hwndCnr)
     return FALSE;
-  pciL = (PCNRITEM) WinSendMsg(hwndCnr,
-                               CM_QUERYRECORD,
-                               MPFROMP(pciParent),
-                               MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
-  if (!pciL || !*pciL->pszFileName) {
-    if (pciL && (INT) pciL != -1)
+
+  // 2015-08-13 SHL FIXME to optimize
+  if (fAmClosing) {
+    // Can jiggle - see MainWndProc WM_CLOSE
+    DosSleep(100);
+    if (fAmClosing)
+      return FALSE;                     // time to die
+  }
+
+  // 2015-08-03 SHL FIXME debug
+  if (!fNoFleshDbgMsg) {
+    DbgMsg(pszSrcFile, __LINE__, "Flesh %s pciParent %p pszFileName %p",
+           pciParent && (INT)pciParent != -1 && pciParent->pszFileName ?
+             pciParent->pszFileName : "(null)",
+           pciParent,
+           pciParent && (INT)pciParent != -1 ? pciParent->pszFileName : (PVOID)-1); // 2015-08-03 SHL FIXME debug
+  }
+
+  pciL = (PCNRITEM)WinSendMsg(hwndCnr,
+                              CM_QUERYRECORD,
+                              MPFROMP(pciParent),
+                              MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
+
+  // 2015-08-06 SHL allow pciL -1
+  if (!pciL || (INT)pciL == -1 || !*pciL->pszFileName) {
+
+    // No children or filename null
+    // 2015-08-06 SHL FIXME to know how this can happen
+    if (pciL && (INT)pciL != -1) {
+      // 2015-08-06 SHL FIXME to loop and timeout if Stubby threads working
+      if (!fNoFleshDbgMsg)
+        DbgMsg(pszSrcFile, __LINE__, "Flesh RemoveCnrItems() pciL %p", pciL); // 2015-08-04 SHL FIXME debug
       RemoveCnrItems(hwndCnr, pciL, 1, CMA_FREE);
+    }
+
     dcd = INSTDATA(hwndCnr);
     if (dcd && dcd->size != sizeof(DIRCNRDATA))
       dcd = NULL;
-    if (driveflags[toupper(*pciParent->pszFileName) - 'A'] & DRIVE_INCLUDEFILES)
-      includefiles = TRUE;
+
+    // DbgMsg(pszSrcFile, __LINE__, "Flesh %s dcd %p called by %s#%u", pciParent->pszFileName, dcd, pszSrcFile_, uSrcLineNo_); // 2015-08-03 SHL FIXME debug
+
+    // 2015-08-06 SHL FIXME to not trap here
+    includefiles =
+      driveflags[toupper(*pciParent->pszFileName) - 'A'] & DRIVE_INCLUDEFILES ?
+        TRUE : fFilesInTree;
+
     ProcessDirectory(hwndCnr,
-                     pciParent,
-                     pciParent->pszFileName,
-                     includefiles,      // filestoo
-                     TRUE,              // recurse
-                     TRUE,              // partial
-                     NULL,              // stop flag
-                     dcd,
-                     NULL,              // total files
-                     NULL);             // total bytes
+                     pciParent,
+                     pciParent->pszFileName,
+                     includefiles,      // filestoo
+                     TRUE,              // recurse
+                     TRUE,              // partial
+                     NULL,              // stop flag
+                     dcd,
+                     NULL,              // total files
+                     NULL);             // total bytes
     if (pciParent && pciParent->pszFileName && !(driveflags[toupper(*pciParent->pszFileName) - 'A'] & DRIVE_RSCANNED))
       driveflags[toupper(*pciParent->pszFileName) - 'A'] |= DRIVE_RSCANNED;
     return TRUE;
   }
+
   return FALSE;
 }
 
+// 2015-08-06 SHL FIXME to be VOID
+
 BOOL UnFlesh(HWND hwndCnr, PCNRITEM pciParent)
 {
-  BOOL ret = FALSE;
+  BOOL removed = FALSE;
   PCNRITEM pciL;
 
   if (!pciParent || !hwndCnr)
     return FALSE;
+
+  if (!fNoFleshDbgMsg)
+    DbgMsg(pszSrcFile, __LINE__, "UnFlesh pciParent %p pszFileName %s", pciParent, pciParent->pszFileName ? pciParent->pszFileName : "(null)"); // 2015-08-03 SHL FIXME debug
+
   for (;;) {
     pciL = (PCNRITEM) WinSendMsg(hwndCnr,
@@ -236 +311 @@
                                  MPFROMP(pciParent),
                                  MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
-    if (pciL && (INT) pciL != -1) {
-      ret = TRUE;
-      RemoveCnrItems(hwndCnr, pciL, 1, CMA_FREE);
-    }
-    else
-      break;
-  }
-  if (ret) {
+    if (!pciL || (INT)pciL == -1)
+      break;                    // Done
+
+    if (!fNoFleshDbgMsg)
+      DbgMsg(pszSrcFile, __LINE__, "UnFlesh RemoveCnrItems() pciL %p %s", pciL, pciL->pszFileName ? pciL->pszFileName : "(null)"); // 2015-08-03 SHL FIXME debug
+    RemoveCnrItems(hwndCnr, pciL, 1, CMA_FREE);
+    removed = TRUE;
+  } // for
+
+  if (removed) {
     WinSendMsg(hwndCnr,
                CM_INVALIDATERECORD,
@@ -249 +326 @@
                MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
   }
-  return ret;
+  return removed;
 }
 
@@ -255 +332 @@
 
 /**
- * Fill in drive tree subtree
- * @return TRUE if OK, else FALSE
- * This only scans the root directory and adds the first level directories
- * Flesh does a recursive scan and should be used on fast hardware.
+ * Insert CNRITEM for 1st subdirectory [or file] of pciParent
+ * @param hwdCnr is container to be filled
+ * @param pciParent is CNRITEM to receive child record
+ * @return TRUE if record inserted, else FALSE
+ * Ensures that expand/collapse button displays if directory has children
+ * Secondary purpose is to detect broken LANs and inaccesible mapped drives
  */
 
@@ -273 +352 @@
   PFILEFINDBUF3 pffb;
   HDIR hDir = HDIR_CREATE;
-  ULONG nm, ulM = 1, total = 0, fl = MUST_HAVE_DIRECTORY;
+  ULONG nm, ulM = 1, total = 0, fl;
   CHAR str[CCHMAXPATH];
   register INT len;
   APIRET rc, prc;
-  BOOL isadir = FALSE, isremote = FALSE, includefiles = fFilesInTree;
+  BOOL isadir = FALSE, isremote, includefiles;
   ULONG ddepth = DDEPTH;
   ULONG drvNum;
@@ -286 +365 @@
       || pciParent->pszFileName == NullStr || !hwndCnr)
     return FALSE;
-  
+
+  if (!fNoFleshDbgMsg)
+    DbgMsg(pszSrcFile, __LINE__, "Stubby pciParent %p pszFileName %s", pciParent, pciParent->pszFileName); // 2015-08-03 SHL FIXME debug
+
+  // Build wildcard
   len = strlen(pciParent->pszFileName);
   memcpy(str, pciParent->pszFileName, len + 1);
@@ -302 +385 @@
       str[1] != ':' ||
       str[2] != '\\' || ((flags & DRIVE_IGNORE)))
-    return FALSE;                       // Not a directory
-
-  if (flags & DRIVE_INCLUDEFILES)
-    includefiles = TRUE;
-
-  if (flags & DRIVE_REMOTE)
-    isremote = TRUE;
+    return FALSE;                       // Not a directory or ignore requested
+
+  includefiles = flags & DRIVE_INCLUDEFILES ? TRUE : fFilesInTree;
+
+  isremote = flags & DRIVE_REMOTE ? TRUE : FALSE;
 
   if (isremote) {
@@ -323 +404 @@
 
   if (!fRemoteBug)
-    ulM = (ddepth <= DDEPTH) ? ddepth : 1;
+    ulM = ddepth <= DDEPTH ? ddepth : 1;
 
   nm = ulM;
 
   DosError(FERR_DISABLEHARDERR);
-  if (includefiles)
-    fl = FILE_DIRECTORY;
+
+  fl = includefiles ? FILE_DIRECTORY : MUST_HAVE_DIRECTORY;
+
   rc = DosFindFirst(str,
                     &hDir,
@@ -337 +419 @@
                     &ffb, ulM * sizeof(FILEFINDBUF3), &nm, FIL_STANDARD);
   if (ulM == 1 && !rc) {
+    // Loop looking for 1st directory (or file)
     do {
       pffb = &ffb[0];
       if (!includefiles && !(pffb->attrFile & FILE_DIRECTORY) && !brokenlan) {
+        // Find returned file when only directories requested
         brokenlan = TRUE;
         ddepth = (ULONG) - 1;
@@ -364 +448 @@
         }
       }
+
       if (*pffb->achName &&
           (includefiles || (pffb->attrFile & FILE_DIRECTORY)) &&
-          // Skip . and ..
           (pffb->achName[0] != '.' ||
            (pffb->achName[1] &&
             (pffb->achName[1] != '.' || pffb->achName[2])))) {
+        // Got directory other than . or .. (or a file)
         DosFindClose(hDir);
         isadir = TRUE;
@@ -376 +461 @@
       nm = 1;
       DosError(FERR_DISABLEHARDERR);
-    }
-    while (++total < ddepth && !(rc = (DosFindNext(hDir,
-                                                   &ffb,
-                                                   sizeof(FILEFINDBUF3),
-                                                   &nm))));
-      DosFindClose(hDir);
-    // If drive B:
+    } while (++total < ddepth && !(rc = (DosFindNext(hDir,
+                                                     &ffb,
+                                                     sizeof(FILEFINDBUF3),
+                                                     &nm))));
+    DosFindClose(hDir);
+
     if (toupper(*pciParent->pszFileName) > 'B' &&
         (*(pciParent->pszFileName + 1)) == ':' &&
         (*(pciParent->pszFileName + 2)) == '\\' && !(*(pciParent->pszFileName + 3))) {
 
+      // Searching root of hard or remote drive and find reported error
       CHAR s[132];
       sprintf(s,
@@ -397 +482 @@
       Notify(s);
     }
-    goto None;
-  }
-  
+    goto None;                          // Done
+  }
+
   if (!rc) {
     DosFindClose(hDir);
@@ -407 +492 @@
         pffb = (PFILEFINDBUF3) fb;
         if (!includefiles && !(pffb->attrFile & FILE_DIRECTORY)) {
+          // Got file(s), but did not ask for files
           if (!isbroken) {
             isbroken = TRUE;
@@ -432 +518 @@
                                   &NoBrokenNotify, sizeof(ULONG));
             }
-          }
-        }
+          } // if !broken
+        } // if !directory
+
         if (*pffb->achName &&
             (includefiles || (pffb->attrFile & FILE_DIRECTORY)) &&
-            // Skip . and ..
-            ((pffb->achName[0] && pffb->achName[0] != '.') || (pffb->achName[1]
-                                         && (pffb->achName[1] != '.'
-                                             || pffb->achName[2])))) {
+            ((pffb->achName[0] && pffb->achName[0] != '.') ||
+             (pffb->achName[1] &&
+              (pffb->achName[1] != '.' || pffb->achName[2]))))
+        {
+          // Got directory other than . or .. (or a file)
           isadir = TRUE;
           break;
@@ -450 +538 @@
       if (isadir) {
 
+        // Insert CNRITEM for selected directory (or file)
         PCNRITEM pci;
 
@@ -471 +560 @@
             ri.zOrder = (ULONG) CMA_TOP;
             ri.cRecordsInsert = 1;
-            ri.fInvalidateRecord = TRUE;
-            //DbgMsg(pszSrcFile, __LINE__, "Stubby %p CM_INSERTRECORD \"%s\" %.255s", hwndCnr, pci->pszFileName, pffb->achName); // 18 Dec 08 SHL fixme debug
+            ri.fInvalidateRecord = TRUE;
+            // DbgMsg(pszSrcFile, __LINE__, "Stubby CM_INSERTRECORD %p \"%s\" %.255s", pci, pci->pszFileName, pffb->achName); // 2015-08-03 SHL FIXME debug
             if (!WinSendMsg(hwndCnr,
                             CM_INSERTRECORD, MPFROMP(pci), MPFROMP(&ri))) {
+              // Assume busy and try again
               DosSleep(50); //05 Aug 07 GKY 100
-              WinSetFocus(HWND_DESKTOP, hwndCnr);
-              if (WinIsWindow((HAB)0, hwndCnr)) {
-                //DbgMsg(pszSrcFile, __LINE__, "Stubby %p CM_INSERTRECORD %s", hwndCnr, pci->pszFileName); // 18 Dec 08 SHL fixme debug
+              WinSetFocus(HWND_DESKTOP, hwndCnr);
+              if (WinIsWindow((HAB)0, hwndCnr)) {
+                if (!fNoFleshDbgMsg)
+                  DbgMsg(pszSrcFile, __LINE__, "Stubby CM_INSERTRECORD pci %p pszFileName %s", pci, pci->pszFileName); // 2015-08-03 SHL FIXME debug
                 if (!WinSendMsg(hwndCnr,
                                 CM_INSERTRECORD, MPFROMP(pci), MPFROMP(&ri))) {
@@ -490 +581 @@
             }
             else
-              ok = TRUE;
-            }
+              ok = TRUE;
           }
         }
+      } // if isadir
       else if (toupper(*str) > 'B' && str[1] == ':' && str[2] == '\\' &&
                !str[3]) {
 
+        // Is root and no subdirectories
         CHAR s[162];
-
         sprintf(s,
                 GetPString(IDS_NOSUBDIRS2TEXT),
                 nm,
                 toupper(*pciParent->pszFileName),
-                (isremote) ? GetPString(IDS_NOSUBDIRS3TEXT) : NullStr);
+                isremote ? GetPString(IDS_NOSUBDIRS3TEXT) : NullStr);
         Notify(s);
       }
@@ -509 +600 @@
   }
   else if (toupper(*str) > 'B' && rc != ERROR_NO_MORE_FILES) {
+    // Find for remote or hard drive failed with error
     CHAR s[CCHMAXPATH + 80];
     sprintf(s, GetPString(IDS_SEARCHERRORTEXT), rc, str);
@@ -518 +610 @@
   DosError(FERR_DISABLEHARDERR);
   return ok;
-}
-
-#pragma alloc_text(FLESH,Flesh,FleshEnv,UnFlesh,Stubby)
+} // Stubby
+
+// Stubby/Flesh/Unflesh work list item
+
+typedef struct {
+  LIST2 list;
+  HWND hwndCnr;
+  PCNRITEM pci;
+  FLESHWORKACTION action;
+} FLESHWORKITEM;
+typedef FLESHWORKITEM *PFLESHWORKITEM;
+
+// Stubby/Flesh/Unflesh work list
+LIST2 FleshWorkList;
+
+HMTX hmtxFleshWork;
+HEV  hevFleshWorkListChanged;
+
+/**
+ * Check pci matches
+ */
+
+BOOL WorkListItemMatches(PLIST2 item, PVOID data)
+{
+  return ((PFLESHWORKITEM)data)->pci == ((PFLESHWORKITEM)item)->pci;
+}
+
+/**
+ * Delete stale items from flesh queue
+ */
+
+VOID DeleteStaleFleshWorkListItems(PCNRITEM pci)
+{
+  FLESHWORKITEM match;
+  PLIST2 item;
+
+  match.pci = pci;
+
+  for (;;) {
+    item = List2Search(&FleshWorkList, WorkListItemMatches, &match);
+    if (!item)
+      break;
+    DbgMsg(pszSrcFile, __LINE__, "DeleteStaleFleshWorkListItems deleting %p %s", pci, pci->pszFileName ? pci->pszFileName : "(null)"); // 2015-08-03 SHL FIXME debug
+    List2Delete(&FleshWorkList, item);
+    xfree(item, pszSrcFile, __LINE__);
+  }
+}
+
+/**
+ * Add item to flesh work list
+ * eUnFlesh requests get special handling
+ * eFlesh etc. items for the same CNRITEM are considered stale and are
+ * deleted because eUnFlesh will free the CNRITEM associated with the item
+ * before the work list item is processed
+ */
+
+#if 0 // 2015-08-03 SHL FIXME debug
+BOOL AddFleshWorkRequest(HWND hwndCnr, PCNRITEM pci, FLESHWORKACTION action)
+#else
+BOOL AddFleshWorkRequestDbg(HWND hwndCnr, PCNRITEM pci, FLESHWORKACTION action, PCSZ pszSrcFile_, UINT uSrcLineNo)
+#endif
+{
+  APIRET rc;
+
+  PFLESHWORKITEM item = xmallocz(sizeof(FLESHWORKITEM), pszSrcFile, __LINE__);
+  item->hwndCnr = hwndCnr;
+  item->pci = pci;
+  item->action= action;
+
+  if (fAmClosing) {
+    // Can jiggle - see MainWndProc WM_CLOSE
+    DosSleep(100);
+    if (fAmClosing)
+      return FALSE;
+  }
+
+  // 2015-08-03 SHL FIXME debug
+  {
+#if 0 // 2015-08-13 SHL FIXME to be gone
+    static PSZ itemNames[] = {
+            "eStubby", "eFlesh", "eFleshEnv", "eUnFlesh"
+    };
+
+#   ifdef AddFleshWorkRequest
+    if (!pci || (INT)pci == -1) {
+      Runtime_Error(pszSrcFile, __LINE__, "AddFleshWorkRequest called with action %s pci %p by %s:%u",
+             itemNames[item->action],
+             pci,
+             pszSrcFile_, uSrcLineNo); // 2015-08-03 SHL FIXME debug
+    }
+    else if (!pci->pszFileName) {
+      Runtime_Error(pszSrcFile, __LINE__, "AddFleshWorkRequest call with action %s pci %p pszFileName (null) by %s:%u",
+             itemNames[item->action],
+             pci,
+             pszSrcFile_, uSrcLineNo); // 2015-08-03 SHL FIXME debug
+    }
+    else if (!fNoFleshDbgMsg) {
+      DbgMsg(pszSrcFile, __LINE__, "AddFleshWorkRequest called with action %s pci %p pszFileName %s by %s:%u",
+             itemNames[item->action],
+             pci,
+             pci->pszFileName,
+             pszSrcFile_, uSrcLineNo); // 2015-08-03 SHL FIXME debug
+    }
+#else
+    if (!pci || (INT)pci == -1) {
+      Runtime_Error(pszSrcFile, __LINE__, "AddFleshWorkRequest call with action %s pci %p",
+             itemNames[item->action],
+             pci); // 2015-08-03 SHL FIXME debug
+    }
+    else if (!pci->pszFileName) {
+      Runtime_Error(pszSrcFile, __LINE__, "AddFleshWorkRequest called with action %s pci %p pszFileName (null)",
+             itemNames[item->action],
+             pci); // 2015-08-03 SHL FIXME debug
+    }
+    else if (!fNoFleshDbgMsg) {
+      DbgMsg(pszSrcFile, __LINE__, "AddFleshWorkRequest action %s pci %p pszFileName %s",
+             itemNames[item->action],
+             pci,
+             pci->pszFileName); // 2015-08-03 SHL FIXME debug
+    }
+#endif
+#endif
+  }
+
+  rc = DosRequestMutexSem(hmtxFleshWork, SEM_INDEFINITE_WAIT);
+  if (rc)
+    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosRequestMutexSem");
+
+  // 2015-08-13 SHL FIXME to be done
+  // Delete stale requests
+  if (item->action == eUnFlesh) {
+    DeleteStaleFleshWorkListItems(pci);
+  }
+
+  List2Append(&FleshWorkList, (PLIST2)item);
+
+  rc = DosReleaseMutexSem(hmtxFleshWork);
+  if (rc)
+    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosReleaseMutexSem");
+
+  rc = DosPostEventSem(hevFleshWorkListChanged);
+  if (rc && rc != ERROR_ALREADY_POSTED)
+    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosPostEventSem");
+
+  return TRUE;
+}
+
+/**
+ * Return TRUE if work list empty
+ * Advisory only
+ */
+
+BOOL IsFleshWorkListEmpty()
+{
+  return FleshWorkList.next == NULL;
+}
+
+/**
+ * Wait until work list empty
+ * Advisory only
+ */
+
+#if 0 // 2015-08-03 SHL FIXME debug
+VOID WaitFleshWorkListEmpty()
+#else
+VOID WaitFleshWorkListEmptyDbg(PCSZ pszSrcFile_, UINT uSrcLineNo_)
+#endif
+{
+  INT tid = GetTidForThread();
+
+  if (tid == 1 || tid == tidFleshWorkListThread) {
+#   ifdef WaitFleshWorkListEmpty
+    Runtime_Error(pszSrcFile, __LINE__, "WaitFleshWorkListEmpty called with worklist %sempty by tid %u at %s:%u", IsFleshWorkListEmpty() ? "" : "not ", tid, pszSrcFile_, uSrcLineNo_);
+#   else
+    Runtime_Error(pszSrcFile, __LINE__, "WaitFleshWorkListEmpty called by tid %u", tid);
+#   endif
+    return;             // Avoid hang
+  }
+  else if (IsFleshWorkListEmpty()) {
+#   ifdef WaitFleshWorkListEmpty
+    DbgMsg(pszSrcFile, __LINE__, "WaitFleshWorkListEmpty called with worklist empty by tid %u at %s:%u", tid, pszSrcFile_, uSrcLineNo_);
+#   else
+    DbgMsg(pszSrcFile, __LINE__, "WaitFleshWorkListEmpty called with work list empty by tid %u", tid);
+#   endif
+  }
+
+  // Can not wait if call from thread 1 or FleshWorkListThread
+  while (!IsFleshWorkListEmpty()) {
+#   ifdef WaitFleshWorkListEmpty
+    if (!fNoFleshDbgMsg)
+      // DbgMsg(pszSrcFile, __LINE__, "WaitFleshWorkListEmpty called with work list not empty by %s:%u", pszSrcFile_, uSrcLineNo_); // 2015-08-07 SHL FIXME debug
+#   else
+    if (!fNoFleshDbgMsg)
+      // DbgMsg(pszSrcFile, __LINE__, "WaitFleshWorkListEmpty called with work list not empty"); // 2015-08-07 SHL FIXME debug
+#   endif
+    // 2015-08-13 SHL FIXME to optimize
+    if (fAmClosing) {
+      // Can jiggle - see MainWndProc WM_CLOSE
+      DosSleep(100);
+      if (fAmClosing)
+        return;
+    }
+    DosSleep(250);
+  }
+}
+
+/**
+ * Set focus drive to optimize work list processing
+ * @param chDriveLetter is upper case drive letter (A-Z)
+ */
+
+VOID SetFleshFocusDrive(CHAR chDriveLetter) {
+  chFleshFocusDrive = chDriveLetter;
+  DbgMsg(pszSrcFile, __LINE__, "SetFleshFocusDrive focus drive set to %c", chFleshFocusDrive); // 2015-08-03 SHL FIXME debug
+
+}
+
+/**
+ * Check pci pathname matches focus drive
+ * @param data is uppercase drive letter mapped to PVOID
+ * @return TRUE if drive letter matches
+ */
+
+BOOL MatchesFocusDrive(PLIST2 item, PVOID data)
+{
+  if (!((PFLESHWORKITEM)item)->pci->pszFileName) {
+    Runtime_Error(pszSrcFile, __LINE__, "MatchesFocusDrive called with pci %p pszFileName (null) by %s:%u", ((PFLESHWORKITEM)item)->pci);
+    return FALSE;
+  }
+  return ((PFLESHWORKITEM)item)->pci->pszFileName[0] == (CHAR)data;
+}
+
+/**
+ * Run Flesh, UnFlesh, FleshEnv, Stubby for directory for items in work list
+ */
+
+VOID FleshWorkThread(PVOID arg)
+{
+  HAB thab;
+  HMQ hmq = (HMQ)0;
+  APIRET rc;
+
+  // 2015-08-07 SHL FIXME to be gone
+  static INT ProcessDirCount = 0;
+
+  DosError(FERR_DISABLEHARDERR);
+
+# ifdef FORTIFY
+  Fortify_EnterScope();
+#  endif
+
+  thab = WinInitialize(0);
+  if (thab) {
+    hmq = WinCreateMsgQueue(thab, 0);
+    if (hmq) {
+      IncrThreadUsage();
+      priority_normal();
+
+      // 2015-08-07 SHL FIXME to know when to terminate
+      // process list entries forever
+      for (;;) {
+
+        PFLESHWORKITEM item;
+
+        // 2015-08-13 SHL FIXME to optimize
+        if (fAmClosing) {
+          // Can jiggle - see MainWndProc WM_CLOSE
+          DosSleep(100);
+          if (fAmClosing)
+            break;                      // time to die
+        }
+
+        // 2015-08-07 SHL FIXME to use SMPSafe...
+        rc = DosRequestMutexSem(hmtxFleshWork, SEM_INDEFINITE_WAIT);
+        if (rc)
+          Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosRequestMutexSem");
+
+        // 2015-08-14 SHL
+        // Get next work list item and remove from list
+        // If focus drive known, process items for focus drive first
+        if (chFleshFocusDrive) {
+          item = (PFLESHWORKITEM)List2Search(&FleshWorkList, MatchesFocusDrive, (PVOID)chFleshFocusDrive);
+          if (!item)
+            chFleshFocusDrive = 0;              // Revert to normal
+          else
+            List2Delete(&FleshWorkList, (PLIST2)item);
+        }
+        else
+          item = NULL;
+
+        if (!item)
+          item = (PFLESHWORKITEM)List2DeleteFirst(&FleshWorkList);
+
+        rc = DosReleaseMutexSem(hmtxFleshWork);
+        if (rc)
+          Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosReleaseMutexSem");
+
+        // 2015-08-07 SHL FIXME to have event sem
+        if (!item) {
+          ULONG ul;
+          if (!fNoFleshDbgMsg)
+            DbgMsg(pszSrcFile, __LINE__, "FleshWorkThread work list empty - waiting"); // 2015-08-03 SHL FIXME debug
+          rc = DosWaitEventSem(hevFleshWorkListChanged, SEM_INDEFINITE_WAIT);
+          if (rc)
+            Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosWaitEventSem");
+          rc = DosResetEventSem(hevFleshWorkListChanged, &ul);
+          if (rc)
+            Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosResetEventSem");
+          if (!fNoFleshDbgMsg)
+            DbgMsg(pszSrcFile, __LINE__, "FleshWorkThread work hev posted"); // 2015-08-03 SHL FIXME debug
+          continue;
+        }
+
+        if (WinIsWindow((HAB)0, item->hwndCnr)) {
+
+          ULONG flags;
+
+#if 0 // 2015-08-07 SHL FIXME debug
+          // 2015-08-03 SHL FIXME debug
+          {
+            static PSZ itemNames[] = {
+                    "eStubby", "eFlesh", "eFleshEnv", "eUnFlesh"
+            };
+
+            PCNRITEM pci = item->pci;
+            if (!fNoFleshDbgMsg) {
+              DbgMsg(pszSrcFile, __LINE__, "FleshWorkThread action %s pci %p pszFileName %s",
+                     itemNames[item->action],
+                     pci,
+                     pci && (INT)pci != -1 ?
+                       (pci->pszFileName ? pci->pszFileName : "(nullname)") :
+                       "(nullpci)"); // 2015-08-03 SHL FIXME debug
+            }
+          }
+#endif
+
+          switch (item->action) {
+          case eUnFlesh:
+            UnFlesh(item->hwndCnr, item->pci);
+            break;
+          case eFleshEnv:
+            FleshEnv(item->hwndCnr, item->pci);
+            break;
+          case eFillDir:
+          case eStubby:
+            // DbgMsg(pszSrcFile, __LINE__, "FleshWorkThread pci %p pszFileName %s", stubbyArgs->pci, stubbyArgs->pci->pszFileName); // 2015-08-03 SHL FIXME debug
+            flags = driveflags[toupper(*item->pci->pszFileName) - 'A'];
+
+#if 0 // 2015-08-07 SHL FIXME to be gone
+            if (flags & DRIVE_LOCALHD) {
+              // Serialize to prevent head thrashing
+              rc = DosRequestMutexSem(hmtxScanningLocalHD, SEM_INDEFINITE_WAIT);
+              if (rc)
+                Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosRequestMutexSem");
+            }
+#endif
+
+#if 1
+            if (item->action == eFillDir) {
+              // eFillDir maps to eFlesh or eStubby depending on fRScan.. settings
+              if (((fRScanLocal && flags & DRIVE_LOCALHD) ||
+                   (fRScanRemote && flags & DRIVE_REMOTE) ||
+                   (fRScanVirtual && flags & DRIVE_VIRTUAL))  &&
+                  (!(flags & ((fRScanNoWrite ? 0 : DRIVE_NOTWRITEABLE) |
+                              (fRScanSlow ? 0 : DRIVE_SLOW)))))
+              {
+                item->action = eFlesh;
+              }
+              else
+                item->action = eStubby;
+            }
+#else
+            wantFlesh = ((fRScanLocal && flags & DRIVE_LOCALHD ) ||
+                         (fRScanRemote && flags & DRIVE_REMOTE) ||
+                         (fRScanVirtual && flags & DRIVE_VIRTUAL))  &&
+                         // 2015-08-11 SHL typo - should not be local or
+                        (!(flags & ((fRScanNoWrite ? 0 : DRIVE_NOTWRITEABLE) ||
+                                    (fRScanSlow ? 0 : DRIVE_SLOW))));
+#endif
+            if (item->action == eStubby) {
+              Stubby(item->hwndCnr, item->pci);
+              break;
+            }
+            // Drop through to eFlesh
+
+
+#if 0 // 2015-08-07 SHL FIXME to be gone
+            if (flags & DRIVE_LOCALHD) {
+              rc = DosReleaseMutexSem(hmtxScanningLocalHD);
+              if (rc) {
+                Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+                          "DosReleaseMutexSem(hmtxScanningLocalHD)");
+              }
+            }
+#endif // 2015-08-07 SHL FIXME to be gone
+
+            // Drop through
+          case eFlesh:
+            if (Flesh(item->hwndCnr, item->pci)) {
+              // 2015-08-06 SHL FIXME to report?
+            }
+            break;
+          default:
+            Runtime_Error(pszSrcFile, __LINE__, "item %u unexpected", item->action);
+          } // switch
+
+
+        } // if window
+
+        xfree(item, pszSrcFile, __LINE__);
+
+      } // for
+
+      WinDestroyMsgQueue(hmq);
+    }
+    DecrThreadUsage();
+    WinTerminate(thab);
+  }
+
+  ProcessDirCount++;
+  // DbgMsg(pszSrcFile, __LINE__, "ProcessDirCount %i FixedVolume %i", ProcessDirCount, FixedVolume);
+  if (ProcessDirCount >= FixedVolume) {
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
+    rc = DosReleaseMutexSem(hmtxScanning);
+    if (rc)
+      Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosReleaseMutexSem");
+#endif // 2015-08-04 SHL FIXME to be gone
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
+    rc = DosPostEventSem(hevTreeCnrScanComplete);
+    if (rc && rc != ERROR_ALREADY_POSTED)
+      Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosPostEventSem");
+#endif // 2015-08-04 SHL FIXME to be gone
+
+    ProcessDirCount = 0;
+    FixedVolume = 0;
+  }
+
+# ifdef FORTIFY
+  Fortify_LeaveScope();
+#  endif
+
+}
+
+/**
+ * Allocate resources and start FleshWorkThread
+ * @return TRUE if OK
+ */
+
+BOOL StartFleshWorkThread()
+{
+  APIRET rc = DosCreateMutexSem(NULL, &hmtxFleshWork, 0L /* Not shared */, FALSE /* Not owned */);
+  if (rc) {
+    Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_DOSCREATEMUTEXSEM);
+    return FALSE;
+  }
+
+  rc = DosCreateEventSem(NULL, &hevFleshWorkListChanged, 0 /* Not shared */, FALSE /* Reset */);
+  if (rc) {
+    Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_DOSCREATEEVENTSEM);
+    return FALSE;
+  }
+
+  /* DbgMsg is time consuming
+     define FM2_NO_FLESH_DBGMSG to suppress
+     2015-08-09 SHL FIXME to be gone
+   */
+
+  fNoFleshDbgMsg = getenv("FM2_NO_FLESH_DBGMSG") != NULL;
+
+  tidFleshWorkListThread = xbeginthread(FleshWorkThread,
+                           65536,
+                           NULL,
+                           pszSrcFile, __LINE__);
+  return tidFleshWorkListThread != -1;
+
+}
+
+#pragma alloc_text(FLESH,Flesh,FleshEnv,UnFlesh,Stubby,FleshWorkThread,StartFleshWorkThread,AddFleshWorkRequest)

trunk/dll/flesh.h

@@ -4 +4 @@
   $Id$
 
-  <<<description here>>>
+  Drive tree container management
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2008 Steven H. Levine
+  Copyright (c) 2008, 2015 Steven H. Levine
 
-  Change log
+  07 Aug 15 SHL Rework to use AddFleshWorkRequest rather than direct calls to Stubby/Flesh/Unflesh
 
 ***********************************************************************/
@@ -16 +16 @@
 #define FLESH_H
 
-BOOL Flesh(HWND hwndCnr, PCNRITEM pciParent);
-BOOL FleshEnv(HWND hwndCnr, PCNRITEM pciParent);
-BOOL Stubby(HWND hwndCnr, PCNRITEM pciParent);
-BOOL UnFlesh(HWND hwndCnr, PCNRITEM pciParent);
+BOOL StartFleshWorkThread(VOID);
+
+typedef enum {eStubby, eFlesh, eFleshEnv, eUnFlesh, eFillDir} FLESHWORKACTION;
+
+BOOL IsFleshWorkListEmpty();
+
+VOID SetFleshFocusDrive(CHAR chDriveLetter);
+
+#if 0 // 2015-08-03 SHL FIXME debug
+VOID WaitFleshWorkListEmpty();
+#else
+#define WaitFleshWorkListEmpty() WaitFleshWorkListEmptyDbg(__FILE__, __LINE__)
+VOID WaitFleshWorkListEmptyDbg(PCSZ pszSrcFile, UINT uSrcLineNo);
+#endif
+
+#if 0 // 2015-08-03 SHL FIXME debug
+BOOL AddFleshWorkRequest(HWND hwndCnr, PCNRITEM pci, FLESHWORKACTION action);
+#else
+#define AddFleshWorkRequest(hwnCnr, pciParent, action) AddFleshWorkRequestDbg(hwnCnr, pciParent, action, __FILE__, __LINE__)
+BOOL AddFleshWorkRequestDbg(HWND hwndCnr, PCNRITEM pci, FLESHWORKACTION action, PCSZ pszSrcFile, UINT uSrcLineNo);
+#endif
 
 // Data declarations
@@ -25 +42 @@
 extern BOOL fFilesInTree;
 
+
 #endif // FLESH_H

trunk/dll/init.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2010 Steven H. Levine
+  Copyright (c) 2001, 2015 Steven H. Levine
 
   11 Jun 02 SHL Add CheckVersion
@@ -211 +211 @@
 #include "excputil.h"                   // xbeginthread
 #include "systemf.h"                    // runemf2
+
 #if 0
 #define  __PMPRINTF__
 #include "PMPRINTF.H"
 #endif
+
 extern int _CRT_init(void);
 extern void _CRT_term(void);
@@ -236 +238 @@
 HMTX hmtxFM2Delete;
 HMTX hmtxFM2Globals;
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
 HMTX hmtxScanning;
+#endif // 2015-08-04 SHL FIXME to be gone
+
+#if 0 // 2015-08-07 SHL FIXME to be gone
 HMTX hmtxScanningLocalHD;
-HMTX hmtxScanningLocal;
+#endif // 2015-08-07 SHL FIXME to be gone
+
 HMTX hmtxFiltering;
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
 HEV  hevTreeCnrScanComplete;
+#endif // 2015-08-04 SHL FIXME to be gone
+
 ULONG OS2ver[2];
 PFNWP PFNWPCnr;
@@ -249 +261 @@
 ULONG ulTimeFmt;
 ULONG ulDateFmt;
-ULONG ulScanPostCnt;
 BOOL fDontSuggestAgain;
 BOOL fInitialDriveScan;
@@ -712 +723 @@
   }
 
-    rc = DosExitList(EXLST_ADD, DeInitFM3DLL);
-    if (rc) {
-      Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-               "DosExitList");
-    }
-
-    rcq = DosQueryProcAddr(FM3ModHandle, 1, "ResVersion", &pfnResVersion);
-    if (!rcq)
-      ret = pfnResVersion(&RVMajor, &RVMinor);
+  rc = DosExitList(EXLST_ADD, DeInitFM3DLL);
+  if (rc) {
+    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+             "DosExitList");
+  }
+
+  rcq = DosQueryProcAddr(FM3ModHandle, 1, "ResVersion", &pfnResVersion);
+  if (!rcq)
+    ret = pfnResVersion(&RVMajor, &RVMinor);
   else {
     ret = 0;
@@ -739 +750 @@
     return FALSE;
   }
+
 #if 0
   PmPrintfDisplayInterfaceVersionInfo();
   PmPrintfQueueNameThisProcess(NULL);
 #endif
+
   if (!*profile)
     strcpy(profile, PCSZ_FM3DOTINI);
@@ -769 +782 @@
   }
 
-  //Save the FM2 save directory name. This is the location of the ini, dat files etc.
+  // Save the FM2 save directory name. This is the location of the ini, dat files etc.
   rc = save_dir2(temp);
   if (rc) {
@@ -885 +898 @@
   }
 
+  if (!StartFleshWorkThread())
+    return FALSE;
+
   // timer messages are sent from a separate thread -- start it
   if (!StartTimer()) {
@@ -1166 +1182 @@
                    sizeof(PVOID));
 
-  if (DosCreateMutexSem(NULL, &hmtxFM2Globals, 0L, FALSE))
+  rc = DosCreateMutexSem(NULL, &hmtxFM2Globals, 0L, FALSE);
+  if (rc) {
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               PCSZ_DOSCREATEMUTEXSEM);
+  }
+#if 0 // 2015-08-04 SHL FIXME to be gone
   if (DosCreateMutexSem(NULL, &hmtxScanning, 0L, TRUE))
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               PCSZ_DOSCREATEMUTEXSEM);
-  if (DosCreateMutexSem(NULL, &hmtxScanningLocalHD, 0L, FALSE))
+#endif // 2015-08-04 SHL FIXME to be gone
+#if 0 // 2015-08-07 SHL FIXME to be gone
+  rc = DosCreateMutexSem(NULL, &hmtxScanningLocalHD, 0L, FALSE);
+  if (rc) {
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               PCSZ_DOSCREATEMUTEXSEM);
-    if (DosCreateMutexSem(NULL, &hmtxScanningLocal, 0L, FALSE))
-    Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-              PCSZ_DOSCREATEMUTEXSEM);
-  if (DosCreateMutexSem(NULL, &hmtxFM2Delete, 0L, FALSE))
+  }
+#endif // 2015-08-07 SHL FIXME to be gone
+  rc = DosCreateMutexSem(NULL, &hmtxFM2Delete, 0L, FALSE);
+  if (rc) {
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               PCSZ_DOSCREATEMUTEXSEM);
-  if (DosCreateMutexSem(NULL, &hmtxFiltering, 0L, FALSE))
+  }
+  rc = DosCreateMutexSem(NULL, &hmtxFiltering, 0L, FALSE);
+  if (rc) {
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               PCSZ_DOSCREATEMUTEXSEM);
-  if (DosCreateEventSem(NULL, &hevTreeCnrScanComplete, 0L, TRUE))
+  }
+#if 0 // 2015-08-04 SHL FIXME to be gone
+  rc = DosCreateEventSem(NULL, &hevTreeCnrScanComplete, 0L, TRUE);
+  if (rc) {
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               PCSZ_DOSCREATEEVENTSEM);
+  }
+#endif // 2015-08-04 SHL FIXME to be gone
 
   /**
@@ -1653 +1682 @@
   PrfQueryProfileData(fmprof, FM3Str, "DontAskGzip", &fDontAskGzip, &size);
 
+  // 2015-08-11 SHL FIXME debug
+  DbgMsg(pszSrcFile, __LINE__, "ShowEnv %u SwitchTree %u SwitchTreeExpand %u SwitchTreeOnFocus %u CollapseFirst %u", fShowEnv, fSwitchTreeOnDirChg, fSwitchTreeExpand, fSwitchTreeOnFocus, fCollapseFirst);
+  DbgMsg(pszSrcFile, __LINE__, "RScanLocal %u RScanRemote %u RScanVirtual %u RScanSlow RScanNoWrite %u", fRScanLocal, fRScanRemote, fRScanVirtual, fRScanSlow, fRScanNoWrite);
+
   LoadDetailsSwitches(PCSZ_DIRCNR, &dsDirCnrDefault, FALSE);
 

trunk/dll/init.h

@@ -4 +4 @@
   $Id$
 
-  <<<description here>>>
+  Initialization
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2008-10 Steven H. Levine
+  Copyright (c) 2008, 2015 Steven H. Levine
 
   Change log
@@ -107 +107 @@
 extern ULONG ulTimeFmt;
 extern ULONG ulDateFmt;
-extern ULONG ulScanPostCnt;
 extern PCSZ FNT_HELVETICA;
 extern PCSZ FNT_6HELVETICA;
@@ -239 +238 @@
 extern HMTX hmtxFM2Globals;
 extern HMTX hmtxFM2Delete;
+
+#if 0 // 2015-08-07 SHL FIXME to be gone
 extern HMTX hmtxScanning;
+#endif // 2015-08-07 SHL FIXME to be gone
+
+#if 0 // 2015-08-07 SHL FIXME to be gone
 extern HMTX hmtxScanningLocalHD;
-extern HMTX hmtxScanningLocal;
+#endif // 2015-08-07 SHL FIXME to be gone
+
 extern HMTX hmtxFiltering;
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
 extern HEV  hevTreeCnrScanComplete;
+#endif // 2015-08-04 SHL FIXME to be gone
+
 #endif
 

trunk/dll/mainwnd.c

@@ -117 +117 @@
   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.
+                duplicate subdirectory name caused by running Stubby in worker threads.
   09 Aug 15 SHL Use RESTORE_STATE_...
+  13 Aug 15 SHL Sync with Flesh/Stubby mods
 
 ***********************************************************************/
@@ -239 +241 @@
 USHORT shiftstate;
 
+UINT cDirectoriesRestored;              // 2015-08-12 SHL Incremented by RestoreDirCnrState
+
 #pragma data_seg(GLOBAL2)
 HMODULE FM3ModHandle;
@@ -1820 +1824 @@
 MRESULT EXPENTRY DriveBackProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
+#if 0 // 2015-08-04 SHL FIXME to be gone
   APIRET rc;
+#endif // 2015-08-04 SHL FIXME to be gone
 
   static BOOL emphasized;
@@ -2095 +2101 @@
 
   case WM_COMMAND:
+#if 0 // 2015-08-04 SHL FIXME to be gone
     rc = DosWaitEventSem(hevTreeCnrScanComplete, SEM_INDEFINITE_WAIT);
     if (rc)
       Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosWaitEventSem");
+#endif // 2015-08-04 SHL FIXME to be gone
 
     switch(SHORT1FROMMP(mp1)) {
@@ -2136 +2144 @@
           HWND hwndActive = TopWindow(hwnd, (HWND) 0);
           if (hwndActive)
+            DbgMsg(pszSrcFile, __LINE__, "WinSendMsg UM_DRIVECMD %c", *dv); // 2015-08-04 SHL FIXME debug
             WinSendMsg(WinWindowFromID(hwndActive, FID_CLIENT),
                        UM_DRIVECMD, MPFROMP(dv), MPVOID);
@@ -3446 +3455 @@
   HWND hwndDir, hwndC, hwndPPSave = NULLHANDLE;
   SWP swp, swpO, swpN;
-  ULONG size, numsaves = 0;
+  ULONG size;
+  ULONG numsaves = 0;
   LONG x;
   double xtrans, ytrans;
@@ -3464 +3474 @@
 
   sprintf(szPrefix, "%s.", pszStateName);
+
+  DbgMsg(pszSrcFile, __LINE__, "RestoreDirCnrState %s", pszStateName);  // 2015-08-13 SHL FIXME debug
 
   // If restoring shutdown state bypass no-prescan drives
@@ -3533 +3545 @@
   size = sizeof(ULONG);
   if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &numsaves, &size)) {
+    // 2015-08-13 SHL TreeCnrWndProc UM_RESCAN has already requested a UM_RESCAN2 which
+    // will result in an extra UM_SHOWME
+    // RestoreDirCnrState can be called before pending UM_SHOWMEs complete - oh well
+    if (fSwitchTreeOnFocus && numsaves)
+      cDirectoriesRestored = 1;
+    else
+      cDirectoriesRestored = 0;
     if (fDeleteState)
       PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
@@ -3631 +3650 @@
                   }
                 }
+                // 2015-08-12 SHL Suppress drive tree updates if not last container to restore
+                if (fSwitchTreeOnFocus)
+                  cDirectoriesRestored++;       // 2015-08-12 SHL
+
                 if (!PostMsg(hwndCnr, UM_SETUP2, NULL, NULL))
                   WinSendMsg(hwndCnr, UM_SETUP2, NULL, NULL);
@@ -3660 +3683 @@
         }
       }
-    } // for
+    } // for numsaves
     if (hwndPPSave) {
       SavePresParams(hwndPPSave, PCSZ_DIRCNR);
       WinDestroyWindow(hwndPPSave);
     }
+    DbgMsg(pszSrcFile, __LINE__, "RestoreDirCnrState returning fRestored %u", fRestored);       // 2015-08-13 SHL FIXME debug
   }
+
   return fRestored;
 }
@@ -6533 +6558 @@
             }
             else if (SHORT1FROMMP(mp1) == MAIN_DRIVELIST) {
+              DbgMsg(pszSrcFile, __LINE__, "MainWndProc CBN_ENTER ShowTreeRec(\"%s\")", path); // 2015-08-04 SHL FIXME debug
               ShowTreeRec(WinWindowFromID(WinWindowFromID(hwndTree,
                                                           FID_CLIENT),
@@ -6663 +6689 @@
     }
     DosSleep(1);
-    DbgMsg(pszSrcFile, __LINE__, "MainWndProc WM_CLOSE returning");
+    DbgMsg(pszSrcFile, __LINE__, "MainWndProc WM_CLOSE returning with fAmClosing %u", fAmClosing); // 2015-08-16 SHL
 
     return 0;           // Suppress WinDefWindowProc WM_QUIT message generation
@@ -6693 +6719 @@
 
   case WM_DESTROY:
+    DbgMsg(pszSrcFile, __LINE__, "MainWndProc WM_DESTROY hwnd %p TID %u", hwnd, GetTidForThread());     // 2015-08-09 SHL FIXME debug
     hwndMain = (HWND)0;
     if (!PostMsg((HWND)0, WM_QUIT, MPVOID, MPVOID))
       WinSendMsg((HWND)0, WM_QUIT, MPVOID, MPVOID);
 #   ifdef FORTIFY
+    DbgMsg(pszSrcFile, __LINE__, "MainWndProc WM_DESTROY hwnd %p TID %u", hwnd, GetTidForThread());     // 2015-08-09 SHL FIXME debug
     free_commands();
     free_associations();

trunk/dll/mainwnd.h

@@ -4 +4 @@
   $Id$
 
-  <<description here>>
+  fm/2 main window
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2009 Steven H. Levine
+  Copyright (c) 2001, 2015 Steven H. Levine
 
   05 Sep 08 JBS Ticket 187: Refactor FM3DLL.H
@@ -14 +14 @@
   21 Jun 09 GKY Added drive letter to bitmap buttons in drive bar; Eliminate static drive
                 letter windows; Use button ID to identify drive letter for processing.
+  13 Aug 15 SHL Sync with Flesh/Stubby updates
 
 ***********************************************************************/
@@ -91 +92 @@
 extern PSZ pszFocusDir;
 
+extern UINT cDirectoriesRestored;               // 2015-08-12 SHL Incremented by RestoreDirCnrState
+
 #define STATE_NAME_MAX_BYTES 256
 

trunk/dll/mainwnd2.c

@@ -1265 +1265 @@
       break;
     case IDM_CONFIGMENU:
-      // 2014-05-17 SHL FIXME to use SetToggleChecks maybe
+      // 2014-05-17 SHL FIXME to use SetToggleChecks maybe
       WinCheckMenuItem((HWND) mp2, IDM_TOOLSUBMENU, fToolbar);
       WinCheckMenuItem((HWND) mp2, IDM_AUTOVIEW, fAutoView);
@@ -1272 +1272 @@
       break;
     case IDM_TOOLSUBMENU:
-      // 2014-05-17 SHL FIXME to use SetToggleChecks maybe
+      // 2014-05-17 SHL FIXME to use SetToggleChecks maybe
       WinCheckMenuItem((HWND) mp2, IDM_TOOLBAR, fToolbar);
       WinCheckMenuItem((HWND) mp2, IDM_TEXTTOOLS, fTextTools);
@@ -1278 +1278 @@
       break;
     case IDM_WINDOWSMENU:
-      // 2014-05-17 SHL FIXME to use SetToggleChecks maybe
+      // 2014-05-17 SHL FIXME to use SetToggleChecks maybe
       WinCheckMenuItem((HWND) mp2, IDM_VTREE, (hwndTree != (HWND) 0));
       WinCheckMenuItem((HWND) mp2, IDM_TILEBACKWARDS, fTileBackwards);
@@ -1404 +1404 @@
     CloseChildren(hwnd);
     PostMsg(hwnd, UM_CLOSE, MPVOID, MPVOID);
+    DbgMsg(pszSrcFile, __LINE__, "MainWndProc2 WM_CLOSE returning with fAmClosing %u", fAmClosing); // 2015-08-16 SHL
     DosSleep(1);
     return 0;                   // Suppress WinDefWindowProc WM_QUIT message generation

trunk/dll/makefile

@@ -3 +3 @@
 
 # Copyright (c) 1993-98 M. Kimes
-# Copyright (c) 2002, 2014 Steven H. Levine
+# Copyright (c) 2002, 2015 Steven H. Levine
 
 # 22 May 03 SHL Correct icon dependencies
@@ -47 +47 @@
 # 21 Feb 14 JBS Ticket #500: Set only non-resource objects in FM3RES.DLL to high memory
 # 24 Feb 14 JBS Ticket #500: Suspended use of high memory by commenting out the calls to exehdr
+# 13 Aug 15 SHL Add listutil
 
 # Environment: see makefile_pre.mk and makefile_post.mk
@@ -196 +197 @@
        fonts.obj fortify.obj &
        getnames.obj grep.obj grep2.obj i18nutil.obj info.obj inis.obj &
-       init.obj input.obj instant.obj key.obj killproc.obj literal.obj &
+       init.obj input.obj instant.obj key.obj killproc.obj &
+       listutil.obj literal.obj &
        loadbmp.obj mainwnd.obj mainwnd2.obj makelist.obj menu.obj misc.obj &
        mkdir.obj mle.obj newview.obj notebook.obj notify.obj objcnr.obj &

trunk/dll/treecnr.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001-2012 Steven H. Levine
+  Copyright (c) 2001, 2015 Steven H. Levine
 
   16 Oct 02 SHL Handle large partitions
@@ -78 +78 @@
   15 Sep 09 SHL Use UM_GREP when passing pathname
   15 Nov 09 GKY Add semaphore to fix double names in tree container caused by UM_SHOWME
-                before scan completes
+                before scan completes
   22 Nov 09 GKY Add LVM.EXE to partition submenu
   17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast
-                CHAR CONSTANT * as CHAR *.
+                CHAR CONSTANT * as CHAR *.
   11 Apr 10 GKY Fix drive tree rescan failure and program hang caused by event sem
-                never being posted
+                never being posted
   20 Nov 10 GKY Rework scanning code to remove redundant scans, prevent double directory
-                entries in the tree container, fix related semaphore performance using
-                combination of event and mutex semaphores
+                entries in the tree container, fix related semaphore performance using
+                combination of event and mutex semaphores
   04 Aug 12 GKY Fix trap reported by Ben
   30 Dec 12 GKY Changed refresh removable media to query LVM directly to call Rediscover_PRMs (Ticket 472);
-                Also added a tree rescan following volume detach.
+                Also added a tree rescan following volume detach.
   22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
   07 Sep 14 GKY Fix tree container mis-draws (stacked icons with RWS) The problem was magnified
-                by RWS but I think the occasional extra blank directory or duplicating
-                directories is related.
+                by RWS but I think the occasional extra blank directory or duplicating
+                directories is related.
   16 Mar 15 GKY Add semaphore hmtxFiltering to prevent freeing dcd while filtering. Prevents
-                a trap when FM2 is shutdown or the container is closed while tree
-                container is still populating
+                a trap when FM2 is shutdown or the container is closed while tree
+                container is still populating
   02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object"
-                menu item on a jar file.
+                menu item on a jar file.
   12 Jul 15 GKY Fixed trap caused by pci->pszFileName being NullStr
+  07 Aug 15 SHL Rework to use AddFleshWorkRequest rather than direct calls to Stubby/Flesh/Unflesh
 
 ***********************************************************************/
@@ -141 +142 @@
 #include "select.h"                     // ExpandAll
 #include "findrec.h"                    // FindCnrRecord, FindParentRecord, ShowCnrRecord
-#include "flesh.h"                      // Flesh, UnFlesh
+#include "flesh.h"                      // AddFleshWorkRequest
 #include "notify.h"                     // HideNote
 #include "objwin.h"                     // MakeObjWin
@@ -165 +166 @@
 #include "dirs.h"                       // save_dir2
 #include "fortify.h"
-#include "init.h"                       // GetTidForWindow
+#include "init.h"                       // NullStr etc.
 #include "excputil.h"                   // xbeginthread
 #include "copyf.h"                      // ignorereadonly
@@ -273 +274 @@
 }
 
+/**
+ * Find a record in tree view, move it so it shows in container and
+ * make it the current record
+ * @param hwndCnr is container which must be in tree view
+ * @param pszDir_ is full path name to find
+ */
+
 VOID ShowTreeRec(HWND hwndCnr,
-                 CHAR *dirname,
+                 CHAR *pszDir_,
                  BOOL collapsefirst,
                  BOOL maketop)
 {
-    /**
-     * Find a record in tree view, move it so it shows in container and
-     * make it the current record
-     */
-
-  PCNRITEM pci, pciToSelect, pciP;
+  PCNRITEM pci;
+  PCNRITEM pciToSelect;
+  PCNRITEM pciP;
+  UINT retries;
   BOOL quickbail = FALSE;
-  CHAR szDir[CCHMAXPATH], *p;
+  PSZ p;
+  UINT cDirLen;
+  BOOL found;
+  CHAR szDir[CCHMAXPATH];
+
+  DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec pszDir_ %s", pszDir_); // 2015-08-04 SHL FIXME debug
 
   // already positioned to requested record?
@@ -291 +302 @@
                    CM_QUERYRECORDEMPHASIS,
                    MPFROMLONG(CMA_FIRST), MPFROMSHORT(CRA_CURSORED));
-  if (pci && (INT) pci != -1 && !stricmp(pci->pszFileName, dirname)) {
-    quickbail = TRUE;                   // Bypass repositioning
+  if (pci && (INT)pci != -1 && !stricmp(pci->pszFileName, pszDir_)) {
+    found = TRUE;
+    quickbail = TRUE;                   // Already at requested record - bypass repositioning
     goto MakeTop;
   }
+
   WinEnableWindowUpdate(hwndCnr, FALSE);
-  pci = FindCnrRecord(hwndCnr, dirname, NULL, TRUE, FALSE, TRUE);
-  if (!pci || (INT) pci == -1) {
-    *szDir = *dirname;
+
+  // 2015-08-13 SHL add retry logic
+  for (found = FALSE, retries = 0; !found && retries < 10; retries++) {
+
+    pci = FindCnrRecord(hwndCnr,
+                        pszDir_,
+                        NULL,           // pciParent
+                        TRUE,           // partial
+                        FALSE,          // partmatch
+                        TRUE);          // noenv
+
+    if (pci && (INT)pci != -1) {
+      found = TRUE;
+      break;                    // Found it
+    }
+
+    // Try again expanding as needed
+
+    DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec need expand"); // 2015-08-04 SHL FIXME debug
+
+    cDirLen = strlen(pszDir_);
+
+    *szDir = *pszDir_;                  // Drive letter
     szDir[1] = ':';
     szDir[2] = '\\';
     szDir[3] = 0;
     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;                        // Found it
-        if (~pciP->rc.flRecordAttr & CRA_EXPANDED)
-          WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
-        strcpy(szDir, dirname);
-        if (p - szDir >= strlen(szDir))
-          break;                        // Not root dir
-        p = strchr(p, '\\');
-        if (p) {
-          *p = 0;                       // fixme?
-          p++;
-        }
-        else
-          break;
-      }
-      else
-        break;
-      DosSleep(0);
-    } // for
-    pci = FindCnrRecord(hwndCnr, dirname, NULL, TRUE, FALSE, TRUE);
-  }
-  if (pci && (INT) pci != -1) {
+      // Try to match path prefix
+      pciP = FindCnrRecord(hwndCnr,
+                           szDir,
+                           NULL,                // pciParent
+                           TRUE,                // partial
+                           FALSE,               // partmatch
+                           TRUE);               // noenv
+      if (!pciP || (INT)pciP == -1) {
+        DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec FindCnrRecord(%s) returned %p", szDir, pciP); // 2015-08-04 SHL FIXME debug
+        WaitFleshWorkListEmpty();               // 2015-08-13 SHL
+        DosSleep(1000);
+        break;                                  // No match
+      }
+
+      DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec FindCnrRecord returned %p %s", pciP, pciP->pszFileName); // 2015-08-04 SHL FIXME debug
+
+      if (!stricmp(pszDir_, pciP->pszFileName)) {
+        pci = pciP;
+        found = TRUE;
+        break;                  // Got full match
+      }
+
+      if (~pciP->rc.flRecordAttr & CRA_EXPANDED) {
+        DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec expanding %s", pciP->pszFileName); // 2015-08-04 SHL FIXME debug
+        WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
+        DosSleep(100);                          // 2015-08-13 SHL Let PM catch up
+        // WaitFleshWorkListEmpty();            // 2015-08-13 SHL
+      }
+
+      WaitFleshWorkListEmpty();         // 2015-08-13 SHL
+
+      // Add next component to path
+      if (p - szDir >= cDirLen)
+        break;                          // Done
+      strcpy(szDir, pszDir_);           // Reset
+      p = strchr(p, '\\');              // Find next backslash
+      if (!p)
+        break;                          // Give up
+
+      *p++ = 0;                         // Truncate at backslash
+
+    } // while expanding
+
+  } // for
+
+  DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec retries %u pci %p pci->pszFileName %s",retries, pci, pci && (INT)pci != -1 ? pci->pszFileName : "(null)"); // 2015-08-04 SHL FIXME debug
+
+  if (found) {
+    // Found it
     if (~pci->rc.flRecordAttr & CRA_CURSORED) {
       if (collapsefirst) {
@@ -334 +393 @@
                           MPVOID, MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
         while (pciP && (INT) pciP != -1) {
-#if 1 // 05 Jan 08 SHL fixme to be sure this is correct code
           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,
@@ -355 +402 @@
                             MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
         } // while
-      }
-      // expand all parent branches
+      } // if collapse
+
+      // Expand parent branches
+      // 2015-08-06 SHL FIXME to bypass if we did not collapse since search already expanded - maybe?
       pciToSelect = pci;
       for (;;) {
@@ -363 +412 @@
                           MPFROMP(pciToSelect),
                           MPFROM2SHORT(CMA_PARENT, CMA_ITEMORDER));
-        if (pciP && (INT) pciP != -1) {
-          if (!(pciP->rc.flRecordAttr & CRA_EXPANDED))
-            WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
-          pciToSelect = pciP;
-        }
-        else
-          break;
+        if (!pciP || (INT)pciP == -1)
+          break;                        // Done
+        // Got parent
+        if (~pciP->rc.flRecordAttr & CRA_EXPANDED)
+          WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
+        pciToSelect = pciP;
         DosSleep(0);                    // Let GUI update
       } // for
-    }
+    } // if not cursored
+
+  MakeTop:
     // make record visible
-  MakeTop:
     pciToSelect = pci;
     if (pciToSelect && (INT) pciToSelect != -1) {
-      //DbgMsg(pszSrcFile, __LINE__, "TOP %i %i", fTopDir, maketop);
+      DbgMsg(pszSrcFile, __LINE__, "ShowTreeRec %p fTopDir %i maketop %i", pciToSelect, fTopDir, maketop); // 2015-08-04 SHL FIXME debug
       if (fSwitchTreeExpand && ~pciToSelect->rc.flRecordAttr & CRA_EXPANDED)
-        WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
-      if (fTopDir || maketop) {
-        ShowCnrRecord(hwndCnr, (PMINIRECORDCORE) pciToSelect);
-      }
+        WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
+      if (fTopDir || maketop)
+        ShowCnrRecord(hwndCnr, (PMINIRECORDCORE)pciToSelect);
+
       if (!quickbail) {
+        WaitFleshWorkListEmpty();       // 2015-08-07 SHL FIXME try to ensure contents stable
+        DbgMsg(pszSrcFile, __LINE__, "WinSendMsg(CM_SETRECORDEMPHASIS, CRA_SELECTED | CRA_CURSORED) \"%s\"", pszDir_); // 2015-08-04 SHL FIXME debug
         WinSendMsg(hwndCnr,
                    CM_SETRECORDEMPHASIS,
@@ -391 +442 @@
     }
   }
+
   WinEnableWindowUpdate(hwndCnr, TRUE);
 }
@@ -649 +701 @@
 }
 
+ULONG ulScanPostCnt;
+
 MRESULT EXPENTRY TreeObjWndProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
   DIRCNRDATA *dcd;
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
+  APIRET rc;
+#endif // 2015-08-04 SHL FIXME to be gone
 
   switch (msg) {
@@ -661 +719 @@
       dcd = INSTDATA(hwnd);
       if (dcd) {
-        BOOL tempsusp, tempfollow, temptop;
-
-        DosWaitEventSem(hevTreeCnrScanComplete, SEM_INDEFINITE_WAIT);
-        tempsusp = dcd->suspendview;
-        dcd->suspendview = TRUE;
-        tempfollow = fFollowTree;
-        fFollowTree = FALSE;
-        if (mp2) {
-          temptop = fTopDir;
-          fTopDir = TRUE;
-        }
-        ShowTreeRec(dcd->hwndCnr, (CHAR *)mp1, fCollapseFirst, TRUE);
-        PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
-        dcd->suspendview = (USHORT) tempsusp;
-        fFollowTree = tempfollow;
-        if (mp2)
-          fTopDir = temptop;
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
+        rc = DosWaitEventSem(hevTreeCnrScanComplete, SEM_INDEFINITE_WAIT);
+        if (rc)
+          Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosPostEventSem");
+#endif // 2015-08-04 SHL FIXME to be gone
+
+        /* Hold off if switching on focus change and
+           RestoreDirCnrState has restored one or directory directory containers
+           See RestoreDirCnrState()
+        */
+        DbgMsg(pszSrcFile, __LINE__, "TreeObjWndProc UM_SHOWME cDirectoriesRestored %u", cDirectoriesRestored, fInitialDriveScan); // 2015-08-04 SHL FIXME debug
+        DbgMsg(pszSrcFile, __LINE__, "TreeObjWndProc UM_SHOWME %s)", mp1); // 2015-08-04 SHL FIXME debug
+
+        if (cDirectoriesRestored > 0)
+          cDirectoriesRestored--;
+
+        if (!cDirectoriesRestored) {
+          BOOL tempsusp = dcd->suspendview;
+          BOOL tempfollow = fFollowTree;
+          BOOL temptop;
+          dcd->suspendview = TRUE;
+          fFollowTree = FALSE;
+          if (mp2) {
+            temptop = fTopDir;
+            fTopDir = TRUE;
+          }
+
+          DbgMsg(pszSrcFile, __LINE__, "TreeObjWndProc UM_SHOWME calling ShowTreeRec(\"%s\")", mp1); // 2015-08-04 SHL FIXME debug
+          ShowTreeRec(dcd->hwndCnr, (CHAR *)mp1, fCollapseFirst, TRUE);
+          DbgMsg(pszSrcFile, __LINE__, "TreeObjWndProc UM_SHOWME calling PostMsg(IDM_UPDATE)"); // 2015-08-04 SHL FIXME debug
+          PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
+
+          dcd->suspendview = (USHORT)tempsusp;  // Restore
+          fFollowTree = tempfollow;             // Restore
+          if (mp2)
+            fTopDir = temptop;                  // Restore
+        }
       }
       free((CHAR *)mp1);
@@ -717 +796 @@
       dcd->suspendview = TRUE;
       ExpandAll(dcd->hwndCnr,
-                (SHORT1FROMMP(mp1) == IDM_EXPAND), (PCNRITEM) mp2);
+                (SHORT1FROMMP(mp1) == IDM_EXPAND), (PCNRITEM) mp2);
       DosSleep(1); // Fixes tree epansion (dir text and icons all placed on
-                       // the same line as the drive) failure on startup using RWS
+                       // the same line as the drive) failure on startup using RWS
       dcd->suspendview = (USHORT) tempsusp;
       PostMsg(dcd->hwndCnr, UM_FILTER, MPVOID, MPVOID);
@@ -789 +868 @@
       if (cnri.cRecords) {
         sprintf(s, GetPString(IDS_NUMDRIVESTEXT), cnri.cRecords);
-        if (pci && (INT) pci != -1 && pci->pszFileName != NullStr) { //fixme? will try checking pci->pszFileName instead of the pointer
+        if (pci && (INT) pci != -1 && pci->pszFileName != NullStr) { //fixme? will try checking pci->pszFileName instead of the pointer
           if (!(driveflags[toupper(*pci->pszFileName) - 'A'] &
                 DRIVE_REMOVABLE) ||
@@ -809 +888 @@
               }
               else
-                *szFree = 0;
-              //Show information on status line not shown in the tree container
+                *szFree = 0;
+              //Show information on status line not shown in the tree container
               driveserial[toupper(*pci->pszFileName) - 'A'] = volser.serial;
-              if (CheckDrive(toupper(*pci->pszFileName), FileSystem, &type) == -1 ||
-                  fShowFSTypeInTree)
+              if (CheckDrive(toupper(*pci->pszFileName), FileSystem, &type) == -1 ||
+                  fShowFSTypeInTree)
                 strcpy(FileSystem, NullStr);
               if (fShowDriveLabelInTree)
@@ -826 +905 @@
                 sprintf(s,
                         GetPString(fShowFSTypeInTree ? IDS_TREESTATUSSTART1TEXT :
-                                   fShowDriveLabelInTree ? IDS_TREESTATUSSTART2TEXT :
-                                   IDS_TREESTATUSSTARTTEXT), toupper(*pci->pszFileName),
-                        FileSystem, szTmpLabel, volser.serial, szFree);
+                                   fShowDriveLabelInTree ? IDS_TREESTATUSSTART2TEXT :
+                                   IDS_TREESTATUSSTARTTEXT), toupper(*pci->pszFileName),
+                        FileSystem, szTmpLabel, volser.serial, szFree);
                 strcat(s, temp);
               }
@@ -835 +914 @@
                 sprintf(&s[strlen(s)],
                         GetPString(fShowFSTypeInTree ? IDS_TREESTATUSSTART1TEXT :
-                                   fShowDriveLabelInTree ? IDS_TREESTATUSSTART2TEXT :
-                                   IDS_TREESTATUSSTARTTEXT), toupper(*pci->pszFileName),
-                        FileSystem, szTmpLabel, volser.serial, szFree);
+                                   fShowDriveLabelInTree ? IDS_TREESTATUSSTART2TEXT :
+                                   IDS_TREESTATUSSTARTTEXT), toupper(*pci->pszFileName),
+                        FileSystem, szTmpLabel, volser.serial, szFree);
                 strcat(s, "]");
               }
@@ -861 +940 @@
             pci = FindParentRecord(dcd->hwndCnr, pci);
             driveserial[toupper(*pci->pszFileName) - 'A'] = -1;
-            UnFlesh(dcd->hwndCnr, pci);
-          }
-        }
-      }
-      // 21 Sep 09 SHL fixme to know why checking again - focus change?
+            WaitFleshWorkListEmpty();   // 2015-08-13 SHL in case pci still in work list
+            AddFleshWorkRequest(dcd->hwndCnr, pci, eUnFlesh);
+          }
+        }
+      }
+      // 21 Sep 09 SHL FIXME to know why checking again - focus change?
       if (dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent))
         WinSetWindowText(hwndStatus, s);
@@ -873 +953 @@
   case UM_RESCAN:
     // populate container
-    DosWaitEventSem(hevTreeCnrScanComplete, SEM_INDEFINITE_WAIT);
-    DosResetEventSem(hevTreeCnrScanComplete, &ulScanPostCnt);
+#if 0 // 2015-08-04 SHL FIXME to be gone
+    rc = DosWaitEventSem(hevTreeCnrScanComplete, SEM_INDEFINITE_WAIT);
+    if (rc)
+      Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosWaitEventSem");
+    rc = DosResetEventSem(hevTreeCnrScanComplete, &ulScanPostCnt);
+    if (rc)
+      Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosResetEventSem");
+#endif // 2015-08-04 SHL FIXME to be gone
+
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (!dcd)
@@ -885 +972 @@
                  CM_SCROLLWINDOW,
                  MPFROMSHORT(CMA_HORIZONTAL), MPFROMLONG(-1));
+      DbgMsg(pszSrcFile, __LINE__, "TreeObjWndProc FillTreeCnr()"); // 2015-08-04 SHL FIXME debug
       FillTreeCnr(dcd->hwndCnr, dcd->hwndParent);
       if (fOkayMinimize) {
@@ -892 +980 @@
       WinSendMsg(dcd->hwndCnr,
                  CM_INVALIDATERECORD,
-                 MPVOID, MPFROM2SHORT(0, CMA_ERASE | CMA_REPOSITION));
+                 MPVOID, MPFROM2SHORT(0, CMA_ERASE | CMA_REPOSITION));
+      DbgMsg(pszSrcFile, __LINE__, "TreeObjWndProc PostMsg(UM_RESCAN)"); // 2015-08-04 SHL FIXME debug
       PostMsg(dcd->hwndCnr, UM_RESCAN, MPVOID, MPVOID);
     }
@@ -917 +1006 @@
       case IDM_DELETE:
       case IDM_PERMDELETE:
-        if (li->type == IDM_DELETE)
-          ignorereadonly = FALSE;
+        if (li->type == IDM_DELETE)
+          ignorereadonly = FALSE;
         if (PostMsg(hwnd, UM_MASSACTION, mp1, mp2))
           return (MRESULT) TRUE;
@@ -1037 +1126 @@
   DIRCNRDATA *dcd = INSTDATA(hwnd);
   PCNRITEM pci;
+  APIRET rc;
 
   switch (msg) {
@@ -1124 +1214 @@
         WinSetWindowText(hwndStatus2, NullStr);
     }
-    // 13 Jul 09 SHL fixme to make sense
+    // 13 Jul 09 SHL FIXME to make sense
     if (msg == UM_TIMER)
       return 0;
@@ -1138 +1228 @@
       FSALLOCATE fsa;
 
-      pci = (PCNRITEM) CurrentRecord(hwnd);
-      if (pci && (INT) pci != -1) {
+      pci = (PCNRITEM)CurrentRecord(hwnd);
+      if (pci && (INT)pci != -1) {
         if (IsRoot(pci->pszFileName) || !DosQueryFSInfo(toupper(*pci->pszFileName) - '@',
                                                        FSIL_ALLOC, &fsa,
@@ -1235 +1325 @@
         else
           WinSetWindowText(WinWindowFromID(dcd->hwndFrame,
-                                           MAIN_STATUS), pci->pszFileName);
+                                           MAIN_STATUS), pci->pszFileName);
         if (fMoreButtons && hwndName) {
           CHAR szDate[DATE_BUF_BYTES];
@@ -1248 +1338 @@
         }
       }
+      DbgMsg(pszSrcFile, __LINE__, "TreeCnrWndProc UM_RESCAN PostMsg(UM_RESCAN2, %s)", pci->pszFileName); // 2015-08-04 SHL FIXME debug
       PostMsg(dcd->hwndObject, UM_RESCAN2, MPFROMP(pci), MPVOID);
       if (hwndStatus2)
@@ -1515 +1606 @@
             }
           }
-          pDItem = DrgQueryDragitemPtr(pDInfo,          // Access DRAGITEM
-                                       0);              // Index to DRAGITEM
-          if (DrgVerifyRMF(pDItem,                      // Check valid rendering
+          pDItem = DrgQueryDragitemPtr(pDInfo,          // Access DRAGITEM
+                                       0);              // Index to DRAGITEM
+          if (DrgVerifyRMF(pDItem,                      // Check valid rendering
                            (CHAR *) DRM_OS2FILE,        // mechanisms and data
-                           NULL) || DrgVerifyRMF(pDItem,
-                                                 (CHAR *) DRM_FM2ARCMEMBER,
-                                                 (CHAR *) DRF_FM2ARCHIVE)) {    // formats
-            DrgFreeDraginfo(pDInfo);                    // Free DRAGINFO
+                           NULL) || DrgVerifyRMF(pDItem,
+                                                 (CHAR *) DRM_FM2ARCMEMBER,
+                                                 (CHAR *) DRF_FM2ARCHIVE)) {    // formats
+            DrgFreeDraginfo(pDInfo);                    // Free DRAGINFO
             if (!pci || (INT) pci == -1)
               return MRFROM2SHORT(DOR_DROP, DO_MOVE);
@@ -1530 +1621 @@
             if (toupper(*pci->pszFileName) < 'C')
               return MRFROM2SHORT(DOR_DROP, DO_COPY);
-            return MRFROM2SHORT(DOR_DROP,               // Return okay to drop
+            return MRFROM2SHORT(DOR_DROP,               // Return okay to drop
                                 ((fCopyDefault) ? DO_COPY : DO_MOVE));
           }
-          DrgFreeDraginfo(pDInfo);                      // Free DRAGINFO
-        }
-        return MRFROM2SHORT(DOR_NODROP, 0);             // Drop not valid
+          DrgFreeDraginfo(pDInfo);                      // Free DRAGINFO
+        }
+        return MRFROM2SHORT(DOR_NODROP, 0);             // Drop not valid
 
       case CN_INITDRAG:
@@ -1754 +1845 @@
       case CN_CONTEXTMENU:
         {
-          PCNRITEM pci = (PCNRITEM) mp2;
+          PCNRITEM pci = (PCNRITEM)mp2;
           BOOL wasFollowing;
 
-          //DosEnterCritSec(); //GKY 11-28-08
           wasFollowing = fFollowTree;
           fFollowTree = FALSE;
-          //DosExitCritSec();
-          if (pci && (INT) pci != -1 && !(pci->flags & RECFLAGS_ENV)) {
-            WinSendMsg(hwnd,
-                       CM_SETRECORDEMPHASIS,
-                       MPFROMP(pci), MPFROM2SHORT(TRUE, CRA_CURSORED));
-            MarkAll(hwnd, FALSE, FALSE, TRUE);
-            if (!(pci->attrFile & FILE_DIRECTORY))
-              dcd->hwndLastMenu = CheckMenu(hwndMainMenu, &FileMenu, FILE_POPUP);
-            else if (!IsRoot(pci->pszFileName))
-              dcd->hwndLastMenu = CheckMenu(hwndMainMenu, &DirMenu, DIR_POPUP);
-            else
-              dcd->hwndLastMenu = CheckMenu(hwndMainMenu, &TreeMenu, TREE_POPUP);
+          if (pci && (INT)pci != -1 && !(pci->flags & RECFLAGS_ENV)) {
+            // 2015-08-09 SHL try to ensure contents stable
+            if (!IsFleshWorkListEmpty())
+              WinPostMsg(hwnd, msg, mp1, mp2);          // Try again later
+            else {
+              WinSendMsg(hwnd,
+                         CM_SETRECORDEMPHASIS,
+                         MPFROMP(pci), MPFROM2SHORT(TRUE, CRA_CURSORED));
+              MarkAll(hwnd, FALSE, FALSE, TRUE);
+              if (!(pci->attrFile & FILE_DIRECTORY))
+                dcd->hwndLastMenu = CheckMenu(hwndMainMenu, &FileMenu, FILE_POPUP);
+              else if (!IsRoot(pci->pszFileName))
+                dcd->hwndLastMenu = CheckMenu(hwndMainMenu, &DirMenu, DIR_POPUP);
+              else
+                dcd->hwndLastMenu = CheckMenu(hwndMainMenu, &TreeMenu, TREE_POPUP);
+            }
           }
           else {
@@ -1798 +1892 @@
             }
           }
-          //DosEnterCritSec(); //GKY 11-28-08
           fFollowTree = wasFollowing;
-          //DosExitCritSec();
         }
         break;
@@ -1837 +1929 @@
                     driveserial[toupper(*pci->pszFileName) - 'A'] !=
                     volser.serial)
-                  UnFlesh(hwnd, pci);
+                {
+                  WaitFleshWorkListEmpty();     // 2015-08-13 SHL in case pci still in work list
+                  AddFleshWorkRequest(hwnd, pci, eUnFlesh);
+                }
                 if (SHORT2FROMMP(mp1) != CN_COLLAPSETREE ||
                     (!volser.serial ||
                      driveserial[toupper(*pci->pszFileName) - 'A'] !=
                      volser.serial)) {
-                  if (SHORT2FROMMP(mp1) == CN_EXPANDTREE && Flesh(hwnd, pci)
-                      &&!dcd->suspendview  && fTopDir) {
+                  if (SHORT2FROMMP(mp1) == CN_EXPANDTREE && AddFleshWorkRequest(hwnd, pci, eFlesh)
+                      &&!dcd->suspendview  && fTopDir) {
                     PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
                     //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
@@ -1852 +1947 @@
               else {
                 driveserial[toupper(*pci->pszFileName) - 'A'] = -1;
-                UnFlesh(hwnd, pci);
+                WaitFleshWorkListEmpty();       // 2015-08-13 SHL in case pci still in work list
+                AddFleshWorkRequest(hwnd, pci, eUnFlesh);
                 PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
                 if (!fAlertBeepOff)
@@ -1859 +1955 @@
             }
             else if (SHORT2FROMMP(mp1) == CN_EXPANDTREE) {
-              if (Flesh(hwnd, pci) && !dcd->suspendview && fTopDir){
+              // 2015-08-04 SHL
+#if 1
+              AddFleshWorkRequest(hwnd, pci, eFlesh);   // forceFlesh
+              if (!dcd->suspendview && fTopDir) {
+                DbgMsg(pszSrcFile, __LINE__, "TreeCnrWndProc UM_TOPDIR %p pci %p", hwnd, pci);  // 2015-08-04 SHL FIXME debug
                 PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
-                //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
               }
+#else
+              if (Flesh(hwnd, pci) && !dcd->suspendview && fTopDir) {
+                DbgMsg(pszSrcFile, __LINE__, "TreeCnrWndProc UM_TOPDIR %p pci %p", hwnd, pci);  // 2015-08-04 SHL FIXME debug
+                PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
+              }
+#endif
             }
             if (SHORT2FROMMP(mp1) == CN_EXPANDTREE && !dcd->suspendview){
+              DbgMsg(pszSrcFile, __LINE__, "UM_FILTER %p pci %p", hwnd, pci);
               WinSendMsg(hwnd, UM_FILTER, MPVOID, MPVOID);
-              //DbgMsg(pszSrcFile, __LINE__, "UM_FILTER %p pci %p", hwnd, pci);
             }
           }
@@ -1892 +1997 @@
 
       if (dir) {
+        DbgMsg(pszSrcFile, __LINE__, "TreeCnrWndProc UM_SHOWME PostMsg(UM_SHOWME, %s)", dir); // 2015-08-13 SHL FIXME debug
         if (!PostMsg(dcd->hwndObject, UM_SHOWME, MPFROMP(dir), MPVOID))
           free(dir);
+        else
+          SetFleshFocusDrive(*dir);
       }
     }
@@ -1900 +2008 @@
   case UM_TOPDIR:
     if (mp1) {
-
       PCNRITEM pci = (PCNRITEM) mp1;
-
       ShowCnrRecord(hwnd, (PMINIRECORDCORE) pci);
     }
@@ -1912 +2018 @@
       HDIR hDir = HDIR_CREATE;
       ULONG nm = 1;
-      APIRET status;
+      // APIRET status;
       BOOL IsOk = FALSE;
       ULONG ulDriveNum, ulDriveMap;
@@ -1919 +2025 @@
       INT x;
 
-      DosRequestMutexSem(hmtxScanning, SEM_INDEFINITE_WAIT);
-      DosQueryEventSem(hevTreeCnrScanComplete, &ulScanPostCnt);
+#if 0 // 2015-08-04 SHL FIXME to be gone
+      rc = DosRequestMutexSem(hmtxScanning, SEM_INDEFINITE_WAIT);
+      if (rc)
+        Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosRequestMutexSem");
+#endif // 2015-08-04 SHL FIXME to be gone
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
+      rc = DosQueryEventSem(hevTreeCnrScanComplete, &ulScanPostCnt);
+      if (rc)
+        Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosQueryEventSem");
       if (ulScanPostCnt < 1)
-        return 0;
-      DosResetEventSem(hevTreeCnrScanComplete, &ulScanPostCnt);
+        return 0;
+      rc = DosResetEventSem(hevTreeCnrScanComplete, &ulScanPostCnt);
+      if (rc)
+        Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosResetEventSem");
+#endif // 2015-08-04 SHL FIXME to be gone
+
       if (fFollowTree)
         fl = 0;
@@ -1938 +2056 @@
           if (hwndStatus)
             WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_RESCANSUGTEXT));
-          DosPostEventSem(hevTreeCnrScanComplete);
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
+          rc = DosPostEventSem(hevTreeCnrScanComplete);
+          if (rc && rc != ERROR_ALREADY_POSTED)
+            Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosPostEventSem");
+#endif // 2015-08-04 SHL FIXME to be gone
+
           return 0;
         }
@@ -1958 +2082 @@
             } // for
             RemoveCnrItems(hwnd, pciP, 1, CMA_FREE | CMA_INVALIDATE);
-            DosPostEventSem(hevTreeCnrScanComplete);
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
+            rc = DosPostEventSem(hevTreeCnrScanComplete);
+            if (rc && rc != ERROR_ALREADY_POSTED)
+              Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosPostEventSem");
+#endif // 2015-08-04 SHL FIXME to be gone
             return 0;
           }
@@ -1996 +2125 @@
           memset(&volser, 0, sizeof(volser));
           DosError(FERR_DISABLEHARDERR);
-          status = DosQueryFSInfo(toupper(*pci->pszFileName) - '@',
-                                  FSIL_VOLSER, &volser,
-                                  (ULONG) sizeof(volser));
-          if (!status) {
+          rc = DosQueryFSInfo(toupper(*pci->pszFileName) - '@',
+                              FSIL_VOLSER, &volser,
+                              (ULONG) sizeof(volser));
+          if (!rc) {
             if (!volser.serial || driveserial[x] != volser.serial) {
+#if 1 // 2015-08-04 SHL FIXME to be gone
+              AddFleshWorkRequest(hwnd, pciP, eFlesh);  // forceFlesh
+#else
               Flesh(hwnd, pciP);
+#endif // 2015-08-04 SHL FIXME to be gone
               driveserial[x] = volser.serial;
             }
@@ -2008 +2141 @@
                               MPFROMP(pciP),
                               MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
-            if (!pciL) {
-              Flesh(hwnd, pciP);
-            }
+            if (!pciL) {
+#if 1 // 2015-08-04 SHL FIXME to be gone
+              AddFleshWorkRequest(hwnd, pciP, eFlesh);  // forceFlesh
+#else
+              Flesh(hwnd, pciP);
+#endif // 2015-08-04 SHL FIXME to be gone
+            }
             if ((fShowFSTypeInTree || fShowDriveLabelInTree) &&
                 strlen(pciP->pszFileName) < 4) {
@@ -2027 +2164 @@
           else {
             driveserial[x] = -1;
-            UnFlesh(hwnd, pci);
+            WaitFleshWorkListEmpty();   // 2015-08-13 SHL in case pci still in work list
+            AddFleshWorkRequest(hwnd, pci, eUnFlesh);
             PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
-            PostMsg(hwnd, UM_SETUP2, MPFROMP(pci), MPFROMLONG(status));
-            DosPostEventSem(hevTreeCnrScanComplete);
+            PostMsg(hwnd, UM_SETUP2, MPFROMP(pci), MPFROMLONG(rc));
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
+            rc = DosPostEventSem(hevTreeCnrScanComplete);
+            if (rc && rc != ERROR_ALREADY_POSTED)
+              Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosPostEventSem");
+#endif // 2015-08-04 SHL FIXME to be gone
             return 0;
           }
         }
-        status = 0;
+        rc = 0;
         IsOk = (IsRoot(pci->pszFileName) &&
                 IsValidDrive(toupper(*pci->pszFileName)));
         if (!IsOk) {
           DosError(FERR_DISABLEHARDERR);
-          status = DosFindFirst(pci->pszFileName, &hDir,
-                                FILE_NORMAL | FILE_DIRECTORY |
-                                FILE_ARCHIVED | FILE_READONLY |
-                                FILE_HIDDEN | FILE_SYSTEM,
-                                &ffb, sizeof(ffb), &nm, FIL_STANDARD);
+          rc = DosFindFirst(pci->pszFileName, &hDir,
+                            FILE_NORMAL | FILE_DIRECTORY |
+                            FILE_ARCHIVED | FILE_READONLY |
+                            FILE_HIDDEN | FILE_SYSTEM,
+                            &ffb, sizeof(ffb), &nm, FIL_STANDARD);
           priority_bumped();
         }
-        if (!status) {
+        if (!rc) {
           if (!IsOk)
             DosFindClose(hDir);
@@ -2053 +2196 @@
               PostMsg(hwnd,
                       WM_COMMAND, MPFROM2SHORT(IDM_SHOWALLFILES, 0), MPVOID);
-              DosPostEventSem(hevTreeCnrScanComplete);
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
+              rc = DosPostEventSem(hevTreeCnrScanComplete);
+              if (rc && rc != ERROR_ALREADY_POSTED)
+                Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosPostEventSem");
+#endif // 2015-08-04 SHL FIXME to be gone
               return 0;
             }
             if ((shiftstate & (KC_CTRL | KC_SHIFT)) == (KC_CTRL | KC_SHIFT)) {
               OpenObject(pci->pszFileName, Settings, dcd->hwndFrame);
-              DosPostEventSem(hevTreeCnrScanComplete);
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
+              rc = DosPostEventSem(hevTreeCnrScanComplete);
+              if (rc && rc != ERROR_ALREADY_POSTED)
+                Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosPostEventSem");
+#endif // 2015-08-04 SHL FIXME to be gone
               return 0;
             }
@@ -2064 +2217 @@
               if (!ParentIsDesktop(hwnd, dcd->hwndParent)) {
                 if (FindDirCnrByName(pci->pszFileName, TRUE)) {
-                  DosPostEventSem(hevTreeCnrScanComplete);
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
+                  rc = DosPostEventSem(hevTreeCnrScanComplete);
+                  if (rc && rc != ERROR_ALREADY_POSTED)
+                    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosPostEventSem");
+#endif // 2015-08-04 SHL FIXME to be gone
                   return 0;
                 }
@@ -2088 +2246 @@
               }
               OpenObject(pci->pszFileName, s, dcd->hwndFrame);
-              DosPostEventSem(hevTreeCnrScanComplete);
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
+              rc = DosPostEventSem(hevTreeCnrScanComplete);
+              if (rc && rc != ERROR_ALREADY_POSTED)
+                Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosPostEventSem");
+#endif // 2015-08-04 SHL FIXME to be gone
               return 0;
             }
@@ -2123 +2286 @@
         else {
           if (!IsRoot(pci->pszFileName)) {
-            NotifyError(pci->pszFileName, status);
+            NotifyError(pci->pszFileName, rc);
             RemoveCnrItems(hwnd, pci, 1, CMA_FREE | CMA_INVALIDATE);
           }
@@ -2132 +2295 @@
       if (fFollowTree)
         WinSetFocus(HWND_DESKTOP, hwnd);
-      DosPostEventSem(hevTreeCnrScanComplete);
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
+      rc = DosPostEventSem(hevTreeCnrScanComplete);
+      if (rc && rc != ERROR_ALREADY_POSTED)
+        Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosPostEventSem");
+#endif // 2015-08-04 SHL FIXME to be gone
     }
     return 0;
@@ -2235 +2403 @@
             WinEnableMenuItem((HWND) mp2, IDM_PARTITION, fMiniLVM);
             WinEnableMenuItem((HWND) mp2, IDM_PARTITIONDF, fDFSee);
-            WinEnableMenuItem((HWND) mp2, IDM_PARTITIONLVMG, fLVMGui);
-            WinEnableMenuItem((HWND) mp2, IDM_PARTITIONLVM, fLVM);
+            WinEnableMenuItem((HWND) mp2, IDM_PARTITIONLVMG, fLVMGui);
+            WinEnableMenuItem((HWND) mp2, IDM_PARTITIONLVM, fLVM);
             WinEnableMenuItem((HWND) mp2, IDM_PARTITIONFD, fFDisk);
 
@@ -2266 +2434 @@
         WinEnableMenuItem((HWND) mp2, IDM_PARTITION, fMiniLVM);
         WinEnableMenuItem((HWND) mp2, IDM_PARTITIONDF, fDFSee);
-        WinEnableMenuItem((HWND) mp2, IDM_PARTITIONLVMG, fLVMGui);
-        WinEnableMenuItem((HWND) mp2, IDM_PARTITIONLVM, fLVM);
+        WinEnableMenuItem((HWND) mp2, IDM_PARTITIONLVMG, fLVMGui);
+        WinEnableMenuItem((HWND) mp2, IDM_PARTITIONLVM, fLVM);
         WinEnableMenuItem((HWND) mp2, IDM_PARTITIONFD, fFDisk);
         break;
@@ -2350 +2518 @@
       dcd->suspendview = (USHORT) tempsusp;
       PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
-      //DbgMsg(pszSrcFile, __LINE__, "UM_RESCAN %p pci %s", hwnd, (CHAR *) mp1);
     }
     return 0;
@@ -2356 +2523 @@
   case UM_DRIVECMD:
     if (mp1) {
+      DbgMsg(pszSrcFile, __LINE__, "TreeCnrWndProc UM_DRIVECMD ShowTreeRec(\"%s\")", mp1);
       ShowTreeRec(hwnd, (CHAR *)mp1, FALSE, TRUE);
+      DbgMsg(pszSrcFile, __LINE__, "TreeCnrWndProc PostMsg(IDM_UPDATE)");
       PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
     }
@@ -2386 +2555 @@
               RemoveCnrItems(hwnd, pci, 1, CMA_FREE);
             else
-              Flesh(hwnd, pci);
+              AddFleshWorkRequest(hwnd, pci, eFlesh);
           }
           if (info->prev)
@@ -2461 +2630 @@
                 }
                 apptail = info;
-              }
-              PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+              }
+              PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
             }
           }
@@ -2612 +2781 @@
                 NULL, NULL,
                 "%s", PCSZ_LVMGUICMD);
-        break;
+        break;
 
       case IDM_PARTITIONLVM:
@@ -2627 +2796 @@
 
       case IDM_REFRESHREMOVABLES:
-        {
-        PFN Rediscover_PRMs;
-        HMODULE hmod = 0;
-        APIRET rc;
-        CHAR objerr[CCHMAXPATH];
-
-        rc = DosLoadModule(objerr, sizeof(objerr), "LVM", &hmod);
-        if (!rc) {
-          rc = DosQueryProcAddr(hmod, 70, NULL, &Rediscover_PRMs);
-          if (!rc)
+        {
+        PFN Rediscover_PRMs;
+        HMODULE hmod = 0;
+        CHAR objerr[CCHMAXPATH];
+
+        rc = DosLoadModule(objerr, sizeof(objerr), "LVM", &hmod);
+        if (!rc) {
+          rc = DosQueryProcAddr(hmod, 70, NULL, &Rediscover_PRMs);
+          if (!rc)
             Rediscover_PRMs(&rc);
-          DosFreeModule(hmod);
-        }
-        if (!rc)
+          DosFreeModule(hmod);
+        }
+        if (!rc)
           PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
-        break;
-        }
+        break;
+        }
 
       case IDM_SORTNAME:
@@ -2802 +2970 @@
       case IDM_UPDATE:
         {
-          PCNRITEM pci = (PCNRITEM)CurrentRecord(hwnd);
+          // 2015-08-07 SHL FIXME select
+          PCNRITEM pci;
+          if (!IsFleshWorkListEmpty())
+            break;                      // 2015-08-07 SHL hold off until stable
+          pci = (PCNRITEM)CurrentRecord(hwnd);
           if (pci && (INT)pci != -1) {
             struct
@@ -2817 +2989 @@
             if (pci->attrFile & FILE_DIRECTORY) {
               if (pci->flags & RECFLAGS_UNDERENV)
-                break;
-              DosRequestMutexSem(hmtxScanning, SEM_INDEFINITE_WAIT);
-              DosResetEventSem(hevTreeCnrScanComplete, &ulScanPostCnt);
-              UnFlesh(hwnd, pci);
+                break;
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
+              rc = DosRequestMutexSem(hmtxScanning, SEM_INDEFINITE_WAIT);
+              if (rc)
+                Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosRequestMutexSem");
+#endif // 2015-08-04 SHL FIXME to be gone
+
+#if 0 // 2015-08-04 SHL FIXME to be gone
+              rc = DosResetEventSem(hevTreeCnrScanComplete, &ulScanPostCnt);
+              if (rc)
+                Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosResetEventSem");
+#endif // 2015-08-04 SHL FIXME to be gone
+
+              // Can't wait here
+              // WaitFleshWorkListEmpty();      // 2015-08-13 SHL in case pci still in work list
+              AddFleshWorkRequest(hwnd, pci, eUnFlesh);
               // Check if drive type might need update
               if ((driveflag & (DRIVE_INVALID | DRIVE_NOPRESCAN)) ||
@@ -2828 +3013 @@
                 if (driveflag & DRIVE_INVALID)
                   pci->rc.hptrIcon = hptrDunno;
-                else  if (strlen(pci->pszFileName) < 4) {
+                else if (strlen(pci->pszFileName) < 4) {
                   SelectDriveIcon(pci);
-                  if (fShowFSTypeInTree || fShowDriveLabelInTree) {
-                    strcpy(szBuf, pci->pszFileName);
-                    strcat(szBuf, " [");
-                    strcat(szBuf, fShowFSTypeInTree ? FileSystem : volser.volumelabel);
-                    strcat(szBuf, "]");
-                    pci->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
-                    pci->rc.pszIcon = pci->pszDisplayName;
-                  }
-                }
+                  if (fShowFSTypeInTree || fShowDriveLabelInTree) {
+                    strcpy(szBuf, pci->pszFileName);
+                    strcat(szBuf, " [");
+                    strcat(szBuf, fShowFSTypeInTree ? FileSystem : volser.volumelabel);
+                    strcat(szBuf, "]");
+                    pci->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
+                    pci->rc.pszIcon = pci->pszDisplayName;
+                  }
+                }
                 WinSendMsg(hwnd,
                            CM_INVALIDATERECORD,
@@ -2846 +3031 @@
                   PostMsg(hwndMain, UM_BUILDDRIVEBAR, MPVOID, MPVOID);
               }
+              DbgMsg(pszSrcFile, __LINE__, " TreeCnrWndProc IDM_UPDATE %s", pci->pszFileName); // 2015-08-03 SHL FIXME debug
               if (~driveflag & DRIVE_INVALID)
-                Flesh(hwnd, pci);
-              DosPostEventSem(hevTreeCnrScanComplete);
+                AddFleshWorkRequest(hwnd, pci, eFlesh);
+#if 0 // 2015-08-04 SHL FIXME to be gone
+              rc = DosPostEventSem(hevTreeCnrScanComplete);
+              if (rc && rc != ERROR_ALREADY_POSTED)
+                Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__, "DosPostEventSem");
+#endif // 2015-08-04 SHL FIXME to be gone
             }
           }
@@ -3021 +3211 @@
             case IDM_MCIPLAY:
               action = UM_MASSACTION;
-            }
-            if (li->type == IDM_DELETE)
-              ignorereadonly = FALSE;
+            }
+            if (li->type == IDM_DELETE)
+              ignorereadonly = FALSE;
             if (SHORT1FROMMP(mp1) == IDM_SHADOW ||
                 SHORT1FROMMP(mp1) == IDM_SHADOW2)
@@ -3143 +3333 @@
   case WM_DESTROY:
 #   ifdef FORTIFY
-    DbgMsg(pszSrcFile, __LINE__, "WM_DESTROY hwnd %p TID %u", hwnd, GetTidForThread()); // 18 Jul 08 SHL fixme
+    DbgMsg(pszSrcFile, __LINE__, "WM_DESTROY hwnd %x TID %u", hwnd, GetTidForThread()); // 18 Jul 08 SHL FIXME
 #   endif
     if (TreeCnrMenu)

trunk/dll/update.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2003, 2008 Steven H. Levine
+  Copyright (c) 2003, 2015 Steven H. Levine
 
   12 Feb 03 SHL Standardize EA math
@@ -21 +21 @@
   14 Mar 09 GKY Prevent execution of UM_SHOWME while drive scan is occuring
   22 Jul 09 GKY Code changes to use semaphores to serialize drive scanning
+  07 Aug 15 SHL Sync with Flesh/Stubby mods
+
 
 ***********************************************************************/
@@ -200 +202 @@
             PostMsg(hwndCnr, UM_RESCAN, MPVOID, MPVOID);
             if (pci->attrFile & FILE_DIRECTORY) {
-              Stubby(hwndCnr, pci);
+              AddFleshWorkRequest(hwndCnr, pci, eStubby);
             }
           }
@@ -243 +245 @@
                 if (WinSendMsg(hwndCnr,
                                CM_INSERTRECORD, MPFROMP(pci), MPFROMP(&ri))) {
-                  Flesh(hwndCnr, pci);
+                  AddFleshWorkRequest(hwndCnr, pci, eFlesh);
                   *p = temp;
                   pci = FindCnrRecord(hwndCnr,
@@ -255 +257 @@
               pciParent = pciT;
               if (!(pciT->rc.flRecordAttr & CRA_EXPANDED)) {
-                Flesh(hwndCnr, pciT);
+                AddFleshWorkRequest(hwndCnr, pciT, eFlesh);
                 *p = temp;
                 pci = FindCnrRecord(hwndCnr,
@@ -294 +296 @@
               dcd->ullTotalBytes += ullTotalBytes;
             }
-            Stubby(hwndCnr, pci);
+            AddFleshWorkRequest(hwndCnr, pci, eStubby);
           }
         }
@@ -460 +462 @@
                 repos = TRUE;
                 if (pci->attrFile & FILE_DIRECTORY) {
-                  Stubby(hwndCnr, pci);
+                  AddFleshWorkRequest(hwndCnr, pci, eStubby);
                 }
               }
@@ -559 +561 @@
                   }
                   repos = TRUE;
-                  Stubby(hwndCnr, pci);
+                  AddFleshWorkRequest(hwndCnr, pci, eStubby);
                 }
                 else