Changeset 1439 for trunk/dll/treecnr.c

Timestamp:

Jul 12, 2009, 11:57:04 PM (16 years ago)

Author:

Gregg Young

Message:

Changes to allow high mem loading of dll; Refactor .LONGNAME and .SUBJECT EA fetch to FetchCommonEAs. Add szFSType to FillInRecordFromFSA use to bypass EA scan and size formatting for tree container; Fix labels/FS type to work on scan on NOPRESCAN Drives; Fixed dbl directory names on restore of dir cnrs; (Tickets 47, 339, 363, 368, 369, 370)

File:

• trunk/dll/treecnr.c (modified) (14 diffs)

trunk/dll/treecnr.c

@@ -70 +70 @@
   07 Jun 09 GKY Fixed double names in tree container when collapsed tree is accessed
                 before recursive scan
+  12 Jul 09 GKY Add option to show file system type or drive label in tree
+                (get NOPRESCAN drives working)
+
 ***********************************************************************/
 
@@ -274 +277 @@
         if (!stricmp(dirname, pciP->pszFileName))
           break;                        // Found it
-        if (~pciP->rc.flRecordAttr & CRA_EXPANDED) {
-          if (!(driveflags[toupper(*pciP->pszFileName) - 'A'] & DRIVE_RSCANNED)) {
-            WinSendMsg(hwndCnr, UM_RESCAN, MPFROMP(pciP), MPVOID);
-            WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
-          }
-          else
-            WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
-        }
+        if (~pciP->rc.flRecordAttr & CRA_EXPANDED)
+          WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
         strcpy(szDir, dirname);
         if (p - szDir >= strlen(szDir))
@@ -336 +333 @@
                           MPFROM2SHORT(CMA_PARENT, CMA_ITEMORDER));
         if (pciP && (INT) pciP != -1) {
-          if (!(pciP->rc.flRecordAttr & CRA_EXPANDED)) {
-            if (!(driveflags[toupper(*pciP->pszFileName) - 'A'] & DRIVE_RSCANNED)) {
-              WinSendMsg(hwndCnr, UM_RESCAN, MPFROMP(pciP), MPVOID);
-              WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
-            }
-            else
-              WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
-          }
+          if (!(pciP->rc.flRecordAttr & CRA_EXPANDED)) 
+            WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
           pciToSelect = pciP;
         }
@@ -358 +349 @@
         ShowCnrRecord(hwndCnr, (PMINIRECORDCORE) pciToSelect);
       }
-      if (fSwitchTreeExpand && ~pciToSelect->rc.flRecordAttr & CRA_EXPANDED) {
-        if (!(driveflags[toupper(*pciToSelect->pszFileName) - 'A'] & DRIVE_RSCANNED)) {
-          WinSendMsg(hwndCnr, UM_RESCAN, MPFROMP(pciToSelect), MPVOID);
-          WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
-        }
-        else
-          WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
-      }
+      if (fSwitchTreeExpand && ~pciToSelect->rc.flRecordAttr & CRA_EXPANDED) 
+        WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
       if (!quickbail) {
         WinSendMsg(hwndCnr,
@@ -375 +360 @@
   }
   WinEnableWindowUpdate(hwndCnr, TRUE);
-  //DosSleep(1);                        // Let GUI update
 }
 
@@ -1829 +1813 @@
                   if (Flesh(hwnd, pci) &&
                       SHORT2FROMMP(mp1) == CN_EXPANDTREE &&
-                      !dcd->suspendview && fTopDir)
-                    PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
+                      !dcd->suspendview && fTopDir) {
+                    PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
+                    //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
+                  }
                 }
                 driveserial[toupper(*pci->pszFileName) - 'A'] = volser.serial;
@@ -1843 +1829 @@
             }
             else if (SHORT2FROMMP(mp1) == CN_EXPANDTREE) {
-              if (Flesh(hwnd, pci) && !dcd->suspendview && fTopDir)
-                PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
-            }
-            if (SHORT2FROMMP(mp1) == CN_EXPANDTREE && !dcd->suspendview)
-              WinSendMsg(hwnd, UM_FILTER, MPVOID, MPVOID);
+              if (Flesh(hwnd, pci) && !dcd->suspendview && fTopDir){
+                PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
+                //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
+              }
+            }
+            if (SHORT2FROMMP(mp1) == CN_EXPANDTREE && !dcd->suspendview){
+              WinSendMsg(hwnd, UM_FILTER, MPVOID, MPVOID);
+              //DbgMsg(pszSrcFile, __LINE__, "UM_FILTER %p pci %p", hwnd, pci);
+            }
           }
         }
@@ -1942 +1932 @@
             CHAR volumelabel[CCHMAXPATH];
           }
-          volser;
+          volser;
+          CHAR FileSystem[CCHMAXPATH];
+          CHAR szBuf[CCHMAXPATH];
 
           pciL = pciP = pci;
@@ -1965 +1957 @@
             INT removable, x = (INT) (toupper(*pci->pszFileName) - 'A');
             ULONG drvtype;
-            CHAR FileSystem[CCHMAXPATH];
 
             DosError(FERR_DISABLEHARDERR);
@@ -2008 +1999 @@
                 driveflags[x] |= DRIVE_NOLONGNAMES;
               }
-              SelectDriveIcon(pciP);
-              WinSendMsg(hwnd,
-                         CM_INVALIDATERECORD,
-                         MPFROMP(&pciP),
-                         MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
+              SelectDriveIcon(pciP);
               if (hwndMain)
                 PostMsg(hwndMain, UM_BUILDDRIVEBAR, MPVOID, MPVOID);
@@ -2022 +2009 @@
                                   FSIL_VOLSER, &volser,
                                   (ULONG) sizeof(volser));
-          if (!status) {
+          if (!status) {
             if (!volser.serial ||
                 driveserial[toupper(*pci->pszFileName) - 'A'] !=
@@ -2036 +2023 @@
             if (!pciL)
               Flesh(hwnd, pciP);
-          }
+            if (fShowFSTypeInTree) {
+              strcpy(szBuf, pciP->pszFileName);
+              strcat(szBuf, " [");
+              strcat(szBuf, FileSystem);
+              strcat(szBuf, "]");
+              pciP->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
+              }
+            else if (fShowDriveLabelInTree) {
+              strcpy(szBuf, pciP->pszFileName);
+              strcat(szBuf, " [");
+              strcat(szBuf, volser.volumelabel);
+              strcat(szBuf, "]");
+              pciP->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
+            }
+            pciP->rc.pszIcon = pciP->pszDisplayName;
+            WinSendMsg(hwnd,
+                       CM_INVALIDATERECORD,
+                       MPFROMP(&pciP),
+                       MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
+          }
           else {
             driveserial[toupper(*pci->pszFileName) - 'A'] = -1;
@@ -2356 +2362 @@
       dcd->suspendview = tempsusp;
       PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
+      //DbgMsg(pszSrcFile, __LINE__, "UM_RESCAN %p pci %s", hwnd, (CHAR *) mp1);
     }
     return 0;
@@ -2622 +2629 @@
         runemf2(SEPARATE | WINDOWED | BACKGROUND | MINIMIZED | WAIT,
                 HWND_DESKTOP, pszSrcFile, __LINE__, NULL, NULL,
-                "%s %s", PCSZ_LVMEXE, "/RediscoverPRM");
-         PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+                "%s %s", PCSZ_LVMEXE, "/RediscoverPRM");
+        PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
         break;