Changeset 1555

Timestamp:

Nov 21, 2010, 8:02:03 PM (15 years ago)

Author:

Gregg Young

Message:

Minor cleanup of the scanning code.

Location:

trunk/dll

Files:

• filldir.c (modified) (2 diffs)
• init.c (modified) (1 diff)
• treecnr.c (modified) (4 diffs)

trunk/dll/filldir.c

@@ -264 +264 @@
   } // if StubbyScan
   ProcessDirCount++;
-  DbgMsg(pszSrcFile, __LINE__, "ProcessDirCount %i FixedVolume %i",
-         ProcessDirCount, FixedVolume);
+  //DbgMsg(pszSrcFile, __LINE__, "ProcessDirCount %i FixedVolume %i",
+  //       ProcessDirCount, FixedVolume);
   if (ProcessDirCount >= FixedVolume) {
     DosReleaseMutexSem(hmtxScanning);
@@ -281 +281 @@
       }
     }
+    ProcessDirCount = 0;
+    FixedVolume = 0;
     fInitialDriveScan = FALSE;
   }

trunk/dll/init.c

@@ -1111 +1111 @@
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               PCSZ_DOSCREATEMUTEXSEM);
-  if (DosCreateMutexSem(NULL, &hmtxScanning, 0L, FALSE))
+  if (DosCreateMutexSem(NULL, &hmtxScanning, 0L, TRUE))
     Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               PCSZ_DOSCREATEMUTEXSEM);

trunk/dll/treecnr.c

@@ -793 +793 @@
               }
               else
-                *szFree = 0;
+                *szFree = 0;
+              //Show information on status line not shown in the tree container
               driveserial[toupper(*pci->pszFileName) - 'A'] = volser.serial;
-              if (CheckDrive(toupper(*pci->pszFileName), FileSystem, &type) == -1 ||
-                  fShowFSTypeInTree)
+              if (CheckDrive(toupper(*pci->pszFileName), FileSystem, &type) == -1 ||
+                  fShowFSTypeInTree)
                 strcpy(FileSystem, NullStr);
               if (fShowDriveLabelInTree)
@@ -809 +810 @@
                 sprintf(s,
                         GetPString(fShowFSTypeInTree ? IDS_TREESTATUSSTART1TEXT :
-                                   fShowDriveLabelInTree
-                                   ? IDS_TREESTATUSSTART2TEXT : IDS_TREESTATUSSTARTTEXT),
-                        toupper(*pci->pszFileName), FileSystem,
-                        szTmpLabel, volser.serial, szFree);
+                                   fShowDriveLabelInTree ? IDS_TREESTATUSSTART2TEXT :
+                                   IDS_TREESTATUSSTARTTEXT), toupper(*pci->pszFileName),
+                        FileSystem, szTmpLabel, volser.serial, szFree);
                 strcat(s, temp);
               }
@@ -819 +819 @@
                 sprintf(&s[strlen(s)],
                         GetPString(fShowFSTypeInTree ? IDS_TREESTATUSSTART1TEXT :
-                                   fShowDriveLabelInTree
-                                   ? IDS_TREESTATUSSTART2TEXT : IDS_TREESTATUSSTARTTEXT),
-                        toupper(*pci->pszFileName), FileSystem,
-                        szTmpLabel, volser.serial, szFree);
+                                   fShowDriveLabelInTree ? IDS_TREESTATUSSTART2TEXT :
+                                   IDS_TREESTATUSSTARTTEXT), toupper(*pci->pszFileName),
+                        FileSystem, szTmpLabel, volser.serial, szFree);
                 strcat(s, "]");
               }
@@ -1907 +1906 @@
 
       DosRequestMutexSem(hmtxScanning, SEM_INDEFINITE_WAIT);
+      DosQueryEventSem(hevTreeCnrScanComplete, &ulScanPostCnt);
+      if (ulScanPostCnt < 1)
+        return 0;
       DosResetEventSem(hevTreeCnrScanComplete, &ulScanPostCnt);
       if (fFollowTree)