Changeset 1650

Timestamp:

Nov 19, 2011, 10:21:47 PM (14 years ago)

Author:

Gregg Young

Message:

It helps if you actually save the file after you clean it up. See previous commit

Location:

trunk/dll

Files:

• flesh.c (modified) (1 diff)
• treecnr.c (modified) (2 diffs)

trunk/dll/flesh.c

@@ -192 +192 @@
                                MPFROMP(pciParent),
                                MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
-  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))
-      dcd = NULL;
-    if (driveflags[toupper(*pciParent->pszFileName) - 'A'] &
-        DRIVE_INCLUDEFILES)
-      includefiles = TRUE;
-#if 0
-    if (fInitialDriveScan) {
-      PROCESSDIR *ProcessDir;
-
-      ProcessDir = xmallocz(sizeof(PROCESSDIR), pszSrcFile, __LINE__);
-      if (!ProcessDir)
-        return FALSE;
-      ProcessDir->hwndCnr = hwndCnr;
-      ProcessDir->pciParent = pciParent;
-      ProcessDir->szDirBase = pciParent->pszFileName;
-      ProcessDir->filestoo = includefiles;
-      ProcessDir->recurse = TRUE;
-      ProcessDir->partial = TRUE;
-      ProcessDir->stopflag = NULL;
-      ProcessDir->dcd = dcd;
-      ProcessDir->pulTotalFiles = NULL;
-      ProcessDir->pullTotalBytes = NULL;
-
-      if (xbeginthread(ProcessDirectoryThread,
-                       65536,
-                       ProcessDir,
-                       pszSrcFile,
-                       __LINE__) == -1)
-      {
-        xfree(ProcessDir, pszSrcFile, __LINE__);
-      }
-    }
-    else {
-# endif
-      ProcessDirectory(hwndCnr,
-                       pciParent,
-                       pciParent->pszFileName,
-                       includefiles,    // filestoo
-                       TRUE,            // recurse
-                       TRUE,            // partial
-                       NULL,            // stop flag
-                       dcd,
-                       NULL,            // total files
-                       NULL);           // total bytes
-#if 0
-    }
-#endif
-    driveflags[*pciParent->pszFileName - 'A'] |= DRIVE_RSCANNED;
-  //}
+  if (pciL && (INT) pciL != -1 && *pciL->pszFileName)
+    return FALSE; 
+  dcd = INSTDATA(hwndCnr);
+  if (dcd && dcd->size != sizeof(DIRCNRDATA))
+    dcd = NULL;
+  if (driveflags[toupper(*pciParent->pszFileName) - 'A'] &
+      DRIVE_INCLUDEFILES)
+    includefiles = TRUE;
+    ProcessDirectory(hwndCnr,
+                     pciParent,
+                     pciParent->pszFileName,
+                     includefiles,      // filestoo
+                     TRUE,              // recurse
+                     TRUE,              // partial
+                     NULL,              // stop flag
+                     dcd,
+                     NULL,              // total files
+                     NULL);             // total bytes
+  driveflags[*pciParent->pszFileName - 'A'] |= DRIVE_RSCANNED;
   return TRUE;
 }

trunk/dll/treecnr.c

@@ -3126 +3126 @@
     if (apphead) {
       APPNOTIFY *info, *next;
+
       info = apphead;
       while (info) {
@@ -3140 +3141 @@
   } // switch
   if (dcd && dcd->oldproc){
-      return dcd->oldproc(hwnd, msg, mp1, mp2);
+    return dcd->oldproc(hwnd, msg, mp1, mp2);
   }
   else
-      return PFNWPCnr(hwnd, msg, mp1, mp2);
+    return PFNWPCnr(hwnd, msg, mp1, mp2);
 }