Changeset 1459

Timestamp:

Sep 16, 2009, 7:58:59 AM (16 years ago)

Author:

Steven Levine

Message:

Show rescan progress while filling container, ticket #291

Location:

trunk/dll

Files:

• dircnrs.c (modified) (12 diffs)
• filldir.c (modified) (36 diffs)
• fm3dll2.h (modified) (2 diffs)
• fm3res.rc (modified) (2 diffs)
• fm3str.h (modified) (5 diffs)

trunk/dll/dircnrs.c ¶

@@ -68 +68 @@
   22 Jul 09 SHL Cleanup of SETFOCUS code
   14 Sep 09 SHL Drop experimental code
+  15 Sep 09 SHL Show rescan progress while filling container
 
 ***********************************************************************/
@@ -101 +102 @@
 #include "notebook.h"                   // CfgDlgProc
 #include "command.h"                    // RunCommand
-#include "worker.h"             // Action, MassAction
+#include "worker.h"                     // Action, MassAction
 #include "misc.h"                       // GetTidForThread, AdjustCnrColsForFSType, AdjustCnrColsForPref
                                         // AdjustDetailsSwitches, CnrDirectEdit, OpenEdit, QuickPopup
                                         // SayFilter, SaySort, SayView, SetCnrCols, SetDetailsSwitches
-                                // SetSortChecks, SetViewMenu, SwitchCommand, CheckMenu
-                                // CurrentRecord, DrawTargetEmphasis, IsFm2Window
+                                        // SetSortChecks, SetViewMenu, SwitchCommand, CheckMenu
+                                        // CurrentRecord, DrawTargetEmphasis, IsFm2Window
 #include "chklist.h"                    // CenterOverWindow, DropListProc
 #include "common.h"                     // CommonCnrProc, CommonCreateTextChildren, CommonFrameWndProc
-                                // CommonTextPaint, CommonTextButton, CommonTextProc
+                                        // CommonTextPaint, CommonTextButton, CommonTextProc
 #include "mainwnd.h"                    // CountDirCnrs, GetNextWindowPos, MakeBubble, TopWindow
 #include "select.h"                     // DeselectAll, HideAll, InvertAll, SelectAll, SelectList
-                                // SpecialSelect2
+                                        // SpecialSelect2
 #include "dirsize.h"                    // DirSizeProc
 #include "flesh.h"                      // Flesh, Stubby, UnFlesh
@@ -680 +681 @@
 {
   DIRCNRDATA *dcd;
+  CHAR tf[64];
+  CHAR tb[64];
+  CHAR s[CCHMAXPATH * 2];
 
   switch (msg) {
@@ -754 +758 @@
     dcd = WinQueryWindowPtr(hwnd, QWL_USER);
     if (dcd && dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent)) {
-
       FSALLOCATE fsa;
-      CHAR s[CCHMAXPATH * 2];
-      CHAR tf[64];
-      CHAR tb[64];
       CHAR szFree[64];
-
       DosError(FERR_DISABLEHARDERR);
       if (!DosQueryFSInfo(toupper(*dcd->directory) - '@',
@@ -844 +843 @@
       MakeValidDir(dcd->directory);
       {
-        CHAR s[CCHMAXPATH + 8];
-
         sprintf(s,
                 "%s%s%s",
@@ -865 +862 @@
       if (hwndStatus &&
           dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent)) {
-        WinSetWindowText(hwndStatus, GetPString(IDS_SCANNINGTEXT));
+        WinSetWindowText(hwndStatus, GetPString(IDS_PLEASEWAITSCANNINGTEXT));
         if (hwndMain)
           WinSendMsg(hwndMain, UM_LOADFILE, MPVOID, MPVOID);
       }
       if (fSwitchTree && hwndTree) {
+        // Keep drive tree in sync with directory container
         PSZ pszTempDir = xstrdup(dcd->directory, pszSrcFile, __LINE__);
-
         if (hwndMain) {
           if (TopWindow(hwndMain, (HWND) 0) == dcd->hwndFrame && pszTempDir)
@@ -884 +881 @@
       }
       dcd->firsttree = FALSE;
+      WinStartTimer(WinQueryAnchorBlock(hwnd), dcd->hwndCnr, ID_DIRCNR_TIMER, 500);
       // fixme to check errors
       FillDirCnr(dcd->hwndCnr, dcd->directory, dcd, &dcd->ullTotalBytes);
+      WinStopTimer(WinQueryAnchorBlock(hwnd), dcd->hwndCnr, ID_DIRCNR_TIMER);
       PostMsg(dcd->hwndCnr, UM_RESCAN, MPVOID, MPVOID);
       if (mp2 && !fLeaveTree && (dcd->flWindowAttr & CV_TREE)) {
-
         ULONG flWindowAttr = dcd->flWindowAttr;
         CNRINFO cnri;
-
-        flWindowAttr &=
-          (~(CV_NAME | CV_TREE | CV_ICON | CV_DETAIL | CV_TEXT));
+        flWindowAttr &= ~(CV_NAME | CV_TREE | CV_ICON | CV_DETAIL | CV_TEXT);
         if (dcd->lastattr) {
           if (dcd->lastattr & CV_TEXT)
@@ -1211 +1207 @@
 {
   DIRCNRDATA *dcd = INSTDATA(hwnd);
+  CHAR tf[64];
+  CHAR tb[64];
+  CHAR s[CCHMAXPATH];
 
   switch (msg) {
@@ -1251 +1250 @@
       case VK_HOME:
         if ((shiftstate & KC_CTRL) == KC_CTRL && dcd) {
-          CHAR s[CCHMAXPATH], *p;
+          PSZ p;
           strcpy(s, dcd->directory);
           p = strchr(s, '\\');
@@ -1420 +1419 @@
     break;
 
+  case WM_TIMER:
+    // Started/stopped by DirObjWndPro
+    // dcd = WinQueryWindowPtr(hwnd, QWL_USER);
+    if (dcd) {
+      commafmt(tb, sizeof(tb), dcd->totalfiles);
+      CommaFmtULL(tf, sizeof(tf), dcd->ullTotalBytes, 'K');
+      sprintf(s, "%s / %s", tb, tf);
+      // DbgMsg(pszSrcFile, __LINE__, "WM_TIMER %s", s);        // 15 Sep 09 SHL fixme debug
+      WinSetDlgItemText(dcd->hwndClient, DIR_TOTALS, s);
+    }
+    break; // WM_TIMER
+
   case UM_RESCAN:
     if (dcd) {
 
       CNRINFO cnri;
-      CHAR s[CCHMAXPATH * 2], tf[81], tb[81], szDate[DATE_BUF_BYTES];
+      CHAR szDate[DATE_BUF_BYTES];
       PCNRITEM pci;
 
@@ -3205 +3216 @@
           PCNRITEM pci = (PCNRITEM) ((PCNREDITDATA) mp2)->pRecord;
           HWND hwndMLE;
-          static CHAR szData[CCHMAXPATH];
           CHAR testname[CCHMAXPATH];
 
           if (!pci && !pfi) {
             hwndMLE = WinWindowFromID(hwnd, CID_MLE);
-            WinQueryWindowText(hwndMLE, sizeof(szData), szData);
-            chop_at_crnl(szData);
-            bstrip(szData);
-            if (*szData) {
-              if (!DosQueryPathInfo(szData,
+            WinQueryWindowText(hwndMLE, sizeof(s), s);
+            chop_at_crnl(s);
+            bstrip(s);
+            if (*s) {
+              if (!DosQueryPathInfo(s,
                                     FIL_QUERYFULLNAME,
                                     testname, sizeof(testname))) {
@@ -3240 +3250 @@
           PNOTIFYRECORDEMPHASIS pre = mp2;
           PCNRITEM pci;
-          CHAR s[CCHMAXPATHCOMP + 91], tb[81], tf[81];
+          CHAR s[CCHMAXPATHCOMP + 91];
 
           pci = (PCNRITEM) (pre ? pre->pRecord : NULL);

trunk/dll/filldir.c ¶

@@ -73 +73 @@
   06 Jul 09 SHL Refactor .LONGNAME and .SUBJECT EA fetch to FetchCommonEAs
   12 Jul 09 GKY Add szFSType to FillInRecordFromFSA use to bypass EA scan and size formatting
-                for tree container
+                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
+  15 Sep 09 SHL Show rescan progress while filling container
 
 ***********************************************************************/
@@ -110 +111 @@
 #include "filter.h"                     // Filter
 #include "subj.h"                       // Subject
+#include "grep.h"                       // hwndStatus
 #include "copyf.h"                      // unlinkf
 #include "literal.h"                    // wildcard
@@ -117 +119 @@
 #include "common.h"                     // IncrThreadUsage
 #include "excputil.h"                   // xbeginthread
-#include "fm3dlg.h"                     // INFO_LABEL
-#include "pathutil.h"                   // AddBackslashToPath
+#include "fm3dlg.h"                     // INFO_LABEL
+#include "pathutil.h"                   // AddBackslashToPath
 
 VOID StubbyScanThread(VOID * arg);
@@ -133 +135 @@
 
 #pragma data_seg(GLOBAL2)
-PCSZ FM3Tools   = "<FM3_Tools>";
-PCSZ WPProgram  = "WPProgram";
+PCSZ FM3Tools = "<FM3_Tools>";
+PCSZ WPProgram = "WPProgram";
 
 typedef struct {
-  PCNRITEM    pci;
-  HWND        hwndCnr;                  // hwnd you want the message posted to
-  HWND        hwndDrivesList;
-  //BOOL        RamDrive;
+  PCNRITEM      pci;
+  HWND          hwndCnr;                // hwnd you want the message posted to
+  HWND          hwndDrivesList;
+  //BOOL        RamDrive;
 }
 STUBBYSCAN;
@@ -223 +225 @@
         IncrThreadUsage();
         priority_normal();
-        ret = Stubby(StubbyScan->hwndCnr, StubbyScan->pci);
-        if (ret == 1) {
-          if (WinIsWindow((HAB)0, StubbyScan->hwndCnr)) {
-            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);
-              }
-            }
-          }
-        }
+        ret = Stubby(StubbyScan->hwndCnr, StubbyScan->pci);
+        if (ret == 1) {
+          if (WinIsWindow((HAB)0, StubbyScan->hwndCnr)) {
+            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);
+              }
+            }
+          }
+        }
         WinDestroyMsgQueue(hmq);
       }
@@ -271 +273 @@
       if (hmq) {
         IncrThreadUsage();
-        priority_normal();
-        ProcessDirectory(ProcessDir->hwndCnr,
-                         ProcessDir->pciParent,
-                         ProcessDir->szDirBase,
-                         ProcessDir->filestoo,
-                         ProcessDir->recurse,
-                         ProcessDir->partial,
-                         ProcessDir->stopflag,
-                         ProcessDir->dcd,                       // Optional
-                         ProcessDir->pulTotalFiles,     // Optional
-                         ProcessDir->pullTotalBytes);   // Optional
+        priority_normal();
+        ProcessDirectory(ProcessDir->hwndCnr,
+                         ProcessDir->pciParent,
+                         ProcessDir->szDirBase,
+                         ProcessDir->filestoo,
+                         ProcessDir->recurse,
+                         ProcessDir->partial,
+                         ProcessDir->stopflag,
+                         ProcessDir->dcd,                       // Optional
+                         ProcessDir->pulTotalFiles,     // Optional
+                         ProcessDir->pullTotalBytes);   // Optional
         WinDestroyMsgQueue(hmq);
       }
@@ -312 +314 @@
 
     if (cmp == *(ULONG *) PCSZ_DOTEXE || cmp == *(ULONG *) PCSZ_DOTCMD ||
-        cmp == *(ULONG *) PCSZ_DOTBAT || cmp == *(ULONG *) PCSZ_DOTCOM ||
-        cmp == *(ULONG *) PCSZ_DOTBTM)
+        cmp == *(ULONG *) PCSZ_DOTBAT || cmp == *(ULONG *) PCSZ_DOTCOM ||
+        cmp == *(ULONG *) PCSZ_DOTBTM)
       hptr = hptrApp;
     else if (cmp == *(ULONG *) ".ZIP" || cmp == *(ULONG *) ".LZH" ||
@@ -323 +325 @@
       hptr = hptrArc;
     else if (cmp == *(ULONG *) PCSZ_DOTBMP  ||
-             cmp == *(ULONG *) PCSZ_DOTICO  ||
-             cmp == *(ULONG *) PCSZ_DOTPTR  ||
-             cmp == *(ULONG *) PCSZ_DOTJPEG ||
-             cmp == *(ULONG *) PCSZ_DOTJPG  ||
-             cmp == *(ULONG *) ".GIF" ||
+             cmp == *(ULONG *) PCSZ_DOTICO  ||
+             cmp == *(ULONG *) PCSZ_DOTPTR  ||
+             cmp == *(ULONG *) PCSZ_DOTJPEG ||
+             cmp == *(ULONG *) PCSZ_DOTJPG  ||
+             cmp == *(ULONG *) ".GIF" ||
              cmp == *(ULONG *) ".TIF" || cmp == *(ULONG *) ".PCX" ||
              cmp == *(ULONG *) ".TGA" || cmp == *(ULONG *) ".XBM" ||
@@ -460 +462 @@
         eaop.oError = 0;
         rc = DosQueryPathInfo(pci->pszFileName, FIL_QUERYEASFROMLIST,
-                              (PVOID) &eaop, (ULONG) sizeof(EAOP2));
-        // Prevent this error from occuring when scanning a directory
-        // that contains a locked data file
-        if (rc && rc != ERROR_SHARING_VIOLATION) {
-          CHAR s[80];
-          sprintf(s, "%s %s",PCSZ_DOSQUERYPATHINFO, "%s");
-          Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                    s, pci->pszFileName);
-        }
+                              (PVOID) &eaop, (ULONG) sizeof(EAOP2));
+        // Prevent this error from occuring when scanning a directory
+        // that contains a locked data file
+        if (rc && rc != ERROR_SHARING_VIOLATION) {
+          CHAR s[80];
+          sprintf(s, "%s %s",PCSZ_DOSQUERYPATHINFO, "%s");
+          Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+                    s, pci->pszFileName);
+        }
           //DbgMsg(pszSrcFile, __LINE__, "DosQueryPathInfo %s failed with rc %u ", pci->pszFileName, rc);
         else {
@@ -475 +477 @@
             if (pfea->cbValue) {
               CHAR *achValue = pfea->szName + pfea->cbName + 1;
-              if (*(USHORT *)achValue != EAT_ASCII)
-                Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                          GetPString(IDS_ERROREATYPETEXT),
-                          achValue, pfea->cbName, pfea->szName);
+              if (*(USHORT *)achValue != EAT_ASCII)
+                Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+                          GetPString(IDS_ERROREATYPETEXT),
+                          achValue, pfea->cbName, pfea->szName);
                 //DbgMsg(pszSrcFile, __LINE__, "EA type 0x%x unexpected for %.*s", achValue, pfea->cbName, pfea->szName);
               else {
@@ -491 +493 @@
                 else if (strncmp(pfea->szName, SUBJECT, pfea->cbName) == 0)
                   pci->pszSubject = pszValue;
-                else
-                  Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                            GetPString(IDS_ERROREATYPETEXT), pfea, pfea->cbName, pfea->szName);
+                else
+                  Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+                            GetPString(IDS_ERROREATYPETEXT), pfea, pfea->cbName, pfea->szName);
                   //DbgMsg(pszSrcFile, __LINE__, "pfea %p EA %.*s unexpected", pfea, pfea->cbName, pfea->szName);
               }
@@ -513 +515 @@
                               const PSZ pszDirectory,
                               const PFILEFINDBUF4L pffb,
-                              const BOOL partial,
+                              const BOOL partial,
                               DIRCNRDATA *dcd)
 {
@@ -705 +707 @@
                               const PSZ pszFileName,
                               const PFILESTATUS4L pfsa4,
-                              const BOOL partial,
-                              CHAR *pszFSType,  // Optional
+                              const BOOL partial,
+                              CHAR *pszFSType,  // Optional
                               DIRCNRDATA *dcd)  // Optional
 {
@@ -867 +869 @@
                       const BOOL recurse,
                       const BOOL partial,
-                      CHAR *stopflag,
-                      DIRCNRDATA *dcd,  // Optional
-                      ULONG *pulTotalFiles,     // Optional
+                      CHAR *stopflag,
+                      DIRCNRDATA *dcd,                  // Optional
+                      ULONG *pulTotalFiles,             // Optional
                       PULONGLONG pullTotalBytes)        // Optional
 {
@@ -888 +890 @@
   ULONG ulFindMax;
   ULONG ulSelCnt;
-  ULONG ulTotal = 0;
+  ULONG cAffbTotal = 0;
   ULONGLONG ullBytes;
   ULONGLONG ullTotalBytes;
@@ -945 +947 @@
     priority_normal();
     pszFileSpec[strlen(pszFileSpec) - 1] = 0;     // Chop off wildcard
-    //*pchEndPath = 0;
     if (!rc) {
       do {
@@ -987 +988 @@
             if (!pciFirst) {
               Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
-                        GetPString(IDS_CMALLOCRECERRTEXT));
+                        GetPString(IDS_CMALLOCRECERRTEXT));
               ok = FALSE;
               ullTotalBytes = 0;
@@ -995 +996 @@
               pci = pciFirst;
               ullTotalBytes = 0;
-              // Insert selected in container
+              // Finish filling pci items
               for (x = 0; x < ulSelCnt; x++) {
                 pffbFile = papffbSelected[x];
@@ -1003 +1004 @@
                 ullTotalBytes += ullBytes;
               } // for
+              // Insert selected in container
               memset(&ri, 0, sizeof(RECORDINSERT));
               ri.cb = sizeof(RECORDINSERT);
@@ -1010 +1012 @@
               ri.cRecordsInsert = ulSelCnt;
               ri.fInvalidateRecord = TRUE;
-               // !fSyncUpdates && dcd && dcd->type == DIR_FRAME ? FALSE : TRUE; //fSyncUpdates always TRUE 12-1-08 GKY
               if (!WinSendMsg(hwndCnr,
                               CM_INSERTRECORD,
@@ -1026 +1027 @@
                     FreeCnrItemList(hwndCnr, pciFirst);
                 }
-              // }
               }
             }
@@ -1032 +1032 @@
               ullReturnBytes += ullTotalBytes;
               ulReturnFiles += ulSelCnt;
+              if (dcd) {
+                dcd->totalfiles += ulSelCnt;
+                dcd->ullTotalBytes += ullTotalBytes;
+              }
             }
           } // if sync updates
@@ -1037 +1041 @@
             // Append newly selected entries to aggregate list
             paffbTemp = xrealloc(paffbTotal,
-                                 sizeof(FILEFINDBUF4L) * (ulSelCnt + ulTotal),
+                                 sizeof(FILEFINDBUF4L) * (ulSelCnt + cAffbTotal),
                                  pszSrcFile, __LINE__);
             if (paffbTemp) {
               // 13 Aug 07 SHL fixme to optimize copy
               paffbTotal = paffbTemp;
-              for (x = 0; x < ulSelCnt; x++)
-                paffbTotal[x + ulTotal] = *papffbSelected[x];
-              ulTotal += ulSelCnt;
+              ullTotalBytes = 0;        // 15 Sep 09 SHL
+              for (x = 0; x < ulSelCnt; x++) {
+                paffbTotal[x + cAffbTotal] = *papffbSelected[x];
+                ullTotalBytes += papffbSelected[x]->cbFile;     // 15 Sep 09 SHL
+              }
+              cAffbTotal += ulSelCnt;
+              // 15 Sep 09 SHL allow timed updates to see
+              if (dcd) {
+                dcd->totalfiles += ulSelCnt;
+                dcd->ullTotalBytes += ullTotalBytes;
+              }
             }
             else {
@@ -1070 +1082 @@
       papffbSelected = NULL;
 
-      if (ulTotal && paffbTotal) {
-
+      if (cAffbTotal && paffbTotal) {
+        // Not fSyncUpdates and have work
         if (stopflag && *stopflag)
           goto Abort;
 
         pciFirst = WinSendMsg(hwndCnr, CM_ALLOCRECORD,
-                              MPFROMLONG(EXTRA_RECORD_BYTES), MPFROMLONG(ulTotal));
+                              MPFROMLONG(EXTRA_RECORD_BYTES), MPFROMLONG(cAffbTotal));
+
         if (!pciFirst) {
           Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__,
@@ -1085 +1098 @@
         else {
           // 04 Jan 08 SHL fixme like comp.c to handle less than ulSelCnt records
+          if (dcd && hwndStatus &&
+              dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent)) {
+            WinSetWindowText(hwndStatus, GetPString(IDS_PLEASEWAITCOUNTINGTEXT));
+          }
           pci = pciFirst;
           ullTotalBytes = 0;
           pffbFile = paffbTotal;
-          for (x = 0; x < ulTotal; x++) {
+          for (x = 0; x < cAffbTotal; x++) {
             ullBytes = FillInRecordFromFFB(hwndCnr, pci, pszFileSpec,
                                            pffbFile, partial, dcd);
             pci = (PCNRITEM) pci->rc.preccNextRecord;
             ullTotalBytes += ullBytes;
+            // 15 Sep 09 SHL allow timed updates to see
+            if (dcd) {
+              dcd->totalfiles = x;
+              dcd->ullTotalBytes = ullTotalBytes;
+            }
             // Can not use offset since we have merged lists - this should be equivalent
             pffbFile = (PFILEFINDBUF4L)((PBYTE)pffbFile + sizeof(FILEFINDBUF4L));
           }
-          if (ulTotal) {
+          if (cAffbTotal) {
             memset(&ri, 0, sizeof(RECORDINSERT));
             ri.cb = sizeof(RECORDINSERT);
@@ -1102 +1124 @@
             ri.pRecordParent = (PRECORDCORE) pciParent;
             ri.zOrder = (ULONG) CMA_TOP;
-            ri.cRecordsInsert = ulTotal;
+            ri.cRecordsInsert = cAffbTotal;
             ri.fInvalidateRecord = (!fSyncUpdates && dcd &&
                                     dcd->type == DIR_FRAME) ? FALSE : TRUE;
@@ -1165 +1187 @@
     while (pci && (INT)pci != -1) {
       if ((pci->attrFile & FILE_DIRECTORY))
-        Stubby(hwndCnr, pci);
+        Stubby(hwndCnr, pci);
       pci = WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pci),
                        MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
@@ -1171 +1193 @@
   }
 
+  // Reset counts in case errors occurred after initially counted
   if (pulTotalFiles)
     *pulTotalFiles = ulReturnFiles;
@@ -1189 +1212 @@
                    TRUE,                // filestoo
                    FALSE,               // recurse
-                   TRUE,                // partial
-                   dcd ? &dcd->stopflag : NULL,
-                   dcd,
+                   TRUE,                // partial
+                   dcd ? &dcd->stopflag : NULL,
+                   dcd,
                    NULL,                // total files
                    pullTotalBytes);
@@ -1228 +1251 @@
     driveflags[x] &= (DRIVE_IGNORE | DRIVE_NOPRESCAN | DRIVE_NOLOADICONS |
                       DRIVE_NOLOADSUBJS | DRIVE_NOLOADLONGS |
-                      DRIVE_INCLUDEFILES | DRIVE_SLOW | DRIVE_NOSTATS |
-                      DRIVE_WRITEVERIFYOFF);
+                      DRIVE_INCLUDEFILES | DRIVE_SLOW | DRIVE_NOSTATS |
+                      DRIVE_WRITEVERIFYOFF);
   }
   memset(driveserial, -1, sizeof(driveserial));
@@ -1297 +1320 @@
         if (!(driveflags[x] & DRIVE_NOPRESCAN)) {
           *szFSType = 0;
-          ulDriveType = 0;
-          memset(&volser, 0, sizeof(volser));
-          DriveFlagsOne(x, szFSType, &volser);
-          driveserial[x] = volser.serial;
+          ulDriveType = 0;
+          memset(&volser, 0, sizeof(volser));
+          DriveFlagsOne(x, szFSType, &volser);
+          driveserial[x] = volser.serial;
           memset(&fsa4, 0, sizeof(FILESTATUS4L));
           if (!fVerifyOffChecked[x]) {
@@ -1343 +1366 @@
               pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
               if (fShowFSTypeInTree || fShowDriveLabelInTree) {
-                strcat(szDrive, " [");
-                strcat(szDrive, szFSType);
-                strcat(szDrive, "]");
+                strcat(szDrive, " [");
+                strcat(szDrive, szFSType);
+                strcat(szDrive, "]");
               }
               pci->pszDisplayName = xstrdup(szDrive, pszSrcFile, __LINE__);
@@ -1549 +1572 @@
                                 CM_QUERYRECORD,
                                 MPVOID,
-                                MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+                                MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
     while (pci && (INT)pci != -1) {
       stubbyScan = xmallocz(sizeof(STUBBYSCAN), pszSrcFile, __LINE__);
@@ -1576 +1599 @@
             {
               xfree(stubbyScan, pszSrcFile, __LINE__);
-            }
+            }
           } // if drive for scanning
           else
@@ -1670 +1693 @@
              GetPString(IDS_SUGGEST1TEXT),
              (includesyours) ? GetPString(IDS_SUGGEST2TEXT) : NullStr,
-             suggest);
+             suggest);
       if (MBID_YES) {
         char s[64];
@@ -1691 +1714 @@
       }
       else if (MBID_CANCEL) {
-        fDontSuggestAgain = TRUE;
-        PrfWriteProfileData(fmprof, appname, "DontSuggestAgain", &fDontSuggestAgain, sizeof(BOOL));
+        fDontSuggestAgain = TRUE;
+        PrfWriteProfileData(fmprof, appname, "DontSuggestAgain", &fDontSuggestAgain, sizeof(BOOL));
       }
     }

trunk/dll/fm3dll2.h ¶

@@ -29 +29 @@
   12 Sep 09 GKY Add FM3.INI User ini and system ini to submenu for view ini
   14 Sep 09 SHL Drop experimental code
+  15 Sep 09 SHL Add rescan progress timer
 
   Align with spaces only - no tabs please
@@ -72 +73 @@
 #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_DIRCNR_TIMER     17          // 15 Sep 09 SHL Added
 #define ID_NEWVIEW_TIMER    20
-// #define ID_TIMER6           21       // 13 Jul 09 SHL Dropped
-#define ID_LED_TIMER        22
+#define ID_LED_TIMER        21
 
 // Window ids, etc.

trunk/dll/fm3res.rc ¶

@@ -44 +44 @@
   12 Sep 09 GKY Add FM3.INI User ini and system ini to submenu for view ini              
   15 Sep 09 SHL Update for Thread notes text changes
+  15 Sep 09 SHL Add rescan progress messages
 
 ***********************************************************************/
@@ -3282 +3283 @@
     IDS_RESCANALLDRIVESTEXT               "Rescan all drives"
     IDS_REFRESHREMOVABLESTEXT             "Refresh removable media"
+    IDS_PLEASEWAITSCANNINGTEXT            "Please wait -- scanning..."
+    IDS_PLEASEWAITCOUNTINGTEXT            "Please wait -- counting..."
 
     // Add strings that need to be combined by GetPString here

trunk/dll/fm3str.h ¶

@@ -23 +23 @@
   26 Aug 08 GKY Error strings for require unique ID plus text and help strings for all tools
   03 Jan 09 GKY Check for system that is protectonly to gray out Dos/Win command lines and prevent
-                Dos/Win programs from being inserted into the execute dialog with message why.
+                Dos/Win programs from being inserted into the execute dialog with message why.
   10 Jan 09 GKY Removed rotating strings for font samples as part of StringTable conversion
   11 Jan 08 GKY Move strings that will need translating to stringtable from sting file cut to
-                255 where necessary
+                255 where necessary
   04 Feb 09 SHL Switch to STRINGTABLE
   07 Feb 09 GKY Eliminate Win_Error2 by moving function names to PCSZs used in Win_Error
@@ -36 +36 @@
                 and rescans drive in tree container depending on container focus, greyed out
                 inappropriate menu context choices
+  15 Sep 09 SHL Add ids for rescan progress messages
 
 ***********************************************************************/
@@ -819 +820 @@
 #define IDS_DELETEDTEXT                                       819
 #define IDS_OPSCOMPLETETEXT                                   820
-//Drive flag strings these must remain in order and be sequential to work
+// Drive flags strings must remain in order and be sequential to work
 #define IDS_FLREMOVABLETEXT                                   821
 #define IDS_FLNOTWRITEABLETEXT                                822
@@ -840 +841 @@
 #define IDS_FLWRITEVERIFYOFFTEXT                              839
 #define IDS_FLRECURSESCANDONETEXT                             840
-//End drive flag strings
+// End drive flag strings
 #define IDS_CANTQUERYVOLTEXT                                  841
 #define IDS_CANTQUERYALLOCTEXT                                842
@@ -853 +854 @@
 #define IDS_CANTLOADHELPTEXT                                  851
 #define IDS_NOHELPACCEPTTEXT                                  852
-//#define IDS_NOHELPABORTTEXT                                   851 //Not used
 #define IDS_MISMATCHTITLETEXT                                 853
 #define IDS_MISMATCHTEXT                                      854
 #define IDS_CHECKSYSTEMCLOCKTEXT                              856
 #define IDS_NOTICETITLETEXT                                   857
-#define IDS_UPGRADETEXT                                       858 //Not used
-#define IDS_PERNODETEXT                                       859 //Not used
-#define IDS_USUALDISCTEXT                                     860 //Not used
+#define IDS_PLEASEWAITSCANNINGTEXT                            858
+#define IDS_PLEASEWAITCOUNTINGTEXT                            859
+// #define IDS_USUALDISCTEXT                                     860 //Not used
+
 #define IDS_ARCCNRFILTERMENUHELP                              867
 #define IDS_ARCCNRWALKDIRMENUHELP                             868