Changeset 1838 for trunk/dll/dircnrs.c

Timestamp:

Aug 3, 2015, 12:14:21 AM (10 years ago)

Author:

Gregg Young

Message:

Serialize local hard drive scanning to reduce drive thrashing continue to scan all other drive types in separate threads. Ticket [561] Remove unneed SubbyScan code and improve suppression of blank lines and duplicate subdirectory name caused by running Stubby in worker threads.

File:

• trunk/dll/dircnrs.c (modified) (7 diffs)

trunk/dll/dircnrs.c

@@ -90 +90 @@
   02 May 15 GKY Changes to allow a JAVA executable object to be created using "Real object"
                 menu item on a jar file.
+  02 Aug 15 GKY Remove unneed SubbyScan code and improve suppression of blank lines and
+                duplicate subdirectory name caused by running Stubby in worker threads.
 
 ***********************************************************************/
@@ -832 +834 @@
                        MPVOID, MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
       while (pci && (INT) pci != -1) {
+        if (!pci->pszFileName || !strcmp(pci->pszFileName, NullStr)) {
+          Runtime_Error(pszSrcFile, __LINE__, "pci->pszFileName NULL for %p", pci);
+          return 0;
+        }
         if (pci->attrFile & FILE_DIRECTORY) {
           pciC = WinSendMsg(dcd->hwndCnr,
@@ -837 +843 @@
                             MPFROMP(pci),
                             MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
-          if (!pciC) {
-            Stubby(dcd->hwndCnr, pci);
-          }
+          if (!pciC) {
+            Stubby(dcd->hwndCnr, pci);
+          }
         }
         pci = WinSendMsg(dcd->hwndCnr,
@@ -895 +901 @@
         if (fSwitchTreeOnDirChg) {
           // Keep drive tree in sync with directory container
-          PSZ pszTempDir;
-          while (fInitialDriveScan) {
-            DosSleep(100);                      // Allow to complete
-          }
+          PSZ pszTempDir;
+          while (fInitialDriveScan)
+            DosSleep(10);                       // Allow to complete
+          DosSleep(50);
           pszTempDir = xstrdup(dcd->directory, pszSrcFile, __LINE__);
           if (pszTempDir) {
@@ -1563 +1569 @@
       WinSendMsg(hwnd,
                  CM_QUERYCNRINFO,
-                 MPFROMP(&cnri), MPFROMLONG(sizeof(CNRINFO)));
+                 MPFROMP(&cnri), MPFROMLONG(sizeof(CNRINFO)));
       cnri.pSortRecord = (PVOID) SortDirCnr;
       WinSendMsg(hwnd,
@@ -1590 +1596 @@
         cnri.flWindowAttr &= (~(CV_TREE | CV_ICON | CV_DETAIL | CV_TEXT));
         cnri.flWindowAttr |= (CV_NAME | CA_DETAILSVIEWTITLES | CV_MINI |
-                              CV_FLOW);
+                              CV_FLOW);
         cnri.pSortRecord = (PVOID) SortDirCnr;
 
@@ -2122 +2128 @@
             dcd->sortFlags |= SORT_REVERSE;
           break;
-        }
+        }
         WinSendMsg(hwnd, CM_SORTRECORD, MPFROMP(SortDirCnr),
                    MPFROMLONG(dcd->sortFlags));