Changeset 1444 for trunk/dll/filldir.c

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)

File:

• trunk/dll/filldir.c (modified) (23 diffs)

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