Changeset 1326 for trunk/dll/filldir.c

Timestamp:

Dec 9, 2008, 3:18:36 AM (16 years ago)

Author:

Gregg Young

Message:

Changes to avoid duplicate directory names on scan using StubbyScanThread.

File:

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

trunk/dll/filldir.c ¶

@@ -122 +122 @@
   HWND        hwndDrivesList;
   BOOL        RamDrive;
-  BOOL        FirstDrive;
 }
 STUBBYSCAN;
@@ -219 +218 @@
                      MPFROM2SHORT(LIT_SORTASCENDING, 0),
                      MPFROMP(StubbyScan->pci->pszFileName));
-        }
+        }
         StubbyScanCount--;
-        if (StubbyScan->FirstDrive) {
-          priority_critical();
-          while (StubbyScanCount != 0)
-            DosSleep(50);
-          DosPostEventSem(DriveScanStart);
-        }
+        if (StubbyScanCount == 0)
+          fInitialDriveScan = FALSE;
         WinDestroyMsgQueue(hmq);
       }
@@ -359 +354 @@
   CHAR *p;
   HPOINTER hptr;
+  ULONG flags;
 
   pci->hwndCnr = hwndCnr;
@@ -395 +391 @@
     memcpy(p, pffb->achName, pffb->cchName + 1);
   }
-
+  flags = driveflags[toupper(*pci->pszFileName) - 'A'];
   // load the object's Subject, if required
-  pci->pszSubject = NullStr;
+  // pci->pszSubject = NullStr; dubplicate see below 12-05-08 GKY
   if (pffb->cbList > 4L &&
       dcd && fLoadSubject &&
       (isalpha(*pci->pszFileName) &&
-       !(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLOADSUBJS)))
+       !(flags & DRIVE_NOLOADSUBJS)))
   {
     APIRET rc;
@@ -447 +443 @@
       pffb->cbList > 4L &&
       isalpha(*pci->pszFileName) &&
-      ~driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLONGNAMES &&
-      ~driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLOADLONGS)
+      ~flags & DRIVE_NOLONGNAMES &&
+      ~flags & DRIVE_NOLOADLONGS)
   {
     APIRET rc;
@@ -508 +504 @@
     // is directory
     if (fNoIconsDirs ||
-        (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLOADICONS) ||
+        (flags & DRIVE_NOLOADICONS) ||
         !isalpha(*pci->pszFileName)) {
       hptr = (HPOINTER) 0;
@@ -518 +514 @@
     // is file
     if (fNoIconsFiles ||
-        (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLOADICONS) ||
+        (flags & DRIVE_NOLOADICONS) ||
         !isalpha(*pci->pszFileName)) {
       hptr = (HPOINTER) 0;
@@ -531 +527 @@
   if (!hptr) {
     hptr = pffb->attrFile & FILE_DIRECTORY ?
-      hptrDir : pffb->attrFile & FILE_SYSTEM ?
-                  hptrSystem :
-                    pffb->attrFile & FILE_HIDDEN ?
-                    hptrHidden :
-                    pffb->attrFile & FILE_READONLY ?
-                      hptrReadonly : hptrFile;
+           hptrDir : pffb->attrFile & FILE_SYSTEM ?
+           hptrSystem : pffb->attrFile & FILE_HIDDEN ?
+           hptrHidden : pffb->attrFile & FILE_READONLY ?
+           hptrReadonly : hptrFile;
   }
 
@@ -638 +632 @@
   HPOINTER hptr;
   CHAR *p;
+  ULONG flags;
 
   // fill in a container record from a FILESTATUS4L structure
@@ -644 +639 @@
   pci->pszFileName = xstrdup(pszFileName, pszSrcFile, __LINE__);
   //strcpy(pci->pszFileName, pszFileName);
-
+  flags = driveflags[toupper(*pci->pszFileName) - 'A'];
   // load the object's Subject, if required
-  pci->pszSubject = NullStr;
+  //pci->pszSubject = NullStr;
   if (pfsa4->cbList > 4 &&
       dcd &&
       fLoadSubject &&
       (!isalpha(*pci->pszFileName) ||
-       !(driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLOADSUBJS)))
+       !(flags & DRIVE_NOLOADSUBJS)))
   {
     APIRET rc;
@@ -696 +691 @@
       pfsa4->cbList > 4L &&
       isalpha(*pci->pszFileName) &&
-      ~driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLONGNAMES &&
-      ~driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLOADLONGS)
+      ~flags & DRIVE_NOLONGNAMES &&
+      ~flags & DRIVE_NOLOADLONGS)
   {
     APIRET rc;
@@ -746 +741 @@
   if (pfsa4->attrFile & FILE_DIRECTORY) {
     if (fNoIconsDirs ||
-        (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLOADICONS) ||
+        (flags & DRIVE_NOLOADICONS) ||
         !isalpha(*pci->pszFileName)) {
       hptr = (HPOINTER) 0;
@@ -755 +750 @@
   else {
     if (fNoIconsFiles ||
-        (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_NOLOADICONS) ||
+        (flags & DRIVE_NOLOADICONS) ||
         !isalpha(*pci->pszFileName)) {
       hptr = IDFile(pci->pszFileName);
@@ -1272 +1267 @@
       CHAR s[80];
       ULONG flags = 0;
-      ULONG size = sizeof(ULONG);
 
       *szDrive = (CHAR)x + 'A';         // Build path spec
 
       sprintf(s, "%c.DriveFlags", toupper(*szDrive));
-      if (PrfQueryProfileData(fmprof, appname, s, &flags, &size) &&
-          size == sizeof(ULONG)) {
+      if (PrfQueryProfileData(fmprof, appname, s, &flags, &sizeUlong)) {
         driveflags[toupper(*szDrive) - 'A'] |= flags;
       }
@@ -1562 +1555 @@
     HWND hwndDrivesList = WinWindowFromID(WinQueryWindow(hwndParent, QW_PARENT),
                                           MAIN_DRIVELIST);
-    BOOL FirstDrive = TRUE;
 
     pci = (PCNRITEM) WinSendMsg(hwndCnr,
@@ -1577 +1569 @@
       StubbyScan->hwndDrivesList = hwndDrivesList;
       StubbyScan->RamDrive = FALSE;
-      StubbyScan->FirstDrive = FALSE;
       pciNext = (PCNRITEM) WinSendMsg(hwndCnr,
                                       CM_QUERYRECORD,
@@ -1588 +1579 @@
           if (~flags & DRIVE_INVALID &&
               ~flags & DRIVE_NOPRESCAN &&
-              (!fNoRemovableScan || ~flags & DRIVE_REMOVABLE))
+              (!fNoRemovableScan || ~flags & DRIVE_REMOVABLE) && !fDrivetoSkip[drvNum])
           {
             if (DRIVE_RAMDISK)
               StubbyScan->RamDrive = TRUE;
-            if (FirstDrive)
-              StubbyScan->FirstDrive = TRUE;
             rc = _beginthread(StubbyScanThread, NULL, 65536, StubbyScan);
             if (rc == -1)
               Runtime_Error(pszSrcFile, __LINE__,
                             GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            else
-              FirstDrive = FALSE;
           } // if drive for scanning
           else
@@ -1616 +1603 @@
                      MPFROM2SHORT(LIT_SORTASCENDING, 0),
                      MPFROMP(pci->pszFileName));
-        }
+        }
+        fDrivetoSkip[drvNum] = FALSE;
       }
       pci = pciNext;
     } // while
-    StubbyScanCount --;
+    StubbyScanCount--;
+    if (StubbyScanCount == 0)
+      fInitialDriveScan = FALSE;
   }
   if (hwndParent)