Changeset 1550

Timestamp:

Nov 3, 2010, 3:50:42 AM (15 years ago)

Author:

Gregg Young

Message:

This actually fixes the double names in the tree container. It also streamlines the initial scan code by eliminating multiple redundant scans.

Location:

trunk/dll

Files:

• filldir.c (modified) (10 diffs)
• filldir.h (modified) (1 diff)
• findrec.c (modified) (2 diffs)
• flesh.c (modified) (3 diffs)
• mainwnd.c (modified) (2 diffs)
• mainwnd.h (modified) (1 diff)
• treecnr.c (modified) (2 diffs)

trunk/dll/filldir.c

@@ -135 +135 @@
 static PSZ pszSrcFile = __FILE__;
 static BOOL fFirstTime;
+INT FixedVolume = 0;
 
 #pragma data_seg(GLOBAL1)
@@ -215 +216 @@
   HAB thab;
   HMQ hmq = (HMQ) 0;
-  BOOL ok;
+  //BOOL ok;
+  static INT ProcessDirCount = 0;
 
   DosError(FERR_DISABLEHARDERR);
@@ -231 +233 @@
         IncrThreadUsage();
         priority_normal();
-        ok = Stubby(StubbyScan->hwndCnr, StubbyScan->pci);
-        if (ok) {
-          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)) {
-              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->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)) {
+            if (!(flags & ((fRScanNoWrite ? 0 : DRIVE_NOTWRITEABLE) ||
+                           (fRScanSlow ? 0 : DRIVE_SLOW)))) {
+              UnFlesh(StubbyScan->hwndCnr, StubbyScan->pci);
+              Flesh(StubbyScan->hwndCnr, StubbyScan->pci);
+            }
+          }
+          else {
+            Stubby(StubbyScan->hwndCnr, StubbyScan->pci);
+            //if (!ok)
+             // FixedVolume--;
+          }       
+        }
         WinDestroyMsgQueue(hmq);
       }
@@ -254 +258 @@
     free(StubbyScan);
   } // if StubbyScan
+  ProcessDirCount++;
+  DbgMsg(pszSrcFile, __LINE__, "ProcessDirCount %i FixedVolume %i",
+         ProcessDirCount, FixedVolume);
+  if (fInitialDriveScan && ProcessDirCount >= FixedVolume) {
+    fInitialDriveScan = FALSE;
+    DosPostEventSem(hevInitialCnrScanComplete);
+    DosCloseEventSem(hevInitialCnrScanComplete);
+    if (fSwitchTree && hwndTree && fSaveState && pszFocusDir) {
+       // Keep drive tree in sync with directory container
+      if (hwndMain) {
+        //if (TopWindow(hwndMain, (HWND) 0) == dcd->hwndFrame)
+          if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszFocusDir), MPVOID))
+            free(pszFocusDir);
+      }
+      else {
+        if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszFocusDir), MPVOID))
+          free(pszFocusDir);
+      }
+    }
+  }
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -260 +284 @@
 }
 
+#if 0
 VOID ProcessDirectoryThread(VOID * arg)
 {
@@ -265 +290 @@
   HAB thab;
   HMQ hmq = (HMQ) 0;
+  
 
   DosError(FERR_DISABLEHARDERR);
@@ -273 +299 @@
 
   ProcessDir = (PROCESSDIR *)arg;
-  if (ProcessDir && ProcessDir->pciParent && ProcessDir->pciParent->pszFileName && ProcessDir->hwndCnr) {
+  if (ProcessDir && ProcessDir->pciParent && ProcessDir->pciParent->pszFileName &&
+      ProcessDir->hwndCnr) {
     thab = WinInitialize(0);
     if (thab) {
@@ -297 +324 @@
     free(ProcessDir);
   } // if ProcessDir
-  if (fInitialDriveScan) {
-    fInitialDriveScan = FALSE;
-    DosPostEventSem(hevInitialCnrScanComplete);
-    DosCloseEventSem(hevInitialCnrScanComplete);
-  }
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -307 +329 @@
 
 }
+# endif
 
 static HPOINTER IDFile(PSZ p)
@@ -1369 +1392 @@
 
           if (~driveflags[iDrvNum] & DRIVE_REMOVABLE) {
-            // Fixed volume
+            // Fixed volume
+            if (~flags & DRIVE_INVALID && ~flags & DRIVE_NOPRESCAN)
+              FixedVolume++;
             pci->attrFile |= FILE_DIRECTORY;
             DosError(FERR_DISABLEHARDERR);

trunk/dll/filldir.h

@@ -62 +62 @@
 extern HPOINTER hptrReadonly;
 extern HPOINTER hptrSystem;
+extern INT FixedVolume;
 
 typedef struct {

trunk/dll/findrec.c

@@ -124 +124 @@
   qrecrct.fsExtent = (CMA_ICON | CMA_TEXT | CMA_TREEICON);
   if (!WinSendMsg(hwndCnr,
-                  CM_QUERYRECORDRECT, MPFROMP(&rcl), MPFROMP(&qrecrct))) {
+                  CM_QUERYRECORDRECT, MPFROMP(&rcl), MPFROMP(&qrecrct))) {
     qrecrct.fsExtent = CMA_TEXT | CMA_TREEICON;
     WinSendMsg(hwndCnr, CM_QUERYRECORDRECT, MPFROMP(&rcl), MPFROMP(&qrecrct));
@@ -134 +134 @@
   WinSendMsg(hwndCnr,
              CM_SCROLLWINDOW,
-             MPFROMSHORT(CMA_VERTICAL),
-             MPFROMLONG((rclViewport.yTop - (rcl.yTop) - 4)));
+             MPFROMSHORT(CMA_HORIZONTAL), MPFROMLONG(rcl.xRight - rclViewport.xRight));
   WinSendMsg(hwndCnr,
              CM_SCROLLWINDOW,
-             MPFROMSHORT(CMA_HORIZONTAL), MPFROMLONG(rcl.xRight - rclViewport.xRight));
+             MPFROMSHORT(CMA_VERTICAL),
+             MPFROMLONG((rclViewport.yTop - (rcl.yTop) - 4)));
 }
 

trunk/dll/flesh.c

@@ -201 +201 @@
         DRIVE_INCLUDEFILES)
       includefiles = TRUE;
+#if 0
     if (fInitialDriveScan) {
       PROCESSDIR *ProcessDir;
@@ -228 +229 @@
     }
     else {
+# endif
       ProcessDirectory(hwndCnr,
                        pciParent,
@@ -238 +240 @@
                        NULL,            // total files
                        NULL);           // total bytes
-    }
+    //}
   }
   driveflags[*pciParent->pszFileName - 'A'] |= DRIVE_RSCANNED;

trunk/dll/mainwnd.c

@@ -235 +235 @@
 PCSZ FM3Str  = "FM/3";
 RGB2 RGBGREY;
+PSZ pszFocusDir;
 
 #pragma data_seg(DATA1)
@@ -3324 +3325 @@
             RemoveOldCnrSwitches(szPrefix, x);
             continue;
-          }
+          }
+          if (x == 0 && fSwitchTree)
+            pszFocusDir = xstrdup(szDir, pszSrcFile, __LINE__);
           LoadDetailsSwitches(szKeyBase, &localdcd.ds, TRUE);
           hwndDir = (HWND) WinSendMsg(hwndClient,

trunk/dll/mainwnd.h

@@ -89 +89 @@
 extern HWND hwndTree;
 extern USHORT shiftstate;
+extern PSZ pszFocusDir;
 
 #define STATE_NAME_MAX_BYTES 256

trunk/dll/treecnr.c

@@ -359 +359 @@
     if (pciToSelect && (INT) pciToSelect != -1) {
       //DbgMsg(pszSrcFile, __LINE__, "TOP %i %i", fTopDir, maketop);
+      if (fSwitchTreeExpand && ~pciToSelect->rc.flRecordAttr & CRA_EXPANDED)
+        WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
       if (fTopDir || maketop) {
         ShowCnrRecord(hwndCnr, (PMINIRECORDCORE) pciToSelect);
       }
-      if (fSwitchTreeExpand && ~pciToSelect->rc.flRecordAttr & CRA_EXPANDED)
-        WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
       if (!quickbail) {
         WinSendMsg(hwndCnr,
@@ -654 +654 @@
           fTopDir = TRUE;
         }
-        if (fInitialDriveScan)
-          DosWaitEventSem(hevInitialCnrScanComplete, SEM_INDEFINITE_WAIT);
         ShowTreeRec(dcd->hwndCnr, (CHAR *)mp1, fCollapseFirst, TRUE);
+        // fixme Is this PostMsg needed if recursive scan has already been done?
         PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
         dcd->suspendview = (USHORT) tempsusp;