Changeset 1444

Timestamp:

Jul 23, 2009, 1:24:23 AM (16 years ago)

Author:

Gregg Young

Message:

Rework of drivebar to rescan all drives and refresh media buttons and menu items grey out inappropriate menu items. Streamline Tree scan code and use semaphores to serialize access. Add NOEASUPPORT and LOCALHD driveflag; .LONGNAME usage fixes; (Tickets 377-386)

Location:

trunk

Files:

• dll/common.c (modified) (3 diffs)
• dll/comp.c (modified) (9 diffs)
• dll/copyf.c (modified) (3 diffs)
• dll/dircnrs.c (modified) (11 diffs)
• dll/filldir.c (modified) (23 diffs)
• dll/filldir.h (modified) (2 diffs)
• dll/fm3dlg.h (modified) (2 diffs)
• dll/fm3dll.h (modified) (2 diffs)
• dll/fm3dll2.h (modified) (6 diffs)
• dll/fm3res.dlg (modified) (2 diffs)
• dll/fm3res.rc (modified) (6 diffs)
• dll/fm3str.h (modified) (2 diffs)
• dll/info.c (modified) (3 diffs)
• dll/init.c (modified) (4 diffs)
• dll/init.h (modified) (3 diffs)
• dll/key.c (modified) (7 diffs)
• dll/mainwnd.c (modified) (15 diffs)
• dll/mainwnd2.c (modified) (2 diffs)
• dll/misc.c (modified) (11 diffs)
• dll/misc.h (modified) (2 diffs)
• dll/newview.c (modified) (3 diffs)
• dll/notify.c (modified) (23 diffs)
• dll/notify.h (modified) (1 diff)
• dll/treecnr.c (modified) (23 diffs)
• dll/update.c (modified) (5 diffs)
• dll/valid.c (modified) (15 diffs)
• dll/valid.h (modified) (3 diffs)
• dll/worker.c (modified) (13 diffs)
• dll/worker.h (modified) (1 diff)
• fm3.rc (modified) (2 diffs)
• fm4.rc (modified) (2 diffs)

trunk/dll/common.c

@@ -26 +26 @@
   07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  22 Jul 09 GKY Drivebar enhancements add refresh removable, rescan all drives, drive button
+                loads drive root directory in directory container or expands drive tree
+                and rescans drive in tree container depending on container focus, greyed out
+                inappropriate menu context choices
+
 
 ***********************************************************************/
@@ -260 +265 @@
                   hwnd,
                   SetDrvProc,
-                  FM3ModHandle, DVS_FRAME, MPFROMP(dv)) && hwndTree)
-      PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
+                  FM3ModHandle, DVS_FRAME, MPFROMP(dv)) && hwndTree)
+      if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(dv), MPVOID))
+        PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
     break;
   case IDM_SIZES:
@@ -377 +383 @@
           (fEjectFlpyScan ? TRUE : parm[1] > 1) &&
           (fEjectCDScan ? TRUE : !(driveflags[parm[1]] & DRIVE_CDROM)) &&
-          (fEjectRemovableScan ? TRUE : (parm[1] < 2 || driveflags[parm[1]] & DRIVE_CDROM)))
-        PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+          (fEjectRemovableScan ? TRUE : (parm[1] < 2 || driveflags[parm[1]] & DRIVE_CDROM))) {
+        BOOL toggleTree = FALSE;
+  
+        if (!hwndTree) {
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+          toggleTree = TRUE;
+        }
+        WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+        if (toggleTree)
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+      }
+    }
+    break;
+
+  case IDM_RESCAN:
+    {
+      BOOL toggleTree = FALSE;
+
+      if (!hwndTree) {
+        WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+        toggleTree = TRUE;
+      }
+      WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+      if (toggleTree)
+        WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+    }
+    break;
+
+  case IDM_REFRESHREMOVABLES:
+    {
+      BOOL toggleTree = FALSE;
+
+      if (!hwndTree) {
+        WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+        toggleTree = TRUE;
+      }
+      WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_REFRESHREMOVABLES, 0), MPVOID);
+      if (toggleTree)
+        WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
     }
     break;

trunk/dll/comp.c

@@ -67 +67 @@
   15 Mar 09 GKY Use WriteDetailsSwitchs to save detail switch changes to the ini file.
   28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
+  13 Jul 09 SHL Sync with renames
 
 ***********************************************************************/
@@ -766 +767 @@
         SleepIfNeeded(&itdSleep, 0);
       } // while
-      WinPostMsg(cmp->hwnd, WM_TIMER, MPFROMLONG(ID_TIMER), 0); // Force update
+      WinPostMsg(cmp->hwnd, WM_TIMER, MPFROMLONG(ID_COMP_TIMER), 0);    // Force update
     Abort:
       WinDestroyMsgQueue(hmq);
@@ -822 +823 @@
 
       default:
+        // 08 Feb 09 SHL fixme to support Ctrl-click for ANDed select
         // 13 Jan 08 SHL fixme to decide if cmp->reset can ever get set
         // if not lots of code can disappear
@@ -1402 +1404 @@
   }
 
-  WinPostMsg(hwnd, WM_TIMER, MPFROMLONG(ID_TIMER), 0);  // Force update
+  WinPostMsg(hwnd, WM_TIMER, MPFROMLONG(ID_COMP_TIMER), 0);     // Force update
   DosPostEventSem(CompactSem);
 }
@@ -1883 +1885 @@
             pcil->pszDispAttr = FileAttrToString(pcil->attrFile);
             pcil->cbFile = filesl[l]->cbFile;
-            // 12 Jan 08 SHL fixme to used cached size here too
+            // 12 Jan 08 SHL fixme to use cached size here too
             CommaFmtULL(szBuf, sizeof(szBuf), pcil->cbFile, ' ');
             pcil->pszFmtFileSize = xstrdup(szBuf, pszSrcFile, __LINE__);
@@ -2246 +2248 @@
         }
       }
-      WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, ID_TIMER, 500);
+      WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, ID_COMP_TIMER, 500);
     }
     break;
@@ -2457 +2459 @@
       WinEnableWindowUpdate(hwndLeft, TRUE);
       WinEnableWindowUpdate(hwndRight, TRUE);
-      WinPostMsg(hwnd, WM_TIMER, MPFROMLONG(ID_TIMER), 0);      // Force update
+      WinPostMsg(hwnd, WM_TIMER, MPFROMLONG(ID_COMP_TIMER), 0); // Force update
       // 12 Jan 08 SHL fixme to have SetButtonEnables(COMPARE* pcmp, BOOL fEnable)
       // to replace duplicated code here and elsewhere
@@ -2884 +2886 @@
 
   case WM_COMMAND:
+    // 29 Apr 09 SHL  fixme to support more context menu items - IDM_EDIT, IDM_DELETE etc.
     switch (SHORT1FROMMP(mp1)) {
     case IDM_COMPARE:
@@ -3364 +3367 @@
     if (cmp) {
       // 17 Jan 08 SHL fixme to know if stop really needed?
-      WinStopTimer(WinQueryAnchorBlock(hwnd), hwnd, ID_TIMER);
+      WinStopTimer(WinQueryAnchorBlock(hwnd), hwnd, ID_COMP_TIMER);
       if (cmp->dcd.hwndLastMenu)
         WinDestroyWindow(cmp->dcd.hwndLastMenu);

trunk/dll/copyf.c

@@ -24 +24 @@
   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
   13 Jul 09 SHL Drop obsolete code
+  22 Jul 09 GKY Delete .LONGNAME EA if it becomes the filename on a copy or move.
 
 ***********************************************************************/
@@ -422 +423 @@
   }
   /* If root name changed make sure longname EA goes away */
-  p = RootName(oldname);
-  pp = RootName(newname);
-  if (stricmp(p, pp)) {
-    zaplong = TRUE;
+  if (*longname) {
+    p = RootName(oldname);
+    pp = RootName(longname);
+    if (stricmp(p, pp)) {
+      zaplong = TRUE;
+    }
   }
 
@@ -518 +521 @@
             DosForceDelete(dir);
           }
-          if (zaplong)
-            ZapLongName(dir);
+          if (zaplong) {
+            ret = ZapLongName(dir);
+          }
           Broadcast((HAB) 0, hwndMain, UM_UPDATERECORD, MPFROMP(dir), MPVOID);
         }

trunk/dll/dircnrs.c

@@ -65 +65 @@
   29 Mar 09 SHL Increase extended search timeout to 3 seconds
   28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
+  22 Jul 09 GKY Code changes to use semaphores to serialize drive scanning
+  22 Jul 09 SHL Cleanup of SETFOCUS code
 
 ***********************************************************************/
@@ -805 +807 @@
                             MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
           if (!pciC) {
-            if (fInitialDriveScan)
-              Stubby(dcd->hwndCnr, pci);
-            else {
-              while (StubbyScanCount != 0)
-                DosSleep(50);
-              Stubby(dcd->hwndCnr, pci);
-            }
+            Stubby(dcd->hwndCnr, pci);
           }
         }
@@ -859 +855 @@
       }
       RemoveCnrItems(dcd->hwndCnr, NULL, 0, CMA_FREE | CMA_INVALIDATE | CMA_ERASE);
-      AdjustCnrColsForFSType(dcd->hwndCnr, dcd->directory, &dcd->ds);
+      AdjustCnrColsForFSType(dcd->hwndCnr, dcd->directory, &dcd->ds, FALSE);
       dcd->ullTotalBytes = dcd->totalfiles =
         dcd->selectedfiles = dcd->selectedbytes = 0;
@@ -1348 +1344 @@
 
   case WM_SETFOCUS:
-    /*
-     * put name of our window (directory name) on status line
-     */
-    if (dcd && hwndStatus && mp2) {
-
+    /* put name of our window (directory name) on status line */
+    if (mp2) {
+      // Getting focus
+      if (dcd && hwndStatus) {
+        /* put name of our window (directory name) on status line */
       PCNRITEM pci = NULL;
-
       if (fAutoView && hwndMain) {
         pci = WinSendMsg(hwnd, CM_QUERYRECORDEMPHASIS, MPFROMLONG(CMA_FIRST),
@@ -1374 +1369 @@
         PostMsg(hwndMain, UM_ADVISEFOCUS, MPFROMLONG(dcd->hwndFrame), MPVOID);
     }
-    if (mp2) {
+
       LastDir = hwnd;
       PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
+
       if (fSwitchTreeOnFocus && hwndTree && dcd && *dcd->directory) {
         PSZ pszTempDir = xstrdup(dcd->directory, pszSrcFile, __LINE__);
-
         if (pszTempDir) {
           if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
-            free(pszTempDir);
+            free(pszTempDir);           // Failed
         }
       }
@@ -1451 +1446 @@
                            CM_QUERYRECORDEMPHASIS,
                            MPFROMLONG(CMA_FIRST), MPFROMSHORT(CRA_CURSORED));
-          if (pci && (INT) pci != -1) {
+          if (pci && (INT) pci != -1) {
             if (fSplitStatus && hwndStatus2) {
               CommaFmtULL(tb, sizeof(tb), pci->cbFile + pci->easize, ' ');
@@ -1601 +1596 @@
         WinEnableMenuItem(DirCnrMenu, IDM_FINDINTREE, (hwndTree != (HWND) 0));
       }
-      PostMsg(hwnd, UM_SETUP2, MPVOID, MPVOID);
+      if (!fInitialDriveScan)
+        PostMsg(hwnd, UM_SETUP2, MPVOID, MPVOID);
     }
     else {
@@ -1618 +1614 @@
       SayView(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
                               DIR_VIEW), dcd->flWindowAttr);
-      //DbgMsg(pszSrcFile, __LINE__, "UM_SETUP2 %p pci %p", hwnd, dcd);
     } else
       PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
@@ -2424 +2419 @@
 
       case IDM_SWITCH:
-        if (mp2) {
+        if (mp2) {
           strcpy(dcd->previous, dcd->directory);
-          strcpy(dcd->directory, (CHAR *)mp2);
+          strcpy(dcd->directory, (CHAR *)mp2);
           //DosEnterCritSec(); // GKY 11-27-08
           dcd->stopflag++;
-          //DosExitCritSec();
+          //DosExitCritSec();
           if (!PostMsg(dcd->hwndObject, UM_RESCAN, MPVOID, MPFROMLONG(1L))) {
             strcpy(dcd->directory, dcd->previous);
@@ -3484 +3479 @@
     break;
 
+  case WM_TIMER:
+    return ActionWMTimer(hwnd, mp1, mp2);
+
   case WM_CLOSE:
     WinSendMsg(hwnd, WM_SAVEAPPLICATION, MPVOID, MPVOID);
@@ -3629 +3627 @@
       /* Got match make found item current item */
       USHORT attrib = CRA_CURSORED;
+      // 29 Mar 09 SHL fixme to clear other object select if not extended select
       if (!stricmp(pci->pszDisplayName, dcd->szCommonName))
         attrib |= CRA_SELECTED;

trunk/dll/filldir.c

@@ -75 +75 @@
                 for tree container
   13 Jul 09 SHL Avoid trap in FillInRecordFromFSA if pszFSType NULL
+  22 Jul 09 GKY Code changes to use semaphores to serialize drive scanning
+  22 Jul 09 GKY Consolidated driveflag setting code in DriveFlagsOne
+  22 Jul 09 GKY Streamline scanning code for faster Tree rescans
 
 ***********************************************************************/
@@ -132 +135 @@
 PCSZ FM3Tools   = "<FM3_Tools>";
 PCSZ WPProgram  = "WPProgram";
-volatile INT StubbyScanCount;
-volatile INT ProcessDirCount;
 
 typedef struct {
@@ -220 +221 @@
       hmq = WinCreateMsgQueue(thab, 0);
       if (hmq) {
-        StubbyScanCount++;
         IncrThreadUsage();
         priority_normal();
         ret = Stubby(StubbyScan->hwndCnr, StubbyScan->pci);
-        //DbgMsg(pszSrcFile, __LINE__, "Stubby %i ", ret);
         if (ret == 1) {
           if (WinIsWindow((HAB)0, StubbyScan->hwndCnr)) {
-            WinSendMsg(StubbyScan->hwndCnr,
-                       CM_INVALIDATERECORD,
-                       MPFROMP(&StubbyScan->pci),
-                       MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
-            if ((fRScanLocal &&
-                (!(driveflags[toupper(*StubbyScan->pci->pszFileName) - 'A'] &
-                   ((DRIVE_REMOTE | DRIVE_VIRTUAL)))) ||
-                 (fRScanRemote &&
-                  (driveflags[toupper(*StubbyScan->pci->pszFileName) - 'A'] &
-                   DRIVE_REMOTE)) ||
-                 (fRScanVirtual &&
-                  (driveflags[toupper(*StubbyScan->pci->pszFileName) - 'A'] &
-                   DRIVE_VIRTUAL))) && fInitialDriveScan) {
-              if (!(driveflags[toupper(*StubbyScan->pci->pszFileName) - 'A'] &
-                    ((fRScanNoWrite ? 0 : DRIVE_NOTWRITEABLE) |
-                     (fRScanSlow ? 0 : DRIVE_SLOW)))) {
-                WinSendMsg(StubbyScan->hwndCnr, CM_EXPANDTREE, MPFROMP(StubbyScan->pci), MPVOID);
-                //DbgMsg(pszSrcFile, __LINE__, "expanded %x %p", StubbyScan->hwndCnr, StubbyScan->pci);
-                WinSendMsg(StubbyScan->hwndCnr, CM_COLLAPSETREE, MPFROMP(StubbyScan->pci), MPVOID);
+            ULONG flags = driveflags[toupper(*StubbyScan->pci->pszFileName) - 'A'];
+
+            if (((fRScanLocal && ~flags & DRIVE_REMOTE && ~flags & DRIVE_VIRTUAL) ||
+                 (fRScanRemote && flags & DRIVE_REMOTE) ||
+                 (fRScanVirtual && flags & DRIVE_VIRTUAL)) && fInitialDriveScan) {
+              if (!(flags & ((fRScanNoWrite ? 0 : DRIVE_NOTWRITEABLE) |
+                             (fRScanSlow ? 0 : DRIVE_SLOW)))) {
+                UnFlesh(StubbyScan->hwndCnr, StubbyScan->pci);
+                Flesh(StubbyScan->hwndCnr, StubbyScan->pci);
               }
             }
           }
         }
-        if (WinIsWindow((HAB)0, StubbyScan->hwndDrivesList)) {
-          WinSendMsg(StubbyScan->hwndDrivesList,
-                     LM_INSERTITEM,
-                     MPFROM2SHORT(LIT_SORTASCENDING, 0),
-                     MPFROMP(StubbyScan->pci->pszFileName));
-        }
-        StubbyScanCount--;
         WinDestroyMsgQueue(hmq);
       }
@@ -268 +250 @@
 #  endif
 
-  // _endthread();                      // 10 Dec 08 SHL
 }
 
@@ -276 +257 @@
   HAB thab;
   HMQ hmq = (HMQ) 0;
-  //BOOL ret;
 
   DosError(FERR_DISABLEHARDERR);
@@ -290 +270 @@
       hmq = WinCreateMsgQueue(thab, 0);
       if (hmq) {
-        ProcessDirCount ++;
         IncrThreadUsage();
         priority_normal();
@@ -303 +282 @@
                          ProcessDir->pulTotalFiles,     // Optional
                          ProcessDir->pullTotalBytes);   // Optional
-        ProcessDirCount --;
         WinDestroyMsgQueue(hmq);
       }
@@ -315 +293 @@
 #  endif
 
-  // _endthread();                      // 10 Dec 08 SHL
 }
 
@@ -433 +410 @@
   ULONG flags = driveflags[toupper(*pci->pszFileName) - 'A'];
   BOOL fLoadSubjectForDrive = fLoadSubject && ~flags & DRIVE_NOLOADSUBJS;
-  BOOL fLoadLongNameForDrive = fLoadLongnames &&  ~flags & DRIVE_NOLONGNAMES &&
+  BOOL fLoadLongNameForDrive = fLoadLongnames &&  //~flags & DRIVE_NOLONGNAMES &&
                                ~flags & DRIVE_NOLOADLONGS;
   if (fLoadSubjectForDrive || fLoadLongNameForDrive) {
@@ -580 +557 @@
 
   // load Subject and/or Longname EAs, if required and have EAs
-  if (pffb->cbList > 4L && dcd)
+  if (pffb->cbList > 4L && dcd &&
+      !(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOEASUPPORT))
     FetchCommonEAs(pci);
 
@@ -741 +719 @@
   // 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 && pszFSType)
+  if (pfsa4->cbList > 4L && dcd &&
+      !(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOEASUPPORT))
     FetchCommonEAs(pci);
 
@@ -827 +806 @@
 #   endif
   }
-  else
+  else {
     pci->pszFmtFileSize = NullStr;
+    //DbgMsg(pszSrcFile, __LINE__, "Bypassed Format size %s", pci->pszDisplayName);
+  }
   pci->date.day = pfsa4->fdateLastWrite.day;
   pci->date.month = pfsa4->fdateLastWrite.month;
@@ -1182 +1163 @@
     while (pci && (INT)pci != -1) {
       if ((pci->attrFile & FILE_DIRECTORY))
-        if (!fInitialDriveScan)
-          Stubby(hwndCnr, pci);
-        else {
-          while (StubbyScanCount != 0)
-            DosSleep(50);
-          Stubby(hwndCnr, pci);
-        }
+        Stubby(hwndCnr, pci);
       pci = WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pci),
                        MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
@@ -1236 +1211 @@
   ULONG ulDriveType;
   PCNRITEM pci, pciFirst = NULL, pciNext, pciParent = NULL;
-  INT x, removable;
+  INT x;// removable;
   CHAR suggest[32];
   CHAR szDrive[] = " :\\";
@@ -1303 +1278 @@
       ULONG flags = 0;
       ULONG size = sizeof(ULONG);
-      BOOL FSInfo = FALSE;
       struct {
               ULONG serial;
@@ -1321 +1295 @@
         if (!(driveflags[x] & DRIVE_NOPRESCAN)) {
           *szFSType = 0;
-          ulDriveType = 0;
-          removable = CheckDrive(*szDrive, szFSType, &ulDriveType);
-          driveserial[x] = -1;
-          if (removable != -1) {
-            DosError(FERR_DISABLEHARDERR);
-            if (!DosQueryFSInfo((ULONG) x + 1,
-                                FSIL_VOLSER, &volser, sizeof(volser))) {
-              driveserial[x] = volser.serial;
-              FSInfo = TRUE;
-            }
-
-          }
-          else
-            driveflags[x] |= DRIVE_INVALID;
-
+          ulDriveType = 0;
+          memset(&volser, 0, sizeof(volser));
+          DriveFlagsOne(x, szFSType, &volser);
+          driveserial[x] = volser.serial;
           memset(&fsa4, 0, sizeof(FILESTATUS4L));
-          driveflags[x] |= removable == -1 || removable == 1 ? DRIVE_REMOVABLE : 0;
-          if (ulDriveType & DRIVE_REMOTE)
-            driveflags[x] |= DRIVE_REMOTE;
-          if (!stricmp(szFSType,RAMFS)) {
-            driveflags[x] |= DRIVE_RAMDISK;
-            driveflags[x] &= ~DRIVE_REMOTE;
-          }
-          if (!stricmp(szFSType,NDFS32)) {
-            driveflags[x] |= DRIVE_VIRTUAL;
-            driveflags[x] &= ~DRIVE_REMOTE;
-          }
-          if (!stricmp(szFSType,NTFS))
-            driveflags[x] |= DRIVE_NOTWRITEABLE;
-          if (strcmp(szFSType, HPFS) &&
-              strcmp(szFSType, JFS) &&
-              strcmp(szFSType, ISOFS) &&
-              strcmp(szFSType, CDFS) &&
-              strcmp(szFSType, FAT32) &&
-              strcmp(szFSType, NDFS32) &&
-              strcmp(szFSType, RAMFS) &&
-              strcmp(szFSType, NTFS) &&
-              strcmp(szFSType, HPFS386)) {
-            driveflags[x] |= DRIVE_NOLONGNAMES;
-          }
-
-          if (!strcmp(szFSType, CDFS) || !strcmp(szFSType,ISOFS)) {
-            removable = 1;
-            driveflags[x] |= DRIVE_REMOVABLE | DRIVE_NOTWRITEABLE | DRIVE_CDROM;
-          }
-          if (!stricmp(szFSType, CBSIFS)) {
-            driveflags[x] |= DRIVE_ZIPSTREAM;
-            driveflags[x] &= ~DRIVE_REMOTE;
-            if (ulDriveType & DRIVE_REMOVABLE)
-              driveflags[x] |= DRIVE_REMOVABLE;
-            if (!(ulDriveType & DRIVE_NOLONGNAMES))
-              driveflags[x] &= ~DRIVE_NOLONGNAMES;
-          }
           if (!fVerifyOffChecked[x]) {
             if (driveflags[x] & DRIVE_REMOVABLE)
@@ -1385 +1311 @@
             }
           }
-          if (strcmp(volser.volumelabel, NullStr) != 0 && FSInfo && fShowDriveLabelInTree)
+          if (stricmp(volser.volumelabel, NullStr) != 0 && fShowDriveLabelInTree)
             strcpy(szFSType, volser.volumelabel);
           pci->rc.flRecordAttr |= CRA_RECORDREADONLY;
@@ -1391 +1317 @@
             pci->rc.flRecordAttr |= (CRA_CURSORED | CRA_SELECTED);
 
-          if (removable == 0) {
+          if (!(driveflags[x] & DRIVE_REMOVABLE)) {
             // Fixed volume
             pci->attrFile |= FILE_DIRECTORY;
@@ -1622 +1548 @@
                                 MPVOID,
                                 MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
-    StubbyScanCount ++;
     while (pci && (INT)pci != -1) {
       stubbyScan = xmallocz(sizeof(STUBBYSCAN), pszSrcFile, __LINE__);
@@ -1630 +1555 @@
       stubbyScan->hwndCnr = hwndCnr;
       stubbyScan->hwndDrivesList = hwndDrivesList;
-      //stubbyScan->RamDrive = FALSE;
       pciNext = (PCNRITEM) WinSendMsg(hwndCnr,
                                       CM_QUERYRECORD,
@@ -1650 +1574 @@
             {
               xfree(stubbyScan, pszSrcFile, __LINE__);
-            }
+            }
           } // if drive for scanning
           else
@@ -1671 +1595 @@
       pci = pciNext;
     } // while
-    StubbyScanCount--;
   }
   if (hwndParent)
@@ -1766 +1689 @@
   }
   didonce = TRUE;
-  if (fInitialDriveScan) {
-    HWND hwndDrivesList = WinWindowFromID(WinQueryWindow(hwndParent, QW_PARENT),
-                                          MAIN_DRIVELIST);
-    while (StubbyScanCount != 0 || ProcessDirCount != 0)
-      DosSleep(50);
-    WinShowWindow(hwndCnr, TRUE);
-    WinShowWindow(hwndDrivesList, TRUE);
-    fInitialDriveScan = FALSE;
-  }
 } // FillTreeCnr
 

trunk/dll/filldir.h

@@ -13 +13 @@
   08 Mar 09 GKY Additional strings move to PCSZs
   06 Jun 09 GKY Add option to show file system type or drive label in tree
+  22 Jul 09 GKY Code changes to use semaphores to serialize drive scanning
 
 ***********************************************************************/
@@ -61 +62 @@
 extern HPOINTER hptrReadonly;
 extern HPOINTER hptrSystem;
-extern volatile INT StubbyScanCount;
-extern volatile INT ProcessDirCount;
 
 typedef struct {

trunk/dll/fm3dlg.h

@@ -32 +32 @@
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
   06 Jun 09 GKY Add option to show file system type or drive label in tree
+  22 Jul 09 GKY Check if drives support EAs add driveflag for this
+  22 Jul 09 GKY Add LocalHD driveflag
 
 ***********************************************************************/
@@ -920 +922 @@
 #define DVS_SLOW                                                                                        27014
 #define DVS_INCLUDEFILES                                                                27015
-#define DVS_VIRTUAL                                                                             27016
-#define DVS_NOSTATS                                                                             27017
-#define DVS_RAMDISK                                                                             27018
-#define DVS_WRITEVERIFYOFF                                                                      27019
-#define DVS_RSCANNED                                                                            27020
-
-#define MRG_FRAME                                                                                       27100
+#define DVS_VIRTUAL                                                                     27016
+#define DVS_NOSTATS                                                                     27017
+#define DVS_RAMDISK                                                                     27018
+#define DVS_WRITEVERIFYOFF                                                              27019
+#define DVS_RSCANNED                                                                    27020
+#define DVS_LOCALHD                                                                     27021
+#define DVS_NOEASUPPORT                                                                 27022
+
+#define MRG_FRAME                                                                       27100
 #define MRG_LISTBOX                                                                             27101
 #define MRG_TOP                                                                                 27102

trunk/dll/fm3dll.h

@@ -90 +90 @@
   25 Dec 08 GKY Add DRIVE_RSCANNED flag to monitor for the first recursive drive scan per session
                 to prevent duplicate directory names in tree following a copy before initial scan.
+  22 Jul 09 GKY Drivebar enhancements add refresh removable, rescan all drives, drive button
+                loads drive root directory in directory container or expands drive tree
+                and rescans drive in tree container depending on container focus, greyed out
+                inappropriate menu context choices
 
 ***********************************************************************/
@@ -151 +155 @@
 #define DRIVE_WRITEVERIFYOFF 0x00040000
 #define DRIVE_RSCANNED      0x00080000
+#define DRIVE_LOCALHD       0x00200000
+#define DRIVE_NOEASUPPORT   0x00400000
 
 #define SORT_FIRSTEXTENSION 0x00000001

trunk/dll/fm3dll2.h

@@ -26 +26 @@
   28 Dec 08 GKY Added Databar to utilities menu
   27 Jun 09 GKY Remove IDM_DRIVEATEXT (3950) Drivebar update
+  13 Jul 09 SHL Rename timer ids
 
   Align with spaces only - no tabs please
@@ -53 +54 @@
 #define MAIN_TRASHCAN       98
 
-#define ID_TIMER            4
 #define ID_STICK1           5
 #define ID_STICK2           6
@@ -64 +64 @@
 #define ID_STICK42          13
 #define ID_STICK52          14
-#define ID_TIMER2           15
-#define ID_TIMER3           16
-
-#define ID_TIMER4           19
-#define ID_TIMER5           20
-#define ID_TIMER6           21
+
+// 13 Jul 09 SHL fixme to know if timer ids unique to queue or window
+// WM_TIMER timer ids - assume ids can be shared
+#define ID_ABOUT_TIMER      4
+#define ID_COMP_TIMER       4
+#define ID_NOTIFY_TIMER     15
+// #define ID_TIMER3           16       // 13 Jul 09 SHL Dropped
+#define ID_ACTION_TIMER     16          // 13 Jul 09 SHL Added
+// #define ID_TIMER4           19       // 13 Jul 09 SHL Dropped
+#define ID_NEWVIEW_TIMER    20
+// #define ID_TIMER6           21       // 13 Jul 09 SHL Dropped
 
 #define MAIN_STATUS2        19
@@ -202 +207 @@
 #define VIRTUAL_ICON        925
 #define RAMDISK_ICON        926
+#define DONNO_ICON          927
 
 #define IDM_HELPMOUSE       987
@@ -560 +566 @@
 #define IDM_LOADTOOLS       6013
 
+#define IDM_RESCANALL       7000
+#define IDM_REFRESHREMOVABLE 7001
+
 #define IDM_WINDOWSMENU     9000
 #define IDM_TILE            9001
@@ -692 +701 @@
 // #define UM_BUTTON2UP        (WM_USER + 33)           // Unused, 13 Sep 08 JBS
 #define UM_COLLECTFROMFILE  (WM_USER + 34)
-#define UM_TIMER            (WM_USER + 35)
+#define UM_TIMER            (WM_USER + 35)              // 13 Jul 09 SHL fixme to have better name
 // #define UM_HELPON           (WM_USER + 36)           // Unused, 13 Sep 08 JBS
 #define UM_SETUP2           (WM_USER + 37)

trunk/dll/fm3res.dlg

@@ -45 +45 @@
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
   06 Jun 09 GKY Add option to show file system type or drive label in tree
+  22 Jul 09 GKY Check if drives support EAs add driveflag for this
+  22 Jul 09 GKY Add LocalHD driveflag (enlarge draveflag dialog)
 
 ***********************************************************************/
@@ -2015 +2017 @@
 DLGTEMPLATE DVS_FRAME LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "FM/2: Drive flags", DVS_FRAME, 12, 6, 218, 136, WS_VISIBLE,
+    DIALOG  "FM/2: Drive flags", DVS_FRAME, 12, 6, 218, 156, WS_VISIBLE,
             FCF_TITLEBAR
     BEGIN
-        CHECKBOX       "Virtual Drive", DVS_VIRTUAL, 4, 126, 94, 10,
+        CHECKBOX       "Local Hard Drive", DVS_LOCALHD, 4, 142, 94, 10,
                         BS_NOPOINTERFOCUS | NOT WS_TABSTOP
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00808080L
-        CHECKBOX        "Removable", DVS_REMOVABLE, 4, 114, 94, 10,
+        CHECKBOX       "Virtual Drive", DVS_VIRTUAL, 4, 130, 94, 10,
                         BS_NOPOINTERFOCUS | NOT WS_TABSTOP
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00808080L
-        CHECKBOX        "RAMDISK", DVS_RAMDISK, 4, 102, 98, 10,
+        CHECKBOX        "Removable", DVS_REMOVABLE, 4, 118, 94, 10,
                         BS_NOPOINTERFOCUS | NOT WS_TABSTOP
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00808080L
-        CHECKBOX        "Remote Drive", DVS_REMOTE, 4, 90, 94, 10,
+        CHECKBOX        "RAMDISK", DVS_RAMDISK, 4, 106, 94, 10,
                         BS_NOPOINTERFOCUS | NOT WS_TABSTOP
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00808080L
-        CHECKBOX        "CD-ROM", DVS_CDROM, 4, 78, 94, 10,
+        CHECKBOX        "Remote Drive", DVS_REMOTE, 4, 94, 94, 10,
                         BS_NOPOINTERFOCUS | NOT WS_TABSTOP
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00808080L
-        CHECKBOX        "Zipstream", DVS_ZIPSTREAM, 4, 66, 94, 10,
+        CHECKBOX        "CD-ROM", DVS_CDROM, 4, 82, 94, 10,
                         BS_NOPOINTERFOCUS | NOT WS_TABSTOP
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00808080L
-        CHECKBOX        "Ignore", DVS_IGNORE, 4, 54, 94, 10,
+        CHECKBOX        "Zipstream", DVS_ZIPSTREAM, 4, 70, 94, 10,
                         BS_NOPOINTERFOCUS | NOT WS_TABSTOP
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00808080L
-        CHECKBOX        "Boot drive", DVS_BOOT, 4, 42, 94, 10,
+        CHECKBOX        "Ignore", DVS_IGNORE, 4, 58, 94, 10,
                         BS_NOPOINTERFOCUS | NOT WS_TABSTOP
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00808080L
-        CHECKBOX        "Invalid", DVS_INVALID, 4, 30, 94, 10,
+        CHECKBOX        "Boot drive", DVS_BOOT, 4, 46, 94, 10,
                         BS_NOPOINTERFOCUS | NOT WS_TABSTOP
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00808080L
-        CHECKBOX        "Recursive scan done", DVS_RSCANNED, 4, 18, 94, 10,
+        CHECKBOX        "Invalid", DVS_INVALID, 4, 34, 94, 10,
                         BS_NOPOINTERFOCUS | NOT WS_TABSTOP
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00808080L
-        CHECKBOX        "Not writeable", DVS_NOTWRITEABLE, 106, 126, 94, 10,
+        CHECKBOX        "Recursive scan done", DVS_RSCANNED, 4, 22, 94, 10,
                         BS_NOPOINTERFOCUS | NOT WS_TABSTOP
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00808080L
-        CHECKBOX        "~No longnames", DVS_NOLONGNAMES, 106, 114, 94, 10,
+        CHECKBOX       "No EA support", DVS_NOEASUPPORT, 106, 142, 94, 10,
+                        BS_NOPOINTERFOCUS | NOT WS_TABSTOP
+                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00808080L                
+        CHECKBOX        "Not writeable", DVS_NOTWRITEABLE, 106, 130, 94, 10,
                         BS_NOPOINTERFOCUS | NOT WS_TABSTOP
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00808080L
-        AUTOCHECKBOX    "No ~Prescan", DVS_NOPRESCAN, 106, 102, 94, 10,
-                        BS_NOPOINTERFOCUS | NOT WS_TABSTOP
-        AUTOCHECKBOX    "~Don't load icons", DVS_NOLOADICONS, 106, 90, 94,10, BS_NOPOINTERFOCUS
-        AUTOCHECKBOX    "Don't load ~subjects", DVS_NOLOADSUBJS, 106, 78, 94,10, BS_NOPOINTERFOCUS
-        AUTOCHECKBOX    "Don't load ~longnames", DVS_NOLOADLONGS, 106, 66,106, 10, BS_NOPOINTERFOCUS
-        AUTOCHECKBOX    "Slo~w drive", DVS_SLOW, 106, 54, 94, 10, BS_NOPOINTERFOCUS
-        AUTOCHECKBOX    "Include ~files in tree", DVS_INCLUDEFILES, 106, 42,106, 10, BS_NOPOINTERFOCUS
-        AUTOCHECKBOX    "~No drive stats", DVS_NOSTATS, 106, 30, 106, 10, BS_NOPOINTERFOCUS
-        AUTOCHECKBOX    "Write ~verify off", DVS_WRITEVERIFYOFF, 106, 18, 106, 10, BS_NOPOINTERFOCUS
+        CHECKBOX        "~No longnames", DVS_NOLONGNAMES, 106, 118, 94, 10,
+                        BS_NOPOINTERFOCUS | NOT WS_TABSTOP
+                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00808080L
+        AUTOCHECKBOX    "No ~Prescan", DVS_NOPRESCAN, 106, 106, 94, 10,
+                        BS_NOPOINTERFOCUS | NOT WS_TABSTOP
+        AUTOCHECKBOX    "~Don't load icons", DVS_NOLOADICONS, 106, 94, 94,10, BS_NOPOINTERFOCUS
+        AUTOCHECKBOX    "Don't load ~subjects", DVS_NOLOADSUBJS, 106, 82, 94,10, BS_NOPOINTERFOCUS
+        AUTOCHECKBOX    "Don't load ~longnames", DVS_NOLOADLONGS, 106, 70,106, 10, BS_NOPOINTERFOCUS
+        AUTOCHECKBOX    "Slo~w drive", DVS_SLOW, 106, 58, 94, 10, BS_NOPOINTERFOCUS
+        AUTOCHECKBOX    "Include ~files in tree", DVS_INCLUDEFILES, 106, 46,106, 10, BS_NOPOINTERFOCUS
+        AUTOCHECKBOX    "~No drive stats", DVS_NOSTATS, 106, 34, 106, 10, BS_NOPOINTERFOCUS
+        AUTOCHECKBOX    "Write ~verify off", DVS_WRITEVERIFYOFF, 106, 22, 106, 10, BS_NOPOINTERFOCUS
         DEFPUSHBUTTON   "Okay", DID_OK, 4, 4, 40, 14, BS_NOPOINTERFOCUS | WS_GROUP
         PUSHBUTTON      "~Help", IDM_HELP, 64, 4, 40, 14, BS_NOPOINTERFOCUS

trunk/dll/fm3res.rc

@@ -49 +49 @@
   06 Jun 09 GKY Status line to show file sys/label not shown in tree; shortened to fit split status
   06 Jul 09 SHL Error message for Refactor .LONGNAME and .SUBJECT EA fetch to FetchCommonEAs
+  22 Jul 09 GKY Drivebar enhancements add refresh removable, rescan all drives, drive button
+                loads drive root directory in directory container or expands drive tree
+                and rescans drive in tree container depending on container focus, greyed out
+                inappropriate menu context choices
 
 ***********************************************************************/
@@ -389 +393 @@
          MENUITEM "",                -1,       MIS_SEPARATOR
          MENUITEM "~Rescan\tCtrl + R",       IDM_RESCAN
-         MENUITEM "~Refresh Removable Media",  IDM_REFRESHREMOVABLES
+         MENUITEM "Refresh Remo~vable Media",  IDM_REFRESHREMOVABLES
          MENUITEM "",                  -1,                 MIS_SEPARATOR
          MENUITEM "~.Parent\tCtrl + .",      IDM_PARENT
@@ -1036 +1040 @@
   MENUITEM "",                -1,       MIS_SEPARATOR
   MENUITEM "~Rescan\tCtrl + R",   IDM_RESCAN
-  MENUITEM "~Refresh Removable Media",  IDM_REFRESHREMOVABLES
+  MENUITEM "Refresh Remo~vable Media",  IDM_REFRESHREMOVABLES
   MENUITEM "",                -1,       MIS_SEPARATOR
   MENUITEM "~Filter...\tCtrl + f",IDM_FILTER
@@ -1340 +1344 @@
   MENUITEM "",                -1,       MIS_SEPARATOR
   MENUITEM "~Rescan",           IDM_UPDATE
-  MENUITEM "~Refresh Removable Media",  IDM_REFRESHREMOVABLES
+  MENUITEM "Refresh Remo~vable Media",  IDM_REFRESHREMOVABLES
   MENUITEM "",                -1,       MIS_SEPARATOR
   SUBMENU  "E~xpand/Collapse",  IDM_EXPANDSUBMENU
@@ -1395 +1399 @@
   MENUITEM "~Lock",           IDM_LOCK
   MENUITEM "U~nlock",         IDM_UNLOCK
+  MENUITEM "",                -1,       MIS_SEPARATOR
+  MENUITEM "Re~scan all drives",           IDM_RESCAN
+  MENUITEM "Refresh Remo~vable Media",  IDM_REFRESHREMOVABLES
 }
 
@@ -3277 +3284 @@
     IDS_DRAGDROPDIALOGTEXT                "Drag & Drop Dialog"
     IDS_ERROREATYPETEXT                   "EA type 0x%x unexpected for %.*s"
+    IDS_RESCANALLDRIVESTEXT               "Rescan all drives"
+    IDS_REFRESHREMOVABLESTEXT             "Refresh removable media"
 
     // Add strings that need to be combined by GetPString here

trunk/dll/fm3str.h

@@ -32 +32 @@
   06 Jun 09 GKY Status line to show file sys/label not shown in tree; shortened to fit split status
   06 Jul 09 SHL Error message for Refactor .LONGNAME and .SUBJECT EA fetch to FetchCommonEAs
+  22 Jul 09 GKY Drivebar enhancements add refresh removable, rescan all drives, drive button
+                loads drive root directory in directory container or expands drive tree
+                and rescans drive in tree container depending on container focus, greyed out
+                inappropriate menu context choices
 
 ***********************************************************************/
@@ -1002 +1006 @@
 #define IDS_DRAGDROPDIALOGTEXT                               1013
 #define IDS_ERROREATYPETEXT                                  1014
+#define IDS_RESCANALLDRIVESTEXT                              1015
+#define IDS_REFRESHREMOVABLESTEXT                            1016
 
 //The following strings were cut up form the string of the root name (ie IDS_SUGGEST1TEXT)

trunk/dll/info.c

@@ -34 +34 @@
   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
   12 Jul 09 GKY Remove code to update recursive scan setting which isn't user setable
+  22 Jul 09 GKY Check if drives support EAs add driveflag for this
+  22 Jul 09 GKY Add LocalHD driveflag
 
 ***********************************************************************/
@@ -929 +931 @@
       sprintf(s, GetPString(IDS_DRIVEFLAGSTITLETEXT), toupper(*(CHAR *)mp2));
       WinSetWindowText(hwnd, s);
-/*
-        WinEnableWindow(WinWindowFromID(hwnd,DVS_REMOVABLE),FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd,DVS_NOTWRITEABLE),FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd,DVS_IGNORE),FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd,DVS_CDROM),FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd,DVS_NOLONGNAMES),FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd,DVS_REMOTE),FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd,DVS_VIRTUAL),FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd,DVS_RAMDISK),FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd,DVS_BOOT),FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd,DVS_INVALID),FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd,DVS_ZIPSTREAM),FALSE);
-        WinEnableWindow(WinWindowFromID(hwnd,DVS_NOSTATS),FALSE);
-*/
       PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
     }
@@ -989 +977 @@
                      ((driveflags[drive] & DRIVE_WRITEVERIFYOFF) != 0));
       WinCheckButton(hwnd,DVS_RSCANNED,
-                     ((driveflags[drive] & DRIVE_RSCANNED) != 0));
+                     ((driveflags[drive] & DRIVE_RSCANNED) != 0));
+      WinCheckButton(hwnd,DVS_LOCALHD,
+                     ((driveflags[drive] & DRIVE_LOCALHD) != 0));
+      WinCheckButton(hwnd,DVS_NOEASUPPORT,
+                     ((driveflags[drive] & DRIVE_NOEASUPPORT) != 0));
     }
     return 0;

trunk/dll/init.c

@@ -82 +82 @@
   28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
+  22 Jul 09 GKY Code changes to use semaphores to serialize drive scanning
+  22 Jul 09 GKY Fix failure to restore the notebook setting for saving container states or not
 
 ***********************************************************************/
@@ -180 +182 @@
 HMTX hmtxFM2Delete;
 HMTX hmtxFM2Globals;
+HMTX hmtFillingTreeCnr;
+HEV  hevInitialCnrScanComplete;
 ULONG OS2ver[2];
 PFNWP PFNWPCnr;
@@ -1088 +1092 @@
   if (DosCreateMutexSem(NULL, &hmtxFM2Delete, 0L, FALSE))
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-              PCSZ_DOSCREATEMUTEXSEM);
+              PCSZ_DOSCREATEMUTEXSEM);
+  if (DosCreateMutexSem(NULL, &hmtFillingTreeCnr, 0L, FALSE))
+    Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_DOSCREATEMUTEXSEM);
+  if (DosCreateEventSem(NULL, &hevInitialCnrScanComplete, 0L, FALSE))
+    Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_DOSCREATEMUTEXSEM);
 
   /*
@@ -1382 +1392 @@
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "ConfirmDelete", &fConfirmDelete, &size);
-  /*size = sizeof(BOOL);   Replaced by UM_SHOWME check 3/14/09 GKY
+  size = sizeof(BOOL);  
   PrfQueryProfileData(fmprof, FM3Str, "SaveState", &fSaveState, &size);
-  if (fSaveState && (fSwitchTreeOnFocus || fSwitchTree) &&
-      (!strcmp(realappname, FM3Str) || !strcmp(realappname, "FM/4"))) {
-    CHAR szKey[STATE_NAME_MAX_BYTES + 80];
-    CHAR szDir[CCHMAXPATH];
-    ULONG drvNum;
-
-    if (!strcmp(realappname, "FM/4"))
-      strcpy(szKey, "FM/4 Dir1");
-    else
-      sprintf(szKey, "%s.DirCnrDir.0", PCSZ_SHUTDOWNSTATE);
-    size = sizeof(szDir);
-    if (PrfQueryProfileData(fmprof, appname, szKey, szDir, &size)) {
-      drvNum = toupper(*szDir) - 'A';
-      fDrivetoSkip[drvNum] = TRUE;
-    }
-  } */
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "SyncUpdates", &fSyncUpdates, &size);

trunk/dll/init.h

@@ -18 +18 @@
   07 Feb 09 GKY Add *DateFormat functions to format dates based on locale
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  22 Jul 09 GKY Drivebar enhancements add refresh removable, rescan all drives, drive button
+                loads drive root directory in directory container or expands drive tree
+                and rescans drive in tree container depending on container focus, greyed out
+                inappropriate menu context choices
 
 ***********************************************************************/
@@ -172 +176 @@
 extern BOOL fReminimize;
 extern BOOL fWantFirstTimeInit;
-// extern BOOL fDrivetoSkip[26];
 extern HPOINTER hptrApp;
 extern HPOINTER hptrArc;
@@ -195 +198 @@
 extern HMTX hmtxFM2Globals;
 extern HMTX hmtxFM2Delete;
-//extern HEV  DriveScanStart;
+extern HMTX hmtFillingTreeCnr;
+extern HEV  hevInitialCnrScanComplete;
 
 #endif // INIT_H

trunk/dll/key.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004 Steven H. Levine
+  Copyright (c) 2004, 2009 Steven H. Levine
 
   Revisions
@@ -13 +13 @@
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
-
+  13 Jul 09 SHL Sync with renames
 
 ***********************************************************************/
@@ -51 +51 @@
   static HAB hab = 0;
   BOOL no = FALSE;
-  static BOOL pause = FALSE;
-  static INT width, direction, ticktock, counter = 0;
+  static BOOL noanimation;
+  static INT width, direction, ticktock, counter;
   static HPOINTER stick1, stick2, stick3, stick4, stick12, stick22, stick32,
     stick42, stick5, stick52;
@@ -63 +63 @@
     }
     if (mp2)
-      pause = TRUE;
+      noanimation = TRUE;
     else
-      pause = FALSE;
+      noanimation = FALSE;
     AboutBox = hwnd;
     hab = WinQueryAnchorBlock(hwnd);
@@ -80 +80 @@
     if (!strcmp(realappname, "FM/4"))
       WinSetDlgItemText(hwnd, ABT_PROGNAME, GetPString(IDS_FM2LITETEXT));
-    if (!pause) {
+    if (!noanimation) {
       stick1 = WinLoadPointer(HWND_DESKTOP, FM3ModHandle, ID_STICK1);
       stick2 = WinLoadPointer(HWND_DESKTOP, FM3ModHandle, ID_STICK2);
@@ -93 +93 @@
       direction = 2;
       ticktock = 0;
-      WinStartTimer(hab, hwnd, ID_TIMER, 164);
+      WinStartTimer(hab, hwnd, ID_ABOUT_TIMER, 164);
       PostMsg(hwnd, UM_SETUP, MPVOID, MPVOID);
     }
@@ -299 +299 @@
   case WM_DESTROY:
     if (hab) {
-      if (!pause) {
-        WinStopTimer(hab, hwnd, ID_TIMER);
+      if (!noanimation) {
+        WinStopTimer(hab, hwnd, ID_ABOUT_TIMER);
         WinDestroyPointer(stick1);
         WinDestroyPointer(stick2);

trunk/dll/mainwnd.c

@@ -92 +92 @@
                 listings in tree
   13 Jul 09 GKY Fixed under allocation of memory in the paint code for the drivebar bitmap buttons
+  22 Jul 09 GKY Drivebar enhancements add refresh removable, rescan all drives, drive button
+                loads drive root directory in directory container or expands drive tree
+                and rescans drive in tree container depending on container focus, greyed out
+                inappropriate menu context choices
+  22 Jul 09 GKY Code changes to use semaphores to serialize drive scanning
 
 ***********************************************************************/
@@ -171 +176 @@
 #include "wrappers.h"                   // xfree
 #include "fortify.h"
-#include "filldir.h"                    // StubbyScanCount
 #include "excputil.h"                   // xbeginthread
 
@@ -256 +260 @@
       HWND hwndB = (HWND) mp1;
       USHORT id;
+      CHAR s[90]= {0};
 
       id = WinQueryWindowUShort(hwndB, QWS_ID);
-      *dv = 0;
-      *dv = id - IDM_DRIVEA + 'A';
-      strcpy(dv + 1, ":");
-      d = toupper(*dv);
-      if (isalpha(d) && d > 'B' &&
-          !(driveflags[d - 'A'] & (DRIVE_CDROM | DRIVE_INVALID |
-                                   DRIVE_SLOW)) &&
-          (!hwndBubble ||
-           WinQueryWindowULong(hwndBubble, QWL_USER) != hwndB) &&
-          !WinQueryCapture(HWND_DESKTOP)) {
-
-        FSALLOCATE fsa;
-        CHAR s[90], szQty[38];
-        ULONG ulPctFree;
-        ULONGLONG ullFreeQty;
-
-        if (!DosQueryFSInfo((d - 'A') + 1,
-                            FSIL_ALLOC, &fsa, sizeof(FSALLOCATE))) {
-          ullFreeQty = (ULONGLONG) fsa.cUnitAvail *
-            (fsa.cSectorUnit * fsa.cbSector);
-          ulPctFree = (fsa.cUnit && fsa.cUnitAvail) ?
-            (fsa.cUnitAvail * 100) / fsa.cUnit : 0;
-          CommaFmtULL(szQty, sizeof(szQty), ullFreeQty, ' ');
-          sprintf(s, "%s %s (%lu%%) %s", dv, szQty, ulPctFree, GetPString(IDS_FREETEXT));
-        }
-        if ((!hwndBubble ||
-             WinQueryWindowULong(hwndBubble, QWL_USER) != hwndB) &&
-            !WinQueryCapture(HWND_DESKTOP))
-          WinSendMsg(hwndB, UM_SETUP6, MPFROMP(s), MPVOID);
-      }
+      switch (id) {
+      case IDM_RESCAN:
+        strcpy(s, GetPString(IDS_RESCANALLDRIVESTEXT));
+        break;
+
+      case IDM_REFRESHREMOVABLES:
+        strcpy(s, GetPString(IDS_REFRESHREMOVABLESTEXT));
+        break;
+
+      default:
+        *dv = 0;
+        *dv = id - IDM_DRIVEA + 'A';
+        strcpy(dv + 1, ":");
+        d = toupper(*dv);
+        if (isalpha(d) && d > 'B' &&
+            !(driveflags[d - 'A'] & (DRIVE_CDROM | DRIVE_INVALID |
+                                     DRIVE_SLOW)) &&
+            (!hwndBubble ||
+             WinQueryWindowULong(hwndBubble, QWL_USER) != hwndB) &&
+            !WinQueryCapture(HWND_DESKTOP)) {
+  
+          FSALLOCATE fsa;
+          CHAR szQty[38];
+          ULONG ulPctFree;
+          ULONGLONG ullFreeQty;
+  
+          if (!DosQueryFSInfo((d - 'A') + 1,
+                              FSIL_ALLOC, &fsa, sizeof(FSALLOCATE))) {
+            ullFreeQty = (ULONGLONG) fsa.cUnitAvail *
+              (fsa.cSectorUnit * fsa.cbSector);
+            ulPctFree = (fsa.cUnit && fsa.cUnitAvail) ?
+              (fsa.cUnitAvail * 100) / fsa.cUnit : 0;
+            CommaFmtULL(szQty, sizeof(szQty), ullFreeQty, ' ');
+            sprintf(s, "%s %s (%lu%%) %s", dv, szQty, ulPctFree, GetPString(IDS_FREETEXT));
+          }
+        }
+      }
+      if ((!hwndBubble ||
+           WinQueryWindowULong(hwndBubble, QWL_USER) != hwndB) &&
+          !WinQueryCapture(HWND_DESKTOP))
+        WinSendMsg(hwndB, UM_SETUP6, MPFROMP(s), MPVOID);
     }
     return 0;
@@ -323 +339 @@
       RestoreDirCnrState(hwndMain, (char *)mp1, FALSE);
       WinEnableWindow(WinQueryWindow(hwndMain, QW_PARENT), TRUE);
-      fNoTileUpdate = FALSE;
-      //xfree((char *)mp1, pszSrcFile, __LINE__);
-//       if (fAutoTile)
-//         TileChildren(hwndMain, TRUE);
+      fNoTileUpdate = FALSE; ;
       break;
     default:
       Runtime_Error(pszSrcFile, __LINE__, "%u unexpected", mp2);
+    }
+    if (fInitialDriveScan) {
+      DosPostEventSem(hevInitialCnrScanComplete);
+      DosCloseEventSem(hevInitialCnrScanComplete);
+      fInitialDriveScan = FALSE;
     }
     return 0;
@@ -1835 +1853 @@
 
   case WM_COMMAND:
-    {
-      CHAR dv[4];
-
-      *dv = SHORT1FROMMP(mp1) - IDM_DRIVEA + 'A';
-      strcpy(dv + 1, ":\\");
-      if (isalpha(*dv)) {
-
-        HWND hwndActive;
-
-        dv[1] = ':';
-        dv[2] = '\\';
-        dv[3] = 0;
-        hwndActive = TopWindow(hwnd, (HWND) 0);
-        if (hwndActive)
-          WinSendMsg(WinWindowFromID(hwndActive, FID_CLIENT),
-                     UM_DRIVECMD, MPFROMP(dv), MPVOID);
+    if (fInitialDriveScan)
+      DosWaitEventSem(hevInitialCnrScanComplete, SEM_INDEFINITE_WAIT);
+    switch(SHORT1FROMMP(mp1)) {
+    case IDM_RESCAN:
+      {
+        BOOL toggleTree = FALSE;
+  
+        if (!hwndTree) {
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+          toggleTree = TRUE;
+        }
+        WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+        if (toggleTree)
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+      }
+      break;
+    case IDM_REFRESHREMOVABLES:
+      {
+        BOOL toggleTree = FALSE;
+  
+        if (!hwndTree) {
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+          toggleTree = TRUE;
+        }
+        WinSendMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_REFRESHREMOVABLES, 0), MPVOID);
+        if (toggleTree)
+          WinSendMsg(hwndMain, WM_COMMAND, MPFROM2SHORT(IDM_VTREE, 0), MPVOID);
+      }
+      break;
+    default:
+      {
+        CHAR dv[4];
+  
+        *dv = SHORT1FROMMP(mp1) - IDM_DRIVEA + 'A';
+        strcpy(dv + 1, ":\\");
+        if (isalpha(*dv)) {
+  
+          HWND hwndActive;
+  
+          dv[1] = ':';
+          dv[2] = '\\';
+          dv[3] = 0;
+          hwndActive = TopWindow(hwnd, (HWND) 0);
+          if (hwndActive)
+            WinSendMsg(WinWindowFromID(hwndActive, FID_CLIENT),
+                       UM_DRIVECMD, MPFROMP(dv), MPVOID);
+        }
       }
     }
@@ -1877 +1926 @@
   switch (msg) {
   case WM_MOUSEMOVE:
-    if (fDrivebarHelp &&
-        (!hwndBubble ||
+    if (fDrivebarHelp && (!hwndBubble ||
          WinQueryWindowULong(hwndBubble, QWL_USER) != hwnd) &&
         !WinQueryCapture(HWND_DESKTOP)) {
       id = WinQueryWindowUShort(hwnd, QWS_ID);
       if (helpid != id) {
-        helpid = id;
+        helpid = id;
         PostMsg(MainObjectHwnd, UM_SETUP6, MPFROMLONG((ULONG) hwnd), MPVOID);
       }
@@ -1905 +1953 @@
 
       id = WinQueryWindowUShort(hwnd, QWS_ID);
+      if (id == IDM_REFRESHREMOVABLES || id == IDM_RESCAN)
+        break;
       *szDrv = 0;
       x = id - IDM_DRIVEA;
@@ -1922 +1972 @@
                       RAMDISK_ICON :
                      (driveflags[x] & DRIVE_ZIPSTREAM) ?
-                      ZIPSTREAM_ICON : DRIVE_ICON;
+                      ZIPSTREAM_ICON :
+                     (driveflags[x] & DRIVE_LOCALHD) ?
+                      DRIVE_ICON : DONNO_ICON;
         }
         else
@@ -2000 +2052 @@
       hwndMenu = WinLoadMenu(HWND_DESKTOP, FM3ModHandle, MAIN_DRIVES);
       if (hwndMenu) {
-        BOOL rdy;
+        BOOL rdy, local;
         CHAR chDrv = *szDrv;
         UINT iDrv;
@@ -2006 +2058 @@
         strcat(szDrv, PCSZ_BACKSLASH);
         MakeValidDir(szDrv);
-        // Disable menus if MakeValidDir changes drive letter fixme this section doesn't do anything see treecnt.c
+        // Disable menus if MakeValidDir changes drive letter fixme this section doesn't do anything see treecnt.c
+        local = ~driveflags[iDrv] & DRIVE_REMOTE && ~driveflags[iDrv] & DRIVE_VIRTUAL &&
+                ~driveflags[iDrv] & DRIVE_RAMDISK;
         rdy = toupper(*szDrv) == toupper(chDrv);
         iDrv = toupper(*szDrv) - 'A';
         if (!rdy || ~driveflags[iDrv] & DRIVE_REMOTE)
-          WinEnableMenuItem(hwndMenu, IDM_DETACH, FALSE);
-
-        if (!rdy || driveflags[iDrv] & DRIVE_NOTWRITEABLE) {
-          WinEnableMenuItem(hwndMenu, IDM_MKDIR, FALSE);
+          WinEnableMenuItem(hwndMenu, IDM_DETACH, FALSE);
+
+        if (!rdy || driveflags[iDrv] & DRIVE_NOTWRITEABLE)
+          WinEnableMenuItem(hwndMenu, IDM_MKDIR, FALSE);
+
+        if (!rdy || driveflags[iDrv] & DRIVE_NOTWRITEABLE || !local) {
           WinEnableMenuItem(hwndMenu, IDM_FORMAT, FALSE);
           WinEnableMenuItem(hwndMenu, IDM_OPTIMIZE, FALSE);
@@ -2027 +2083 @@
           WinEnableMenuItem(hwndMenu, IDM_ARCHIVE, FALSE);
           WinEnableMenuItem(hwndMenu, IDM_SIZES, FALSE);
-          WinEnableMenuItem(hwndMenu, IDM_SHOWALLFILES, FALSE);
+          WinEnableMenuItem(hwndMenu, IDM_SHOWALLFILES, FALSE);
+
+        if (!rdy || !local)
           WinEnableMenuItem(hwndMenu, IDM_CHKDSK, FALSE);
         }
@@ -2301 +2359 @@
         if (!hwndB)
           Win_Error(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
-                    PCSZ_WINCREATEWINDOW);
+                    PCSZ_WINCREATEWINDOW);
         else {
           WinSetWindowPos(hwndB, HWND_BOTTOM, 0, 0, 0, 0, SWP_ZORDER);
@@ -2307 +2365 @@
       }
     }                                   // for
+    hwndB = WinCreateWindow(hwndT,
+                            WC_DRIVEBUTTONS,
+                            "#7001",
+                            BS_NOPOINTERFOCUS | BS_BITMAP | BS_PUSHBUTTON,
+                            0,
+                            0,
+                            DRIVE_BUTTON_WIDTH,
+                            DRIVE_BUTTON_HEIGHT,
+                            hwndT, HWND_TOP, IDM_REFRESHREMOVABLES, NULL, NULL);
+  if (!hwndB)
+    Win_Error(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_WINCREATEWINDOW);
+  hwndB = WinCreateWindow(hwndT,
+                          WC_DRIVEBUTTONS,
+                          "#7000",
+                          BS_NOPOINTERFOCUS | BS_BITMAP | BS_PUSHBUTTON,
+                          0,
+                          0,
+                          DRIVE_BUTTON_WIDTH,
+                          DRIVE_BUTTON_HEIGHT,
+                          hwndT, HWND_TOP, IDM_RESCAN, NULL, NULL);
+  if (!hwndB)
+    Win_Error(hwndT, HWND_DESKTOP, pszSrcFile, __LINE__,
+              PCSZ_WINCREATEWINDOW);
   }                                     // if drivebar
   PostMsg(WinQueryWindow(hwndT, QW_PARENT),
@@ -3328 +3410 @@
                   }
                 }
-                //if (!PostMsg(hwndCnr, UM_SETUP2, NULL, NULL)) //These were being called twice
-                //  WinSendMsg(hwndCnr, UM_SETUP2, NULL, NULL); //causing dup dir names in tree
+                if (!PostMsg(hwndCnr, UM_SETUP2, NULL, NULL))
+                  WinSendMsg(hwndCnr, UM_SETUP2, NULL, NULL); 
               }
             }
@@ -5726 +5808 @@
       if (!add_setup(pszStatename))
         save_setups();
-    } else {
+    }
+    else {
       load_tools(NULL);
       PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
+      if (fInitialDriveScan) {
+        DosPostEventSem(hevInitialCnrScanComplete);
+        DosCloseEventSem(hevInitialCnrScanComplete);
+      }
     }
     PostMsg(MainObjectHwnd, UM_SETUP4, mp1, mp2);

trunk/dll/mainwnd2.c

@@ -31 +31 @@
   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.
+  22 Jul 09 GKY Code changes to use semaphores to serialize drive scanning
 
 ***********************************************************************/
@@ -880 +881 @@
         save_dir(s);
       pd->hwndDir2 = StartDirCnr(hwnd, s, (HWND) 0, 3);
+      if (fInitialDriveScan) {
+        DosPostEventSem(hevInitialCnrScanComplete);
+        DosCloseEventSem(hevInitialCnrScanComplete);
+        fInitialDriveScan = FALSE;
+      }
       WinSetFocus(HWND_DESKTOP, pd->hwndCurr);
 

trunk/dll/misc.c

@@ -61 +61 @@
                 add State.version key for check
   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
+  22 Jul 09 GKY Check if drives support EAs add driveflag for this
+  22 Jul 09 GKY Allow .LONGNAME to be displayed for FAT drives.
 
 ***********************************************************************/
@@ -480 +482 @@
 }
 
-VOID AdjustCnrColsForFSType(HWND hwndCnr, PCSZ directory, DETAILS_SETTINGS * pds)
+VOID AdjustCnrColsForFSType(HWND hwndCnr, PCSZ directory, DETAILS_SETTINGS *pds, BOOL compare)
 {
   CHAR FileSystem[CCHMAXPATH];
@@ -487 +489 @@
   BOOL hasAccessDT;
   BOOL hasLongNames;
+  BOOL hasSubjects;
 
   if (!directory || !*directory)
@@ -492 +495 @@
   x = CheckDrive(toupper(*directory), FileSystem, NULL);
   if (x != -1) {
+    x = toupper(*directory) - 'A';
     if (!stricmp(FileSystem, HPFS) ||
         !stricmp(FileSystem, JFS) ||
@@ -501 +505 @@
       hasCreateDT = TRUE;
       hasAccessDT = TRUE;
-      hasLongNames = TRUE;
+      if (driveflags[x] & DRIVE_NOEASUPPORT) {
+        hasSubjects  = FALSE;
+        hasLongNames = FALSE;
+      }
+      else {
+        hasSubjects  = TRUE;
+        hasLongNames = TRUE;
+      }
     }
     else if (!strcmp(FileSystem, CDFS) || !strcmp(FileSystem, ISOFS)) {
       hasCreateDT = TRUE;
       hasAccessDT = FALSE;
-      hasLongNames = FALSE;
+      if (driveflags[x] & DRIVE_NOEASUPPORT) {
+        hasSubjects  = FALSE;
+        hasLongNames = FALSE;
+      }
+      else {
+        hasSubjects  = TRUE;
+        hasLongNames = TRUE;
+      }
     }
     else {
@@ -512 +530 @@
       hasCreateDT = FALSE;
       hasAccessDT = FALSE;
-      hasLongNames = FALSE;
+      if (driveflags[x] & DRIVE_NOEASUPPORT) {
+        hasSubjects  = FALSE;
+        hasLongNames = FALSE;
+      }
+      else {
+        hasSubjects  = TRUE;
+        hasLongNames = TRUE;
+      }
     }
   }
@@ -519 +544 @@
     hasCreateDT = FALSE;
     hasAccessDT = FALSE;
-    hasLongNames = FALSE;
+    if (driveflags[x] & DRIVE_NOEASUPPORT) {
+      hasSubjects  = FALSE;
+      hasLongNames = FALSE;
+    }
+    else {
+      hasSubjects  = TRUE;
+      hasLongNames = TRUE;
+    }
   }
   AdjustCnrColVis(hwndCnr,
@@ -536 +568 @@
                   GetPString(IDS_CRTIME),
                   pds->detailscrtime ? hasCreateDT : FALSE,
-                  FALSE);
+                  FALSE);
+  if (pds->detailslongname && !pds->detailssubject && hasSubjects) {
+    AdjustCnrColVis(hwndCnr,
+                    compare ? GetPString(IDS_STATUS) : GetPString(IDS_SUBJ),
+                    TRUE,
+                    FALSE);
+    AdjustCnrColVis(hwndCnr,
+                    GetPString(IDS_LNAME),
+                    pds->detailslongname ? hasLongNames : FALSE,
+                    FALSE);
+    WinSendMsg(hwndCnr, CM_INVALIDATEDETAILFIELDINFO, MPVOID, MPVOID);
+  }
+  else
+    AdjustCnrColVis(hwndCnr,
+                    GetPString(IDS_LNAME),
+                    pds->detailslongname ? hasLongNames : FALSE,
+                    FALSE);
   AdjustCnrColVis(hwndCnr,
-                  GetPString(IDS_LNAME),
-                  pds->detailslongname ? hasLongNames : FALSE,
-                  FALSE);
+                  compare ? GetPString(IDS_STATUS) : GetPString(IDS_SUBJ),
+                  pds->detailssubject ? hasSubjects : FALSE,
+                  FALSE);
   WinSendMsg(hwndCnr, CM_INVALIDATEDETAILFIELDINFO, MPVOID, MPVOID);
 }
 
-VOID AdjustCnrColsForPref(HWND hwndCnr, PCSZ directory, DETAILS_SETTINGS * pds,
+VOID AdjustCnrColsForPref(HWND hwndCnr, PCSZ directory, DETAILS_SETTINGS *pds,
                           BOOL compare)
 {
-
-  AdjustCnrColVis(hwndCnr,
-                  compare ? GetPString(IDS_STATUS) : GetPString(IDS_SUBJ),
-                  pds->detailssubject,
-                  FALSE);
-
   AdjustCnrColVis(hwndCnr, GetPString(IDS_ATTR), pds->detailsattr, FALSE);
   AdjustCnrColVis(hwndCnr, GetPString(IDS_ICON), pds->detailsicon, FALSE);
@@ -561 +603 @@
 
   if (!directory) {
+    AdjustCnrColVis(hwndCnr,
+                    compare ? GetPString(IDS_STATUS) : GetPString(IDS_SUBJ),
+                    pds->detailssubject,
+                    FALSE);
     AdjustCnrColVis(hwndCnr, GetPString(IDS_LADATE), pds->detailsladate, FALSE);
     AdjustCnrColVis(hwndCnr, GetPString(IDS_LATIME), pds->detailslatime, FALSE);
@@ -568 +614 @@
     WinSendMsg(hwndCnr, CM_INVALIDATEDETAILFIELDINFO, MPVOID, MPVOID);
   }
-  else
-    AdjustCnrColsForFSType(hwndCnr, directory, pds);
+  else {
+    AdjustCnrColsForFSType(hwndCnr, directory, pds, compare);
+  }
 }
 
@@ -619 +666 @@
 
     pfi = pfi->pNextFieldInfo;
-    pfi->flData = CFA_STRING | CFA_LEFT;
+    pfi->flData = CFA_STRING | CFA_LEFT | CFA_SEPARATOR;
     pfi->flTitle = CFA_LEFT | CFA_FITITLEREADONLY;
     pfi->pTitleData = (PSZ)GetPString(IDS_LNAME);
     pfi->offStruct = FIELDOFFSET(CNRITEM, pszLongName);
+    pfiLastLeftCol = pfi;
+
+    // Store the current pfi value as that will be used to indicate the
+    // last column in the lefthand container window (we have a splitbar)
+    if (!dsDirCnrDefault.fSubjectInLeftPane)
+      pfiLastLeftCol = pfi;
+    else 
+      pfiLastLeftCol = pfi->pNextFieldInfo;
 
     // Fill in column info for subjects
-
-    if (dsDirCnrDefault.fSubjectInLeftPane) {
-      pfi = pfi->pNextFieldInfo;
-      pfi->flData = CFA_STRING | CFA_LEFT | CFA_SEPARATOR;
-      if (isCompCnr)
-        pfi->flData |= CFA_FIREADONLY;
-      pfi->flTitle = CFA_LEFT | CFA_FITITLEREADONLY;
-      pfi->pTitleData = isCompCnr ? (PSZ)GetPString(IDS_STATUS) :
-                                    (PSZ)GetPString(IDS_SUBJ);
-      pfi->offStruct = FIELDOFFSET(CNRITEM, pszSubject);
-      pfi->cxWidth = dsDirCnrDefault.SubjectDisplayWidth;
-
-      // Store the current pfi value as that will be used to indicate the
-      // last column in the lefthand container window (we have a splitbar)
-
-      pfiLastLeftCol = pfi;
-    }
-    else {
-      // Store the current pfi value as that will be used to indicate the
-      // last column in the lefthand container window (we have a splitbar)
-
-      pfiLastLeftCol = pfi;
-      pfi = pfi->pNextFieldInfo;
-      pfi->flData = CFA_STRING | CFA_LEFT | CFA_SEPARATOR;
-      if (isCompCnr)
-        pfi->flData |= CFA_FIREADONLY;
-      pfi->flTitle = CFA_LEFT | CFA_FITITLEREADONLY;
-      pfi->pTitleData = isCompCnr ? (PSZ)GetPString(IDS_STATUS) :
-                                    (PSZ)GetPString(IDS_SUBJ);
-      pfi->offStruct = FIELDOFFSET(CNRITEM, pszSubject);
-      pfi->cxWidth = dsDirCnrDefault.SubjectDisplayWidth;
-    }
+    pfi = pfi->pNextFieldInfo;
+    pfi->flData = CFA_STRING | CFA_LEFT | CFA_SEPARATOR;
+    if (isCompCnr)
+      pfi->flData |= CFA_FIREADONLY;
+    pfi->flTitle = CFA_LEFT | CFA_FITITLEREADONLY;
+    pfi->pTitleData = isCompCnr ? (PSZ)GetPString(IDS_STATUS) :
+                                  (PSZ)GetPString(IDS_SUBJ);
+    pfi->offStruct = FIELDOFFSET(CNRITEM, pszSubject);
+    pfi->cxWidth = dsDirCnrDefault.SubjectDisplayWidth;
 
     // Fill in column information for the file size
-
 
     pfi = pfi->pNextFieldInfo;

trunk/dll/misc.h

@@ -11 +11 @@
   17 Jul 08 SHL Baseline
   08 Mar 09 GKY Add WriteDetailsSwitches and use LoadDetailsSwitches to replace in line code
+  22 Jul 09 GKY Check if drives support EAs add driveflag for this
+  22 Jul 09 GKY Allow .LONGNAME to be displayed for FAT drives.
 
 ***********************************************************************/
@@ -31 +33 @@
 BOOL AdjustCnrColRO(HWND hwndCnr, PCSZ title, BOOL readonly, BOOL toggle);
 BOOL AdjustCnrColVis(HWND hwndCnr, PCSZ title, BOOL visible, BOOL toggle);
-VOID AdjustCnrColsForFSType(HWND hwndCnr, PCSZ directory, DETAILS_SETTINGS * pds);
-VOID AdjustCnrColsForPref(HWND hwndCnr, PCSZ directory, DETAILS_SETTINGS * pds,
+VOID AdjustCnrColsForFSType(HWND hwndCnr, PCSZ directory, DETAILS_SETTINGS *pds, BOOL compare);
+VOID AdjustCnrColsForPref(HWND hwndCnr, PCSZ directory, DETAILS_SETTINGS *pds,
                           BOOL compare);
 VOID AdjustDetailsSwitches(HWND hwnd, HWND hwndMenu, USHORT cmd,

trunk/dll/newview.c

@@ -38 +38 @@
   08 Mar 09 GKY Renamed commafmt.h i18nutil.h
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  13 Jul 09 SHL Sync with renames
 
 ***********************************************************************/
@@ -1848 +1849 @@
                         (PVOID) FNT_8HELVETICA);
       }
-      WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, ID_TIMER5, 1000L);
+      WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, ID_NEWVIEW_TIMER, 1000L);
     }
     break;
@@ -4007 +4008 @@
       HWND hwndRestore = (HWND) 0;
 
-      WinStopTimer(WinQueryAnchorBlock(hwnd), hwnd, ID_TIMER5);
+      WinStopTimer(WinQueryAnchorBlock(hwnd), hwnd, ID_NEWVIEW_TIMER);
       if (ad) {
         ad->stopflag = 1;

trunk/dll/notify.c

@@ -3 +3 @@
   $Id$
 
-  Thread notes window and popup notification status line
+  Thread notes window and popup notifications over status line
 
   Copyright (c) 1993-98 M. Kimes
@@ -18 +18 @@
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
   07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
+  13 Jul 09 SHL Sync with renames
+  16 Jul 09 SHL Stop leaking hptrIcon
 
 ***********************************************************************/
@@ -25 +27 @@
 #include <ctype.h>
 #include <stddef.h>                     // _threadid
-// #include <process.h>                 // _beginthread
 
 #define INCL_DOS
@@ -55 +56 @@
 static PSZ pszSrcFile = __FILE__;
 static volatile HWND hwndNotify;        // 16 Apr 08 SHL
+static volatile PCSZ pszCachedNote;     // 16 Jul 09 SHL
 
 #pragma data_seg(GLOBAL1)
 BOOL fThreadNotes;
 
-VOID StartNotes(CHAR * s);
-
-/**
- * Popup notification message window procedure
- * Display timed message over status line
+static VOID StartNotes(PCSZ pszNote);
+
+/**
+ * Notification message window procedure
+ * Displays timed message over status line
  */
 
@@ -76 +78 @@
       MRESULT rc = PFNWPStatic(hwnd, msg, mp1, mp2);
 
-      if (!WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, ID_TIMER2, 5000)) {
+      if (!WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, ID_NOTIFY_TIMER, 5000)) {
         Win_Error(hwnd, hwnd, pszSrcFile, __LINE__, "WinStartTimer");
         WinDestroyWindow(hwnd);
@@ -144 +146 @@
   case WM_TIMER:
   case WM_CLOSE:
-    WinStopTimer(WinQueryAnchorBlock(hwnd), hwnd, ID_TIMER2);
+    WinStopTimer(WinQueryAnchorBlock(hwnd), hwnd, ID_NOTIFY_TIMER);
     WinDestroyWindow(hwnd);
     return 0;
@@ -162 +164 @@
 
 /**
- * Display timed notification window over status line
+ * Process UM_NOTIFY message to display timed message over status line
  */
 
@@ -213 +215 @@
                            SS_TEXT | DT_LEFT | DT_VCENTER | WS_VISIBLE,
                            x, y, cx, cy, hwndP, HWND_TOP, id++, NULL, NULL);
-    if (!hwndP)
+    if (!hwnd)
       Win_Error(hwndP, hwndP, pszSrcFile, __LINE__,
                 PCSZ_WINCREATEWINDOW);
@@ -220 +222 @@
       free(p);
     if (id > NOTE_MAX)
-      id = NOTE_FRAME;
-  }
-
-  AddNote(str);
+      id = NOTE_FRAME;                  // Wrap
+  }
+
+  AddNote(str);                         // Add thread notes window
 
   return hwnd;
@@ -229 +231 @@
 
 /**
- * Add message to thread notes window
+ * Display timed notification window over status line
  */
 
@@ -238 +240 @@
 
 /**
- * Add error message to thread notes window
+ * Notify on error
+ * Format message and pass to Notify
  */
 
@@ -247 +250 @@
   if (!filename)
     return;
+
   sprintf(errortext, GetPString(IDS_ERRORACCESSTEXT), status, filename);
   if (toupper(*filename) > 'B') {
@@ -281 +285 @@
 
 /**
- * Thread notes dialog window dialog procedure
+ * Thread notes window dialog procedure
  */
 
 MRESULT EXPENTRY NoteWndProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-  static HPOINTER hptrIcon = (HPOINTER) 0;
+  static HPOINTER hptrIcon;
 
   switch (msg) {
@@ -293 +297 @@
       // Already have notes dialog - pass message on
       if (mp2) {
-        WinSendDlgItemMsg(hwndNotify,
-                          NOTE_LISTBOX,
-                          LM_INSERTITEM, MPFROM2SHORT(LIT_END, 0), mp2);
-        PostMsg(hwndNotify, UM_NOTIFY, MPVOID, MPVOID);
-        free((CHAR *)mp2);
+        AddNote((PCSZ)mp2);             // 16 Jul 09 SHL was direct LM_INSERTITEM
+        xfree((PSZ)mp2, pszSrcFile, __LINE__);
       }
       WinDismissDlg(hwnd, 0);
@@ -303 +304 @@
     }
     hwndNotify = hwnd;
-    fThreadNotes = FALSE;
-    // Remember showing
-    {
-      BOOL dummy = TRUE;
+    // Remember showing for restart
+    fThreadNotes = TRUE;
       PrfWriteProfileData(fmprof,
-                          FM3Str, "ThreadNotes", &dummy, sizeof(BOOL));
-    }
+                          FM3Str, "ThreadNotes", &fThreadNotes, sizeof(BOOL));
+    fThreadNotes = FALSE;               // Optimize
+
+    // 16 Jul 09 SHL Added
+    if (pszCachedNote) {
+      PCSZ p = pszCachedNote;
+      pszCachedNote = NULL;
+      AddNote(p);
+      xfree((PSZ)p, pszSrcFile, __LINE__);
+    }
+
     if (mp2) {
-      WinSendDlgItemMsg(hwnd,
-                        NOTE_LISTBOX,
-                        LM_INSERTITEM, MPFROM2SHORT(LIT_END, 0), mp2);
-      free((CHAR *)mp2);
-    }
-
-    {
-      // Return focus
-      HWND hwndActive = WinQueryActiveWindow(HWND_DESKTOP);
-      PostMsg(hwnd, UM_FOCUSME, MPFROMLONG(hwndActive), MPVOID);
-    }
+      AddNote((PCSZ)mp2);               // 16 Jul 09 SHL was direct LM_INSERTITEM
+      xfree((PSZ)mp2, pszSrcFile, __LINE__);
+    }
+
+    // Grab focus
+    PostMsg(hwnd,
+            UM_FOCUSME,
+            MPFROMLONG(WinQueryActiveWindow(HWND_DESKTOP)),
+            MPVOID);
 
     hptrIcon = WinLoadPointer(HWND_DESKTOP, FM3ModHandle, NOTE_FRAME);
@@ -429 +435 @@
 
   case WM_CLOSE:
+    if (pszCachedNote)
+      DbgMsg(pszSrcFile, __LINE__, "pszCachedNote %p unexpected", pszCachedNote);       // 18 Jul 08 SHL fixme to be Runtime_Error
+    else {
+      // Cache last item for next open
+      SHORT ndx = (SHORT)WinSendDlgItemMsg(hwnd, NOTE_LISTBOX,
+                                           LM_QUERYITEMCOUNT, MPVOID, MPVOID);
+      if (ndx != LIT_NONE) {
+        SHORT len;
+        ndx--;
+        len = (SHORT)WinSendDlgItemMsg(hwnd, NOTE_LISTBOX,
+                                       LM_QUERYITEMTEXTLENGTH, 
+                                       MPFROMSHORT(ndx), MPVOID);
+        if (len != LIT_ERROR) {
+          PSZ p;
+          len++;
+          p = xmalloc(len, pszSrcFile, __LINE__);
+          if (p) {
+            SHORT len2 = (SHORT)WinSendDlgItemMsg(hwnd, NOTE_LISTBOX,
+                                           LM_QUERYITEMTEXT,
+                                           MPFROM2SHORT(ndx, len), MPFROMP(p));
+            len--;
+            if (len2 != len) {
+              DbgMsg(pszSrcFile, __LINE__, "len %u unexpected - should be %u", len2, len);      // 18 Jul 08 SHL fixme to be Runtime_Error
+              xfree((PSZ)p, pszSrcFile, __LINE__);
+            }
+            else
+              pszCachedNote = p;
+          }
+        }
+      }
+    }
     WinDismissDlg(hwnd, 0);
     return 0;
@@ -434 +471 @@
   case WM_DESTROY:
     if (hwndNotify == hwnd) {
+      // Remember not open
       fThreadNotes = FALSE;
       PrfWriteProfileData(fmprof,
@@ -439 +477 @@
       hwndNotify = (HWND) 0;
     }
-    if (hptrIcon)
+    if (hptrIcon) {
       WinDestroyPointer(hptrIcon);
+      hptrIcon = (HPOINTER)0;           // 16 Jul 09 SHL
+    }
     if (!PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID))
       WinSendMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID);
@@ -464 +504 @@
         WinDlgBox(HWND_DESKTOP,
                   HWND_DESKTOP,
-                  NoteWndProc, FM3ModHandle, NOTE_FRAME, (CHAR *)args);
+                  NoteWndProc, FM3ModHandle, NOTE_FRAME, args);
       WinDestroyMsgQueue(hmq);
     }
@@ -478 +518 @@
  */
 
-VOID StartNotes(CHAR * note)
+static VOID StartNotes(PCSZ note)
 {
   if (!hwndNotify) {
     if (xbeginthread(NoteThread,
                      65536,
-                     note,
+                     (VOID*)note,
                      pszSrcFile,
                      __LINE__) != -1)
@@ -498 +538 @@
 /**
  * Add note to thread notes window or popup status window
- */
-
-BOOL AddNote(PCSZ note)
+ * Open window if was open and first messages after restart
+ * Cache last note until window opened
+ */
+
+VOID AddNote(PCSZ note)
 {
   PSZ s;
   PCSZ p;
-  BOOL once = FALSE, ret = FALSE;
-
-  if ((fThreadNotes || hwndNotify) && note && *note) {
-    p = note;
-    while (*p == ' ')
-      p++;
+  BOOL once = FALSE;
+
+  // Cache last note until window opened
+  // 16 Jul 09 SHL fixme to avoid FORTIFY complaints
+  if (!fThreadNotes && !hwndNotify && note) {
+    p = note + strspn(note, " \t");     // Skip leading white
     if (*p) {
+      if (pszCachedNote)
+        xfree((PSZ)pszCachedNote, pszSrcFile, __LINE__);
+      pszCachedNote = xstrdup(p, pszSrcFile, __LINE__);
+    }
+    return;
+  }
+
+  if ((fThreadNotes || hwndNotify) && note) {
+    p = note + strspn(note, " \t");     // Skip leading white
+    if (*p) {
+      // If have cached note, output it first
+      if (pszCachedNote) {
+        PCSZ psz = pszCachedNote;
+        pszCachedNote = NULL;
+        AddNote(psz);
+        free((VOID*)psz);
+      }
       if (!hwndNotify) {
-        fThreadNotes = FALSE;
+        fThreadNotes = FALSE;           // 16 Jul 09 SHL fixme to be gone?
         StartNotes(NULL);
       }
@@ -525 +584 @@
                                           MPFROM2SHORT(LIT_END, 0),
                                           MPFROMP(s)) >= 0) {
-              ret = TRUE;
               PostMsg(hwndNotify, UM_NOTIFY, MPVOID, MPVOID);
               break;
@@ -537 +595 @@
     }
   }
-  return ret;
 }
 

trunk/dll/notify.h

@@ -17 +17 @@
 #define NOTIFY_H
 
-BOOL AddNote(PCSZ note);
+VOID AddNote(PCSZ note);                // 16 Jul 09 SHL
 HWND DoNotify(PCSZ text);
 VOID EndNote(VOID);

trunk/dll/treecnr.c

@@ -72 +72 @@
   12 Jul 09 GKY Add option to show file system type or drive label in tree
                 (get NOPRESCAN drives working)
+  22 Jul 09 GKY Code changes to use semaphores to serialize drive scanning
+  22 Jul 09 GKY Consolidated driveflag setting code in DriveFlagsOne
+  22 Jul 09 GKY Streamline scanning code for faster Tree rescans
 
 ***********************************************************************/
@@ -629 +632 @@
       Fortify_BecomeOwner(mp1);
 #     endif
-      if (StubbyScanCount != 0) { //prevent treeswitch from hanging fm2 during startup GKY 3-14-09
-        DosSleep(50);
-        PostMsg(hwndTree, UM_SHOWME, mp1, MPVOID);
-      }
       dcd = INSTDATA(hwnd);
       if (dcd) {
@@ -644 +643 @@
           temptop = fTopDir;
           fTopDir = TRUE;
-        }
-        ShowTreeRec(dcd->hwndCnr, (CHAR *)mp1, fCollapseFirst, TRUE);
+        }
+        ShowTreeRec(dcd->hwndCnr, (CHAR *)mp1, fCollapseFirst, TRUE);
+        PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
         dcd->suspendview = tempsusp;
         fFollowTree = tempfollow;
@@ -849 +849 @@
       Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
-      while (StubbyScanCount != 0)
-        DosSleep(50);
       RemoveCnrItems(dcd->hwndCnr, NULL, 0, CMA_FREE | CMA_INVALIDATE | CMA_ERASE);
       WinSendMsg(dcd->hwndCnr,
@@ -856 +854 @@
       WinSendMsg(dcd->hwndCnr,
                  CM_SCROLLWINDOW,
-                 MPFROMSHORT(CMA_HORIZONTAL), MPFROMLONG(-1));
+                 MPFROMSHORT(CMA_HORIZONTAL), MPFROMLONG(-1));
+      DosRequestMutexSem(hmtFillingTreeCnr, SEM_INDEFINITE_WAIT);
       FillTreeCnr(dcd->hwndCnr, dcd->hwndParent);
+      DosReleaseMutexSem(hmtFillingTreeCnr);
       if (fOkayMinimize) {
         PostMsg(dcd->hwndCnr, UM_MINIMIZE, MPVOID, MPVOID);
@@ -1093 +1093 @@
         WinSetWindowText(hwndStatus2, NullStr);
     }
+    // 13 Jul 09 SHL fixme to make sense
     if (msg == UM_TIMER)
       return 0;
@@ -1887 +1888 @@
       PCNRITEM pciP, pciL, pci;
       ULONG fl = SWP_ACTIVATE;
-
+      INT x;
+
+      DosRequestMutexSem(hmtFillingTreeCnr, SEM_INDEFINITE_WAIT);
       if (fFollowTree)
         fl = 0;
@@ -1895 +1898 @@
           (INT) pci != -1 &&
           !(pci->rc.flRecordAttr & CRA_INUSE) &&
-          !(pci->flags & RECFLAGS_ENV) && IsFullName(pci->pszFileName)) {
-        if (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_INVALID) {
+          !(pci->flags & RECFLAGS_ENV) && IsFullName(pci->pszFileName)) {
+        x = (INT) (toupper(*pci->pszFileName) - 'A');
+        if (driveflags[x] & DRIVE_INVALID) {
           if (!fAlertBeepOff)
             DosBeep(50, 100);
@@ -1905 +1909 @@
         DosError(FERR_DISABLEHARDERR);
         if (!DosQCurDisk(&ulDriveNum, &ulDriveMap)) {
-          if (!(ulDriveMap & 1 << (toupper(*pci->pszFileName) - 'A'))) {
+          if (!(ulDriveMap & 1 << x)) {
             pciL = pciP = pci;
             for (;;) {
@@ -1923 +1927 @@
           }
         }
-        if (driveflags[toupper(*pci->pszFileName) - 'A'] &
-            (DRIVE_REMOVABLE | DRIVE_NOPRESCAN)) {
+        if (driveflags[x] & (DRIVE_REMOVABLE | DRIVE_NOPRESCAN)) {
 
           struct
@@ -1949 +1952 @@
             }
           }
-          if ((driveflags[toupper(*pci->pszFileName) - 'A'] &
-               DRIVE_NOPRESCAN) ||
-              (toupper(*pci->pszFileName) > 'B' &&
-               !(driveflags[toupper(*pci->pszFileName) - 'A'] &
-                 DRIVE_CDROM))) {
-
-            INT removable, x = (INT) (toupper(*pci->pszFileName) - 'A');
-            ULONG drvtype;
-
-            DosError(FERR_DISABLEHARDERR);
-            removable = CheckDrive(toupper(*pciP->pszFileName),
-                                   FileSystem, &drvtype);
-            if (removable != -1) {
-              driveflags[x] &= (DRIVE_IGNORE | DRIVE_NOPRESCAN |
-                                DRIVE_NOLOADICONS | DRIVE_NOLOADSUBJS |
-                                DRIVE_NOLOADLONGS | DRIVE_INCLUDEFILES |
-                                DRIVE_SLOW | DRIVE_NOSTATS |
-                                DRIVE_WRITEVERIFYOFF);
-
-              if (removable == 1)
-                driveflags[x] |= DRIVE_REMOVABLE;
-              if (drvtype & DRIVE_REMOTE)
-                driveflags[x] |= DRIVE_REMOTE;
-              if (!strcmp(FileSystem, CBSIFS)) {
-                driveflags[x] |= DRIVE_ZIPSTREAM;
-                driveflags[x] &= (~DRIVE_REMOTE);
-              }
-              if(!strcmp(FileSystem,NDFS32)) {
-                driveflags[x] |= DRIVE_VIRTUAL;
-                driveflags[x] &= (~DRIVE_REMOTE);
-              }
-              if(!strcmp(FileSystem,RAMFS)) {
-                driveflags[x] |= DRIVE_RAMDISK;
-                driveflags[x] &= (~DRIVE_REMOTE);
-              }
-              if (!strcmp(FileSystem, CDFS) || !strcmp(FileSystem, ISOFS))
-                driveflags[x] |= (DRIVE_REMOVABLE | DRIVE_NOTWRITEABLE | DRIVE_CDROM);
-              if(!strcmp(FileSystem,NTFS))
-                driveflags[x] |= DRIVE_NOTWRITEABLE;
-              if (strcmp(FileSystem, HPFS) &&
-                  strcmp(FileSystem, JFS) &&
-                  strcmp(FileSystem, CDFS) &&
-                  strcmp(FileSystem, ISOFS) &&
-                  strcmp(FileSystem, RAMFS) &&
-                  strcmp(FileSystem, FAT32) &&
-                  strcmp(FileSystem, NDFS32) &&
-                  strcmp(FileSystem, NTFS) &&
-                  strcmp(FileSystem, HPFS386)) {
-                driveflags[x] |= DRIVE_NOLONGNAMES;
-              }
-              SelectDriveIcon(pciP);
-              if (hwndMain)
-                PostMsg(hwndMain, UM_BUILDDRIVEBAR, MPVOID, MPVOID);
-            }
+          if ((driveflags[x] & DRIVE_NOPRESCAN) || (toupper(*pci->pszFileName) > 'B' &&
+               !(driveflags[x] & DRIVE_CDROM))) {
+            DriveFlagsOne(x, FileSystem, &volser);
+            SelectDriveIcon(pciP);
+            if (hwndMain)
+              PostMsg(hwndMain, UM_BUILDDRIVEBAR, MPVOID, MPVOID);
           }
           memset(&volser, 0, sizeof(volser));
@@ -2010 +1965 @@
                                   (ULONG) sizeof(volser));
           if (!status) {
-            if (!volser.serial ||
-                driveserial[toupper(*pci->pszFileName) - 'A'] !=
-                volser.serial) {
+            if (!volser.serial || driveserial[x] != volser.serial) {
               UnFlesh(hwnd, pciP);
               Flesh(hwnd, pciP);
-              driveserial[toupper(*pci->pszFileName) - 'A'] = volser.serial;
+              driveserial[x] = volser.serial;
             }
             pciL = WinSendMsg(hwnd,
@@ -2023 +1976 @@
             if (!pciL)
               Flesh(hwnd, pciP);
-            if (fShowFSTypeInTree) {
-              strcpy(szBuf, pciP->pszFileName);
+            if (fShowFSTypeInTree || fShowDriveLabelInTree) {
+              strcpy(szBuf, pci->pszFileName);
               strcat(szBuf, " [");
-              strcat(szBuf, FileSystem);
+              strcat(szBuf, fShowFSTypeInTree ? FileSystem : volser.volumelabel);
               strcat(szBuf, "]");
-              pciP->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
-              }
-            else if (fShowDriveLabelInTree) {
-              strcpy(szBuf, pciP->pszFileName);
-              strcat(szBuf, " [");
-              strcat(szBuf, volser.volumelabel);
-              strcat(szBuf, "]");
-              pciP->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
+              pci->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
             }
             pciP->rc.pszIcon = pciP->pszDisplayName;
@@ -2044 +1990 @@
           }
           else {
-            driveserial[toupper(*pci->pszFileName) - 'A'] = -1;
+            driveserial[x] = -1;
             UnFlesh(hwnd, pci);
             PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
@@ -2120 +2066 @@
           }
           else {
-            if (!(driveflags[toupper(*pci->pszFileName) - 'A'] &
-                  DRIVE_INCLUDEFILES))
+            if (!(driveflags[x] & DRIVE_INCLUDEFILES))
               RemoveCnrItems(hwnd, pci, 1, CMA_FREE | CMA_INVALIDATE);
             else {
@@ -2144 +2089 @@
         PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_MKDIR, 0), MPVOID);
       if (fFollowTree)
-        WinSetFocus(HWND_DESKTOP, hwnd);
+        WinSetFocus(HWND_DESKTOP, hwnd);
+      DosReleaseMutexSem(hmtFillingTreeCnr);
     }
     return 0;
@@ -2367 +2313 @@
 
   case UM_DRIVECMD:
-    if (mp1)
+    if (mp1) {
       ShowTreeRec(hwnd, (CHAR *)mp1, FALSE, TRUE);
+      PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
+    }
     return 0;
 
@@ -2386 +2334 @@
           *s = info->device;
           pci = FindCnrRecord(hwnd, s, NULL, FALSE, FALSE, TRUE);
-          if (pci && (INT) pci != -1) {
-            driveserial[info->device - 'A'] = -1;
-            DriveFlagsOne(info->device - 'A');
-            if (driveflags[info->device - 'A'] &
+          if (pci && (INT) pci != -1) {
+            INT x = info->device - 'A';
+            CHAR  FileSystem[CCHMAXPATH];
+
+            driveserial[x] = -1;
+            DriveFlagsOne(x, FileSystem, NULL);
+            if (driveflags[x] &
                 (DRIVE_INVALID | DRIVE_IGNORE))
               RemoveCnrItems(hwnd, pci, 1, CMA_FREE);
@@ -2789 +2740 @@
 
       case IDM_UPDATE:
-        {
+        {
           PCNRITEM pci = (PCNRITEM)CurrentRecord(hwnd);
-          if (pci && (INT)pci != -1) {
-            UINT driveflag = driveflags[toupper(*pci->pszFileName) - 'A'];
+          if (pci && (INT)pci != -1) {
+            struct
+            {
+              ULONG serial;
+              CHAR volumelength;
+              CHAR volumelabel[CCHMAXPATH];
+            }
+            volser;
+            INT x = toupper(*pci->pszFileName) - 'A';
+            CHAR FileSystem[CCHMAXPATH], szBuf[CCHMAXPATH];
+
+            UINT driveflag = driveflags[x];
             if (pci->attrFile & FILE_DIRECTORY) {
               if (pci->flags & RECFLAGS_UNDERENV)
-                break;
+                break;
+              DosRequestMutexSem(hmtFillingTreeCnr, SEM_INDEFINITE_WAIT);
               UnFlesh(hwnd, pci);
               // Check if drive type might need update
               if ((driveflag & (DRIVE_INVALID | DRIVE_NOPRESCAN)) ||
-                  (~driveflag & DRIVE_NOPRESCAN && pci->rc.hptrIcon == hptrDunno))
-              {
-                driveflags[toupper(*pci->pszFileName) - 'A'] &=
-                  (DRIVE_IGNORE | DRIVE_NOPRESCAN | DRIVE_NOLOADICONS |
-                   DRIVE_NOLOADSUBJS | DRIVE_NOLOADLONGS | DRIVE_NOSTATS |
-                   DRIVE_WRITEVERIFYOFF);
-                DriveFlagsOne(toupper(*pci->pszFileName) - 'A');
-                driveflag = driveflags[toupper(*pci->pszFileName) - 'A'];
+                  (~driveflag & DRIVE_NOPRESCAN && pci->rc.hptrIcon == hptrDunno)) {
+                DriveFlagsOne(x, FileSystem, &volser);
+                driveflag = driveflags[x];
                 if (driveflag & DRIVE_INVALID)
                   pci->rc.hptrIcon = hptrDunno;
                 else {
                   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;
                 WinSendMsg(hwnd,
                            CM_INVALIDATERECORD,
@@ -2820 +2785 @@
               }
               if (~driveflag & DRIVE_INVALID)
-                Flesh(hwnd, pci);
+                Flesh(hwnd, pci);
+              DosReleaseMutexSem(hmtFillingTreeCnr);
             }
           }
@@ -3029 +2995 @@
     return 0;
 
+  case WM_TIMER:
+    return ActionWMTimer(hwnd, mp1, mp2);
+
   case WM_SAVEAPPLICATION:
     if (dcd && !ParentIsDesktop(hwnd, dcd->hwndParent)) {
@@ -3260 +3229 @@
                                      NULL,
                                      CCS_AUTOPOSITION | CCS_MINIICONS |
-                                     CCS_MINIRECORDCORE, //| WS_VISIBLE,
+                                     CCS_MINIRECORDCORE, 
                                      0,
                                      0,
@@ -3279 +3248 @@
         if (ParentIsDesktop(hwndFrame, hwndParent)) {
           WinSetWindowText(WinWindowFromID(hwndFrame, FID_TITLEBAR), "VTree");
-          FixSwitchList(hwndFrame, "VTree");
+          FixSwitchList(hwndFrame, "VTree");
+          DosPostEventSem(hevInitialCnrScanComplete);
+          DosCloseEventSem(hevInitialCnrScanComplete);
+          fInitialDriveScan = FALSE;
         }
         else {

trunk/dll/update.c

@@ -20 +20 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   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
 
 ***********************************************************************/
@@ -191 +192 @@
             PostMsg(hwndCnr, UM_RESCAN, MPVOID, MPVOID);
             if (pci->attrFile & FILE_DIRECTORY) {
-              if (fInitialDriveScan)
-                Stubby(hwndCnr, pci);
-              else {
-                while (StubbyScanCount != 0)
-                  DosSleep(50);
-              //Stubby(hwndCnr, pci);
-              }
+              Stubby(hwndCnr, pci);
             }
           }
@@ -291 +286 @@
               dcd->ullTotalBytes += ullTotalBytes;
             }
-            if (fInitialDriveScan)
-              Stubby(hwndCnr, pci);
-            else {
-              while (StubbyScanCount != 0)
-                DosSleep(50);
-            //Stubby(hwndCnr, pci);
-            }
+            Stubby(hwndCnr, pci);
           }
         }
@@ -465 +454 @@
                 repos = TRUE;
                 if (pci->attrFile & FILE_DIRECTORY) {
-                  if (fInitialDriveScan)
-                    Stubby(hwndCnr, pci);
-                  else {
-                    while (StubbyScanCount != 0)
-                      DosSleep(50);
-                //Stubby(hwndCnr, pci);
-                  }
+                  Stubby(hwndCnr, pci);
                 }
               }
@@ -570 +553 @@
                   }
                   repos = TRUE;
-                  if (fInitialDriveScan)
-                    Stubby(hwndCnr, pci);
-                  else {
-                    while (StubbyScanCount != 0)
-                      DosSleep(50);
-                  //Stubby(hwndCnr, pci);
-                  }
+                  Stubby(hwndCnr, pci);
                 }
                 else

trunk/dll/valid.c

@@ -36 +36 @@
   08 Mar 09 GKY Additional strings move to PCSZs
   12 Jul 09 GKY Add xDosQueryAppType and xDoxAlloc... to allow FM/2 to load in high memory
+  22 Jul 09 GKY Consolidated driveflag setting code in DriveFlagsOne
+  22 Jul 09 GKY Check if drives support EAs add driveflag for this
+  22 Jul 09 GKY Add LocalHD driveflag
+  22 Jul 09 GKY Streamline scanning code for faster Tree rescans
 
 ***********************************************************************/
@@ -79 +83 @@
 PCSZ RAMFS = "RAMFS";
 PCSZ NTFS = "NTFS";
+PCSZ LAN = "LAN";
 BOOL fVerifyOffChecked[26];
 
@@ -256 +261 @@
 INT CheckDrive(CHAR chDrive, CHAR * pszFileSystem, ULONG * pulType)
 {
-  CHAR szPath[3];
+  CHAR szPath[4];
   VOID *pvBuffer = NULL;
   CHAR *pfsn;
@@ -266 +271 @@
   ULONG clDataBytes;
   HFILE hDev;
+  EASIZEBUF easize = {0};
+  ULONG   ulDataLen        = sizeof(EASIZEBUF);  
+  ULONG   ulParmLen        = 0;
 
 # pragma pack(1)
@@ -322 +330 @@
   pfsn = (PCHAR)(pfsq->szName) + pfsq->cbName + 1;
   pfsd = pfsn + pfsq->cbFSDName + 1;
+  strupr(pfsn);
 
   if (pszFileSystem) {
@@ -327 +336 @@
     pszFileSystem[CCHMAXPATH - 1] = 0;
   }
-
+  szPath[2] = '\\';
+  szPath[3] = 0;
+  DosFSCtl(&easize, sizeof(EASIZEBUF), &ulDataLen, NULL, ulParmLen,
+           &ulParmLen, FSCTL_MAX_EASIZE, szPath, -1, FSCTL_PATHNAME);
+  //DbgMsg(pszSrcFile, __LINE__, "%i %i %s %s", easize.cbMaxEASize, easize.cbMaxEAListSize, szPath, pfsn);
+  szPath[2] = 0;
+  if (pulType && easize.cbMaxEASize == 0)
+    *pulType |= DRIVE_NOEASUPPORT;
   if (pulType && (!strcmp(pfsn, CDFS) || !strcmp(pfsn, ISOFS)))
-      *pulType |= DRIVE_NOTWRITEABLE | DRIVE_CDROM | DRIVE_REMOVABLE;
+    *pulType |= DRIVE_NOTWRITEABLE | DRIVE_CDROM | DRIVE_REMOVABLE;
   if (pulType && !strcmp(pfsn, NTFS))
     *pulType |= DRIVE_NOTWRITEABLE;
@@ -338 +354 @@
         *pulType |= DRIVE_RAMDISK;
     }
-  if (((PFSQBUFFER2) pvBuffer)->iType == FSAT_REMOTEDRV &&
-      (strcmp(pfsn, CDFS) || strcmp(pfsn, ISOFS))) {
+  if (((PFSQBUFFER2) pvBuffer)->iType == FSAT_REMOTEDRV) { 
     if (pulType)
       *pulType |= DRIVE_REMOTE;
@@ -360 +375 @@
     }
     if (pulType &&
-        (!strcmp(pfsn, HPFS) ||
-         !strcmp(pfsn, JFS) ||
-         !strcmp(pfsn, FAT32) ||
+        (!strcmp(pfsn, LAN) ||
          !strcmp(pfsn, RAMFS) ||
-         !strcmp(pfsn, NDFS32) ||
-         !strcmp(pfsn, NTFS) ||
-         !strcmp(pfsn, HPFS386))) {
+         !strcmp(pfsn, NDFS32))) {
       *pulType &= ~DRIVE_NOLONGNAMES;
     }
@@ -376 +387 @@
   // Local drive
   if (strcmp(pfsn, HPFS) &&
-      strcmp(pfsn, JFS) &&
       strcmp(pfsn, CDFS) &&
       strcmp(pfsn, ISOFS) &&
-      strcmp(pfsn, RAMFS) &&
+      strcmp(pfsn, JFS) &&
       strcmp(pfsn, FAT32) &&
-      strcmp(pfsn, NDFS32) &&
       strcmp(pfsn, NTFS) &&
       strcmp(pfsn, HPFS386)) {
@@ -387 +396 @@
       (*pulType) |= DRIVE_NOLONGNAMES;  // Others can not have long names
   }
-
 
   DosError(FERR_DISABLEHARDERR);
@@ -725 +733 @@
 }
 
-VOID DriveFlagsOne(INT x)
+VOID DriveFlagsOne(INT x, CHAR *FileSystem, VOID *volser)
 {
   INT removable;
-  CHAR szDrive[] = " :\\", FileSystem[CCHMAXPATH];
+  CHAR szDrive[] = " :\\"; 
   ULONG drvtype;
 
@@ -735 +743 @@
   drvtype = 0;
   removable = CheckDrive(*szDrive, FileSystem, &drvtype);
+  strupr(FileSystem);
   driveserial[x] = -1;
   driveflags[x] &= (DRIVE_IGNORE | DRIVE_NOPRESCAN | DRIVE_NOLOADICONS |
@@ -741 +750 @@
                     DRIVE_WRITEVERIFYOFF);
   if (removable != -1) {
-    struct
-    {
-      ULONG serial;
-      CHAR volumelength;
-      CHAR volumelabel[CCHMAXPATH];
-    }
-    volser;
-
-    DosError(FERR_DISABLEHARDERR);
-    if (!DosQueryFSInfo((ULONG) x + 1, FSIL_VOLSER, &volser, sizeof(volser)))
-      driveserial[x] = volser.serial;
-    else
+    if (!volser) {
+      struct
+      {
+        ULONG serial;
+        CHAR volumelength;
+        CHAR volumelabel[CCHMAXPATH];
+      }
+      volserl;
+  
       DosError(FERR_DISABLEHARDERR);
+      if (!DosQueryFSInfo((ULONG) x + 1, FSIL_VOLSER, &volserl, sizeof(volserl)))
+        driveserial[x] = volserl.serial;
+      else
+        DosError(FERR_DISABLEHARDERR);
+    }
+    else {
+      DosError(FERR_DISABLEHARDERR);
+      if (DosQueryFSInfo((ULONG) x + 1, FSIL_VOLSER, volser,
+                         sizeof(ULONG) + sizeof(CHAR) + CCHMAXPATH))
+        DosError(FERR_DISABLEHARDERR);
+    }
   }
   else
     driveflags[x] |= DRIVE_INVALID;
-  driveflags[x] |= ((removable == -1 || removable == 1) ?
-                    DRIVE_REMOVABLE : 0);
+  driveflags[x] |= ((removable == -1 || removable == 1) ? DRIVE_REMOVABLE : 0);
   if (drvtype & DRIVE_REMOTE)
     driveflags[x] |= DRIVE_REMOTE;
-  if(!stricmp(FileSystem,NDFS32)){
+  if (drvtype & DRIVE_NOEASUPPORT)
+    driveflags[x] |= DRIVE_NOEASUPPORT;
+  if(!strcmp(FileSystem,NDFS32)){
     driveflags[x] |= DRIVE_VIRTUAL;
     driveflags[x] &= (~DRIVE_REMOTE);
   }
-  if(!stricmp(FileSystem,RAMFS)){
+  if(!strcmp(FileSystem,RAMFS)){
     driveflags[x] |= DRIVE_RAMDISK;
     driveflags[x] &= (~DRIVE_REMOTE);
   }
-  if(!stricmp(FileSystem,NTFS))
+  if(!strcmp(FileSystem,NTFS))
     driveflags[x] |= DRIVE_NOTWRITEABLE;
   if (strcmp(FileSystem, HPFS) &&
-      strcmp(FileSystem, JFS) &&
       strcmp(FileSystem, CDFS) &&
       strcmp(FileSystem, ISOFS) &&
+      strcmp(FileSystem, JFS) &&
+      strcmp(FileSystem, LAN) &&
       strcmp(FileSystem, RAMFS) &&
       strcmp(FileSystem, FAT32) &&
@@ -782 +801 @@
     driveflags[x] |= DRIVE_NOLONGNAMES;
   }
-
+  if ((!strcmp(FileSystem, HPFS) ||
+       !strcmp(FileSystem, JFS) ||
+       !strcmp(FileSystem, FAT32) ||
+       !strcmp(FileSystem, NTFS) ||
+       !strcmp(FileSystem, HPFS386)) && ~driveflags[x] & DRIVE_REMOVABLE) {
+    driveflags[x] |= DRIVE_LOCALHD;
+  }
   if (!strcmp(FileSystem, CDFS) || !strcmp(FileSystem, ISOFS)) {
-    removable = 1;
     driveflags[x] |= (DRIVE_REMOVABLE | DRIVE_NOTWRITEABLE | DRIVE_CDROM);
   }
-  if (!stricmp(FileSystem, CBSIFS)) {
+  if (!strcmp(FileSystem, CBSIFS)) {
     driveflags[x] |= DRIVE_ZIPSTREAM;
     driveflags[x] &= (~DRIVE_REMOTE);
@@ -823 +847 @@
 
       if (x > 1) {
-        if (!(driveflags[x] & DRIVE_NOPRESCAN))
-          DriveFlagsOne(x);
+        if (!(driveflags[x] & DRIVE_NOPRESCAN)) {
+          CHAR FileSystem[CCHMAXPATH];
+          DriveFlagsOne(x, FileSystem, NULL);
+        }
         else
           driveserial[x] = -1;

trunk/dll/valid.h

@@ -12 +12 @@
   25 Dec 08 GKY Add code to allow write verify to be turned off on a per drive basis
   08 Mar 09 GKY Additional strings move to PCSZs
+  22 Jul 09 GKY Consolidated driveflag setting code in DriveFlagsOne
 
 ***********************************************************************/
@@ -21 +22 @@
 VOID ArgDriveFlags(INT argc, CHAR ** argv);
 INT CheckDrive(CHAR Drive, CHAR * FileSystem, ULONG * type);
-VOID DriveFlagsOne(INT x);
+VOID DriveFlagsOne(INT x, CHAR *FileSystem, VOID *volser);
 VOID FillInDriveFlags(VOID * dummy);
 VOID GetDesktopName(CHAR * objectpath, ULONG size);
@@ -54 +55 @@
 extern PCSZ RAMFS;
 extern PCSZ CBSIFS;
+extern PCSZ LAN;
 extern BOOL fVerifyOffChecked[26];
 

trunk/dll/worker.c

@@ -54 +54 @@
 #define INCL_DOS
 #define INCL_DOSERRORS
-#define INCL_WINPROGRAMLIST
-#define INCL_WINHELP
+// #define INCL_WINPROGRAMLIST          // 13 Jul 09 SHL dropped
+// #define INCL_WINHELP                 // 13 Jul 09 SHL dropped
 #define INCL_LONGLONG
-#define INCL_WINPOINTERS
-#define INCL_WINWORKPLACE
-#define INCL_WINSHELLDATA
+#define INCL_WINPOINTERS                // WinSetFileIcon
+// #define INCL_WINWORKPLACE            // 13 Jul 09 SHL dropped
+#define INCL_WINSHELLDATA               // PrfQueryProfileData
+#define INCL_WINTIMER                   // WinStarTimer
+#define INCL_WININPUT                   // WinQueryFocus
 
 #include "fm3dll.h"
@@ -103 +105 @@
 #include "avl.h"                        // SBoxDlgProc
 #include "subj.h"                       // Subject
+#include "grep.h"                       // hwndStatus
 #include "stristr.h"                    // stristr
 #include "wrappers.h"                   // xfopen
@@ -195 +198 @@
   INT plen = 0;
   CHAR *p, *pp;
+  ULONG idTimerStarted = 0;
+  BOOL fActionPosted = FALSE;
+  HAB habForActions;
+  HWND hwndForActions;
   CHAR szQuotedDirName[CCHMAXPATH];
   CHAR szQuotedFileName[CCHMAXPATH];
@@ -216 +223 @@
           IncrThreadUsage();
           *wildname = 0;
+          // Do action specific preprocessing
           switch (wk->li->type) {
           case IDM_MERGE:
@@ -322 +330 @@
             break;
           }
+          // Process each list item
           if (wk->li && wk->li->list && wk->li->list[0]) {
+            // char ucClassname[8];
+            if (hwndStatus) {
+              // Send update request to source window or container
+              // 13 Jul 09 SHL fixme to be sure we pick window that understand UM_ACTIONSTATE wk->dcd->hwndCnr?
+              // 13 Jul 09 SHL fixme to ensure focus window is one that understands UM_ACTIONSTATE
+              HWND hwndFocus = WinQueryFocus(HWND_DESKTOP);
+              DbgMsg(pszSrcFile, __LINE__, "hwndFocus %lx", hwndFocus); // 13 Jul 09 SHL fixme debug
+              DbgMsg(pszSrcFile, __LINE__, "hwndCnr %lx", wk->hwndCnr); // 13 Jul 09 SHL fixme debug
+              // DbgMsg(pszSrcFile, __LINE__, "hwndS %lx", wk->li->hwndS);      // 13 Jul 09 SHL fixme debug
+              DbgMsg(pszSrcFile, __LINE__, "hwnd %lx", wk->li->hwnd);   // 13 Jul 09 SHL fixme debug
+              // DbgMsg(pszSrcFile, __LINE__, "hwndParent %lx", wk->hwndParent);        // 13 Jul 09 SHL fixme debug
+              // DbgMsg(pszSrcFile, __LINE__, "hwndClient %lx", wk->hwndClient);        // 13 Jul 09 SHL fixme debug
+              // DbgMsg(pszSrcFile, __LINE__, "hwndFrame %lx", wk->hwndFrame);  // 13 Jul 09 SHL fixme debug
+              // hwndForActions = wk->li->hwnd == hwndFocus ? hwndFocus : wk->hwndCnr;
+              hwndForActions = WinQueryFocus(HWND_DESKTOP);
+#if 0 // 14 Jul 09 SHL fixme
+              hwndForActions = WinQueryFocus(HWND_DESKTOP);
+              if (WinQueryClassName(hwndForActions, sizeof(ucClassname), ucClassname)) {
+                // If not a container fall back to worker
+                if (strcmp(ucClassname, "#25"));
+              }
+#endif
+              habForActions = WinQueryAnchorBlock(hwndForActions);
+              DbgMsg(pszSrcFile, __LINE__, "habForActions %lx hwndForActions %lx", habForActions, hwndForActions);      // 13 Jul 09 SHL fixme debug
+              // Ask container window to update status line every 5 seconds in case action is time intensive
+              idTimerStarted = WinStartTimer(habForActions, hwndForActions, ID_ACTION_TIMER, 2000);     // 13 Jul 09 SHL fixme 5 sec
+            }
             for (x = 0; wk->li->list[x]; x++) {
               switch (wk->li->type) {
@@ -829 +865 @@
                     if (fRealIdle)
                       priority_idle();
+
                     rc = docopyf(type, wk->li->list[x], newname);
                     if (fResetVerify) {
@@ -892 +929 @@
                       }
                       else {
-                        if (LogFileHandle)
+                        if (LogFileHandle) {
                           fprintf(LogFileHandle,
                                   GetPString(IDS_LOGTOFAILEDTEXT),
                                   move, wk->li->list[x], newname, rc);
+                        }
                         rc = Dos_Error(MB_ENTERCANCEL,
                                        rc,
@@ -912 +950 @@
                     }
                     else {
-                      if (LogFileHandle)
+                      if (LogFileHandle) {
                         fprintf(LogFileHandle,
                                 "%s \"%s\" %s\"%s\"\n",
@@ -918 +956 @@
                                 wk->li->list[x],
                                 GetPString(IDS_TOTEXT), newname);
+                      }
                       if ((driveflags[*wk->li->targetpath - 'A'] & DRIVE_RSCANNED) &&
                           AddToList(wk->li->list[x],
@@ -984 +1023 @@
             } // for list
 
+            // Do actio specific post-processing
             switch (wk->li->type) {
             case IDM_MOVE:
@@ -1026 +1066 @@
               break;
             }
-          }
+            if (idTimerStarted)
+              WinStopTimer(habForActions, hwndForActions, ID_ACTION_TIMER);     // 13 Jul 09 SHL
+          } // if have non-empty list
 
         Abort:
@@ -1048 +1090 @@
     }
 
+    if (fActionPosted)
+      DosSleep(2000);                   // Alloc container time to process queued UM_ACTIONSTATE messages 13 Jul 09 SHL
     if (wk->li)
       FreeListInfo(wk->li);
@@ -1763 +1807 @@
   }
 }
+
+// We can use static buffer for all in progress actions because we have only 1 status line
+static WORKER *pCachedActionWorker;     // Sent from Action thread via UM_ACTIONSTATE
+static PSZ pszCachedActionListItem;     // Sent from Action thread via UM_ACTIONSTATE
+
+MRESULT EXPENTRY ActionWMTimer(HWND hwnd, MPARAM mp1, MPARAM mp2)
+{
+  if (pCachedActionWorker != NULL && pszCachedActionListItem != NULL) {
+    DbgMsg(pszSrcFile, __LINE__, "Using hWndStatus %lx pCachedActionWorker %p pszCachedActionListItem %s", hwndStatus, pCachedActionWorker, pszCachedActionListItem);   // 13 Jul 09 SHL fixme debug
+    if (hwndStatus && WinQueryFocus(HWND_DESKTOP) == hwnd) {
+      CHAR s[CCHMAXPATH + 64];
+      sprintf(s, "%s %s",
+              pCachedActionWorker->li->type == IDM_MOVE ?
+                GetPString(IDS_MOVINGTEXT) :
+                GetPString(IDS_COPYINGTEXT),
+              pszCachedActionListItem);
+      // sprintf(s, "Moving/copying %s", pszCachedActionListItem);      // 14 Jul 09 SHL fixme
+      WinSetWindowText(hwndStatus, s);
+    }
+  }
+  return 0;
+}
+
+MRESULT EXPENTRY ActionUMWorkerState(HWND hwnd, MPARAM mp1, MPARAM mp2) {
+  pCachedActionWorker = PVOIDFROMMP(mp1);
+  pszCachedActionListItem = PVOIDFROMMP(mp2);
+  DbgMsg(pszSrcFile, __LINE__, "Setting pCachedActionWorker %p pszCachedActionListItem %s", pCachedActionWorker, pszCachedActionListItem);      // 13 Jul 09 SHL fixme debug
+  if (hwndStatus && WinQueryFocus(HWND_DESKTOP) == hwnd)
+    WinPostMsg(hwnd, WM_SETFOCUS, MPFROMLONG(hwnd), MPFROMLONG(TRUE));  // 14 Jul 09 SHL Force status line update
+  return 0;
+}
+
 #pragma alloc_text(MASSACTION,MassAction)
 #pragma alloc_text(ACTION,Action)

trunk/dll/worker.h

@@ -45 +45 @@
 WORKER;
 
+// Data declarations
+extern FILE *LogFileHandle;
+
 VOID Action(VOID * args);
 VOID MassAction(VOID * args);
 
-// Data declarations
-extern FILE *LogFileHandle;
+MRESULT EXPENTRY ActionWMTimer(HWND hwnd, MPARAM mp1, MPARAM mp2);
+MRESULT EXPENTRY ActionUMWorkerState(HWND hwnd, MPARAM mp1, MPARAM mp2);
 
 #endif  // WORKER_H

trunk/fm3.rc

@@ -16 +16 @@
   16 Aug 07 SHL Document AUTHOR_PICTURE
   04 Jan 08 SHL Sync with fm3dll.h mods
-  29 Aug 08 GKY Add bmps from David for the 7 predefined toolbars
+  29 Aug 08 GKY Add bmps from David for the 7 predefined toolbars 
+  22 Jul 09 GKY Drivebar enhancements add refresh removable, rescan all drives, drive button
+                loads drive root directory in directory container or expands drive tree
+                and rescans drive in tree container depending on container focus, greyed out
+                inappropriate menu context choices
 
 ***********************************************************************/
@@ -100 +104 @@
 BITMAP VIRTUAL_ICON         bitmaps\VIRTUAL.BMP
 BITMAP RAMDISK_ICON         bitmaps\RAMDISK.BMP
+BITMAP DONNO_ICON           bitmaps\DONNO.BMP
+BITMAP IDM_RESCANALL        bitmaps\rescanhd2.bmp
+BITMAP IDM_REFRESHREMOVABLE bitmaps\refremov.bmp
 BITMAP 65534                bitmaps\EMPTY.BMP
 BITMAP LEDON_BMP            bitmaps\LEDON.BMP

trunk/fm4.rc

@@ -15 +15 @@
   04 Jan 08 SHL Sync with fm3dll.h mods
   29 Aug 08 GKY Add bmps from David for the 7 predefined toolbars
-
+  22 Jul 09 GKY Drivebar enhancements add refresh removable, rescan all drives, drive button
+                loads drive root directory in directory container or expands drive tree
+                and rescans drive in tree container depending on container focus, greyed out
+                inappropriate menu context choices
+                
 ***********************************************************************/
 
@@ -97 +101 @@
 BITMAP VIRTUAL_ICON         bitmaps\VIRTUAL.BMP
 BITMAP RAMDISK_ICON         bitmaps\RAMDISK.BMP
+BITMAP DONNO_ICON           bitmaps\DONNO.BMP
+BITMAP IDM_RESCANALL        bitmaps\rescanhd2.bmp
+BITMAP IDM_REFRESHREMOVABLE bitmaps\refremov.bmp
 BITMAP 65534                bitmaps\EMPTY.BMP
 BITMAP LEDON_BMP            bitmaps\LEDON.BMP