Changeset 1649 for trunk/dll

Timestamp:

Nov 19, 2011, 9:38:33 PM (14 years ago)

Author:

Gregg Young

Message:

Cleanup the scanning code to try to improve scan times.

Location:

trunk/dll

Files:

• filldir.c (modified) (3 diffs)
• flesh.c (modified) (2 diffs)

trunk/dll/filldir.c

@@ -257 +257 @@
                            (fRScanSlow ? 0 : DRIVE_SLOW)))) {
               Flesh(StubbyScan->hwndCnr, StubbyScan->pci);
-            }
+            }
+            else {
+              Stubby(StubbyScan->hwndCnr, StubbyScan->pci);
+            }
           }
           else {
@@ -277 +280 @@
     if (fInitialDriveScan && 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);
-      }
+      if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszFocusDir), MPVOID))
+        free(pszFocusDir);
     }
     ProcessDirCount = 0;
@@ -296 +292 @@
 
 }
-
-#if 0
-VOID ProcessDirectoryThread(VOID * arg)
-{
-  PROCESSDIR *ProcessDir;
-  HAB thab;
-  HMQ hmq = (HMQ) 0;
-
-
-  DosError(FERR_DISABLEHARDERR);
-
-# ifdef FORTIFY
-  Fortify_EnterScope();
-#  endif
-
-  ProcessDir = (PROCESSDIR *)arg;
-  if (ProcessDir && ProcessDir->pciParent && ProcessDir->pciParent->pszFileName &&
-      ProcessDir->hwndCnr) {
-    thab = WinInitialize(0);
-    if (thab) {
-      hmq = WinCreateMsgQueue(thab, 0);
-      if (hmq) {
-        IncrThreadUsage();
-        priority_normal();
-        ProcessDirectory(ProcessDir->hwndCnr,
-                         ProcessDir->pciParent,
-                         ProcessDir->szDirBase,
-                         ProcessDir->filestoo,
-                         ProcessDir->recurse,
-                         ProcessDir->partial,
-                         ProcessDir->stopflag,
-                         ProcessDir->dcd,               // Optional
-                         ProcessDir->pulTotalFiles,     // Optional
-                         ProcessDir->pullTotalBytes);   // Optional
-        WinDestroyMsgQueue(hmq);
-      }
-      DecrThreadUsage();
-      WinTerminate(thab);
-    }
-    free(ProcessDir);
-  } // if ProcessDir
-# ifdef FORTIFY
-  Fortify_LeaveScope();
-#  endif
-
-}
-# endif
 
 static HPOINTER IDFile(PSZ p)

trunk/dll/flesh.c

@@ -192 +192 @@
                                MPFROMP(pciParent),
                                MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
-  if (!pciL || !*pciL->pszFileName) {
-    if (pciL && (INT) pciL != -1)
-      RemoveCnrItems(hwndCnr, pciL, 1, CMA_FREE);
+  if (pciL && (INT) pciL != -1 &&* pciL->pszFileName) //{
+    UnFlesh( hwndCnr, pciParent);
+    //if (pciL && (INT) pciL != -1)
+    //  RemoveCnrItems(hwndCnr, pciL, 1, CMA_FREE);
     dcd = INSTDATA(hwndCnr);
     if (dcd && dcd->size != sizeof(DIRCNRDATA))
@@ -239 +240 @@
                        dcd,
                        NULL,            // total files
-                       NULL);           // total bytes
-    //}
-  }
-  driveflags[*pciParent->pszFileName - 'A'] |= DRIVE_RSCANNED;
+                       NULL);           // total bytes
+#if 0
+    }
+#endif
+    driveflags[*pciParent->pszFileName - 'A'] |= DRIVE_RSCANNED;
+  //}
   return TRUE;
 }