Changeset 1424

Timestamp:

Jun 6, 2009, 9:16:12 PM (16 years ago)

Author:

Gregg Young

Message:

Show either file system type or drive label beside dirve letter in tree. (tickets 47 & 339)

Location:

trunk/dll

Files:

• collect.c (modified) (1 diff)
• filldir.c (modified) (15 diffs)
• filldir.h (modified) (1 diff)
• fm3dlg.h (modified) (1 diff)
• fm3res.dlg (modified) (2 diffs)
• init.c (modified) (1 diff)
• notebook.c (modified) (3 diffs)
• notebook.h (modified) (1 diff)
• treecnr.c (modified) (2 diffs)

trunk/dll/collect.c

@@ -835 +835 @@
                 dcd->ullTotalBytes += FillInRecordFromFSA(dcd->hwndCnr, pci,
                                                           fullname,
-                                                          &fs4, FALSE, dcd);
+                                                          &fs4, FALSE, NULL, dcd);
                 memset(&ri, 0, sizeof(RECORDINSERT));
                 ri.cb = sizeof(RECORDINSERT);

trunk/dll/filldir.c

@@ -108 +108 @@
 #include "common.h"                     // IncrThreadUsage
 #include "excputil.h"                   // xbeginthread
+#include "fm3dlg.h"                     // INFO_LABEL
 
 VOID StubbyScanThread(VOID * arg);
@@ -719 +720 @@
                               const PSZ pszFileName,
                               const PFILESTATUS4L pfsa4,
-                              const BOOL partial,
+                              const BOOL partial,
+                              CHAR *szFSType,
                               DIRCNRDATA *dcd)  // Optional
 {
@@ -725 +727 @@
   CHAR *p;
   ULONG flags;
+  CHAR szBuf[80];
 
   // fill in a container record from a FILESTATUS4L structure
@@ -730 +733 @@
   pci->hwndCnr = hwndCnr;
   pci->pszFileName = xstrdup(pszFileName, pszSrcFile, __LINE__);
-  //strcpy(pci->pszFileName, pszFileName);
   flags = driveflags[toupper(*pci->pszFileName) - 'A'];
-  // load the object's Subject, if required
-  //pci->pszSubject = NullStr;
-  if (pfsa4->cbList > 4 &&
+  if ((pfsa4->cbList > 4) &&
       dcd &&
       fLoadSubject &&
@@ -876 +876 @@
   else
     p = pci->pszFileName;
-  pci->pszDisplayName = p;
+  if (szFSType && (fShowSysType || fShowLabel)) {
+    strcpy(szBuf, p);
+    strcat(szBuf, " [");
+    strcat(szBuf, szFSType);
+    strcat(szBuf, "]");
+    pci->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
+  }
+  else
+    pci->pszDisplayName = p;
 
   //comma format the file size for large file support
@@ -1244 +1252 @@
     while (pci && (INT)pci != -1) {
       if ((pci->attrFile & FILE_DIRECTORY))
-        //if (fInitialDriveScan)
+        if (!fInitialDriveScan)
           Stubby(hwndCnr, pci);
-        /*else {
+        else {
           while (StubbyScanCount != 0)
             DosSleep(50);
           Stubby(hwndCnr, pci);
-        } */
+        }
         //Stubby(hwndCnr, pci);
       pci = WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pci),
@@ -1302 +1310 @@
   CHAR suggest[32];
   CHAR szDrive[] = " :\\";
-  CHAR szFSType[CCHMAXPATH];
+  CHAR szFSType[CCHMAXPATH]; 
   FILESTATUS4L fsa4;
   APIRET rc;
@@ -1366 +1374 @@
       ULONG flags = 0;
       ULONG size = sizeof(ULONG);
+      BOOL FSInfo = FALSE;
+      struct {
+              ULONG serial;
+              CHAR volumelength;
+              CHAR volumelabel[CCHMAXPATH];
+             } volser;
 
       *szDrive = (CHAR)x + 'A';         // Build path spec
@@ -1381 +1395 @@
           removable = CheckDrive(*szDrive, szFSType, &ulDriveType);
           driveserial[x] = -1;
-          if (removable != -1) {
-            struct {
-              ULONG serial;
-              CHAR volumelength;
-              CHAR volumelabel[CCHMAXPATH];
-            } volser;
-
-            DosError(FERR_DISABLEHARDERR);
-            if (!DosQueryFSInfo((ULONG) x,
-                                FSIL_VOLSER, &volser, sizeof(volser))) {
-              driveserial[x] = volser.serial;
-            }
+          if (removable != -1) {
+            DosError(FERR_DISABLEHARDERR);
+            if (!DosQueryFSInfo((ULONG) x + 1,
+                                FSIL_VOLSER, &volser, sizeof(volser))) {
+              driveserial[x] = volser.serial;
+              FSInfo = TRUE;
+            }
+
           }
           else
@@ -1398 +1408 @@
 
           memset(&fsa4, 0, sizeof(FILESTATUS4L));
-          driveflags[x] |= removable == -1 || removable == 1 ?
-                            DRIVE_REMOVABLE : 0;
+          driveflags[x] |= removable == -1 || removable == 1 ? DRIVE_REMOVABLE : 0;
           if (ulDriveType & DRIVE_REMOTE)
             driveflags[x] |= DRIVE_REMOTE;
@@ -1447 +1456 @@
             }
           }
+          if (strcmp(volser.volumelabel, "") != 0 && FSInfo && fShowLabel)
+            strcpy(szFSType, volser.volumelabel);
           pci->rc.flRecordAttr |= CRA_RECORDREADONLY;
           if ((ULONG)(toupper(*szDrive) - '@') == ulCurDriveNum)
@@ -1471 +1482 @@
                 *suggest = '/';
                 suggest[1] = 0;
-              }
-              sprintf(suggest + strlen(suggest), "%c" , toupper(*szDrive));
-              pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-              pci->pszDisplayName = pci->pszFileName;
+              }
+
+              sprintf(suggest + strlen(suggest), "%c" , toupper(*szDrive));
+              pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
+              if (fShowSysType || fShowLabel) {
+                strcat(szDrive, " [");
+                strcat(szDrive, szFSType);
+                strcat(szDrive, "]");
+              }
+              pci->pszDisplayName = xstrdup(szDrive, pszSrcFile, __LINE__);
+              szDrive[3] = 0;
               pci->rc.pszIcon = pci->pszDisplayName;
               pci->attrFile = FILE_DIRECTORY;
@@ -1480 +1498 @@
               driveserial[x] = -1;
             }
-            else
-              FillInRecordFromFSA(hwndCnr, pci, szDrive, &fsa4, TRUE, NULL);
+            else
+              FillInRecordFromFSA(hwndCnr, pci, szDrive, &fsa4, TRUE, szFSType, NULL);
           }
           else {
-            // Removable volume
-            pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-            pci->pszDisplayName = pci->pszFileName;
+            // Removable volume
+            pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
+            if (fShowSysType || fShowLabel) {
+              strcat(szDrive, " [");
+              strcat(szDrive, szFSType);
+              strcat(szDrive, "]");
+            }
+            pci->pszDisplayName = xstrdup(szDrive, pszSrcFile, __LINE__);
+            szDrive[3] = 0;
             pci->rc.pszIcon = pci->pszDisplayName;
             pci->attrFile = FILE_DIRECTORY;
@@ -1498 +1522 @@
         }
         else {
-          pci->rc.hptrIcon = hptrDunno;
-          pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
+          pci->rc.hptrIcon = hptrDunno;
+          pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
+          if (fShowSysType || fShowLabel) {
+            strcat(szDrive, " [");
+            strcat(szDrive, szFSType);
+            strcat(szDrive, "]");
+          }
+          pci->pszDisplayName = xstrdup(szDrive, pszSrcFile, __LINE__);
+          szDrive[3] = 0;
 #         ifdef FORTIFY
           // Will be freed by TreeCnrWndProc WM_DESTROY
           Fortify_SetScope(pci->pszFileName, 2);
 #         endif
-          pci->pszDisplayName = pci->pszFileName;
-          pci->rc.pszIcon = pci->pszFileName;
+          pci->rc.pszIcon = pci->pszDisplayName;
           pci->attrFile = FILE_DIRECTORY;
           pci->pszDispAttr = FileAttrToString(pci->attrFile);
@@ -1513 +1543 @@
       else {
         // diskette drive (A or B)
-        pci->rc.hptrIcon = hptrFloppy;
-        pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-        pci->pszDisplayName = pci->pszFileName;
+        pci->rc.hptrIcon = hptrFloppy;
+        pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
+        if (fShowSysType || fShowLabel)
+          strcat(szDrive, "  [Floppy]");
+        pci->pszDisplayName = xstrdup(szDrive, pszSrcFile, __LINE__);
+        szDrive[3] = 0;
         pci->rc.pszIcon = pci->pszDisplayName;
         pci->attrFile = FILE_DIRECTORY;

trunk/dll/filldir.h

@@ -46 +46 @@
 ULONGLONG FillInRecordFromFSA(HWND hwndCnr, PCNRITEM pci,
                               const PSZ pszFileName, const PFILESTATUS4L pfsa4,
-                              const BOOL partial, DIRCNRDATA *pdcd);
+                              const BOOL partial, CHAR *szFSType, DIRCNRDATA *pdcd);
 VOID FreeCnrItem(HWND hwnd, PCNRITEM pci);
 VOID FreeCnrItemList(HWND hwnd, PCNRITEM pciFirst);

trunk/dll/fm3dlg.h

@@ -605 +605 @@
 
 #define CFGT_FRAME                                                                              25050
-#define CFGT_SWITCHTREEONFOCUS                                          25051
+#define CFGT_SWITCHTREEONFOCUS                                                          25051
 #define CFGT_SWITCHTREE                                                                 25052
-#define CFGT_SWITCHTREEEXPAND                                                   25053
+#define CFGT_SWITCHTREEEXPAND                                                           25053
 #define CFGT_COLLAPSEFIRST                                                              25054
-#define CFGT_DCOPENS                                                                            25055
+#define CFGT_DCOPENS                                                                    25055
 #define CFGT_FOLLOWTREE                                                                 25056
 #define CFGT_VTREEOPENSWPS                                                              25057
-#define CFGT_TOPDIR                                                                             25058
-#define CFGT_SHOWENV                                                                            25059
-#define CFGT_ENVVARLIST                                                                         25060
+#define CFGT_TOPDIR                                                                     25058
+#define CFGT_SHOWENV                                                                    25059
+#define CFGT_ENVVARLIST                                                                 25060
+#define CFGT_SYSTYPELABEL                                                               25061
 
 #define CFGC_FRAME                                                                              25100

trunk/dll/fm3res.dlg

@@ -1954 +1954 @@
             WS_SAVEBITS
     BEGIN
-        AUTOCHECKBOX    "~Follow Drive Tree", CFGT_FOLLOWTREE, 4, 128, 132,
+        AUTOCHECKBOX    "~Follow Drive Tree", CFGT_FOLLOWTREE, 4, 128, 112,
                         10, WS_GROUP
         AUTOCHECKBOX    "~Double-click opens", CFGT_DCOPENS, 4, 116, 132, 10
@@ -1970 +1970 @@
         AUTOCHECKBOX    "Show ~env. vars in Tree", CFGT_SHOWENV, 4, 32, 110,
                         10
+        CONTROL         "Show file system type \"x\" or drive label \"=\" in tree(~3-state)", 
+                        CFGT_SYSTYPELABEL, 122, 128, 196, 10, 
+                        WC_BUTTON, BS_AUTO3STATE | WS_TABSTOP | WS_VISIBLE                
         ENTRYFIELD      "", CFGT_ENVVARLIST, 120, 32, 196, 8, ES_MARGIN | ES_AUTOSCROLL
         PUSHBUTTON      "~Help", IDM_HELP, 8, 4, 40, 14, BS_NOPOINTERFOCUS |

trunk/dll/init.c

@@ -1309 +1309 @@
   PrfQueryProfileData(fmprof, appname, "ShowEnv", &fShowEnv, &size);
   PrfQueryProfileString(fmprof, appname, "TreeEnvVarList", "PATH;DPATH;LIBPATH;HELP;BOOKSHELF;",
-                        pszTreeEnvVarList, MaxComLineStrg);
+                        pszTreeEnvVarList, MaxComLineStrg);
+  size = sizeof(BOOL);
+  PrfQueryProfileData(fmprof, FM3Str, "ShowSysType", &fShowSysType, &size);
+  size = sizeof(BOOL);
+  PrfQueryProfileData(fmprof, FM3Str, "ShowLabel", &fShowLabel, &size);
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "LeaveTree", &fLeaveTree, &size);

trunk/dll/notebook.c

@@ -155 +155 @@
 BOOL fSeparateParms;
 BOOL fShowEnv;
+BOOL fShowLabel;
+BOOL fShowSysType;
 BOOL fShowTarget;
 BOOL fStartMaximized;
@@ -1362 +1364 @@
     WinCheckButton(hwnd, CFGT_SHOWENV, fShowEnv);
     WinSetDlgItemText(hwnd, CFGT_ENVVARLIST, pszTreeEnvVarList);
+    {
+      long th = fShowLabel ? 2 : (fShowSysType ? 1 : 0);
+      WinCheckButton(hwnd, CFGT_SYSTYPELABEL, th);
+    }
     return 0;
 
@@ -1411 +1417 @@
 
   case WM_CLOSE:
-    fVTreeOpensWPS = WinQueryButtonCheckstate(hwnd, CFGT_VTREEOPENSWPS);
-    PrfWriteProfileData(fmprof, FM3Str, "VTreeOpensWPS", &fVTreeOpensWPS,
-                        sizeof(BOOL));
-    fCollapseFirst = WinQueryButtonCheckstate(hwnd, CFGT_COLLAPSEFIRST);
-    PrfWriteProfileData(fmprof, appname, "CollapseFirst", &fCollapseFirst,
-                        sizeof(BOOL));
-    fSwitchTreeOnFocus = WinQueryButtonCheckstate(hwnd,
-                                                  CFGT_SWITCHTREEONFOCUS);
-    PrfWriteProfileData(fmprof, appname, "SwitchTreeOnFocus",
-                        &fSwitchTreeOnFocus, sizeof(BOOL));
-    fSwitchTreeExpand = WinQueryButtonCheckstate(hwnd, CFGT_SWITCHTREEEXPAND);
-    PrfWriteProfileData(fmprof, appname, "SwitchTreeExpand",
-                        &fSwitchTreeExpand, sizeof(BOOL));
-    fSwitchTree = WinQueryButtonCheckstate(hwnd, CFGT_SWITCHTREE);
-    PrfWriteProfileData(fmprof, appname, "SwitchTree", &fSwitchTree,
-                        sizeof(BOOL));
-    fFollowTree = WinQueryButtonCheckstate(hwnd, CFGT_FOLLOWTREE);
-    PrfWriteProfileData(fmprof, appname, "FollowTree", &fFollowTree,
-                        sizeof(BOOL));
-    fTopDir = WinQueryButtonCheckstate(hwnd, CFGT_TOPDIR);
-    PrfWriteProfileData(fmprof, appname, "TopDir", (PVOID) & fTopDir,
-                        sizeof(BOOL));
-    fDCOpens = WinQueryButtonCheckstate(hwnd, CFGT_DCOPENS);
-    PrfWriteProfileData(fmprof, FM3Str, "DoubleClickOpens", &fDCOpens,
-                        sizeof(BOOL));
-    fShowEnvChanged = (fShowEnv != WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV));
-    fShowEnv = WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV);
-    PrfWriteProfileData(fmprof, appname, "ShowEnv", &fShowEnv, sizeof(BOOL));
     {
-      char * pszTemp = xmalloc(WinQueryDlgItemTextLength(hwnd, CFGT_ENVVARLIST) + 1, pszSrcFile, __LINE__);
-      if (pszTemp) {
-        WinQueryDlgItemText(hwnd, CFGT_ENVVARLIST, MaxComLineStrg, pszTemp);
-        strupr(pszTemp);
-        if (strcmp(pszTemp, pszTreeEnvVarList)) {
-          fTreeEnvVarListChanged = TRUE;
-          strcpy(pszTreeEnvVarList, pszTemp);
-          PrfWriteProfileString(fmprof, appname, "TreeEnvVarList", pszTreeEnvVarList);
-        }
-        free(pszTemp);
-      }
-      if (hwndTree && (fShowEnvChanged || (fShowEnv && fTreeEnvVarListChanged)))
+      long test;
+  
+      test = WinQueryButtonCheckstate(hwnd, CFGT_SYSTYPELABEL);
+      fShowSysType = (test == 1);
+      fShowLabel = (test == 2);
+      PrfWriteProfileData(fmprof, FM3Str, "ShowSysType", &fShowSysType, sizeof(BOOL));
+      PrfWriteProfileData(fmprof,       FM3Str, "ShowLabel", &fShowLabel, sizeof(BOOL));
+      fVTreeOpensWPS = WinQueryButtonCheckstate(hwnd, CFGT_VTREEOPENSWPS);
+      PrfWriteProfileData(fmprof, FM3Str, "VTreeOpensWPS", &fVTreeOpensWPS,
+                          sizeof(BOOL));
+      fCollapseFirst = WinQueryButtonCheckstate(hwnd, CFGT_COLLAPSEFIRST);
+      PrfWriteProfileData(fmprof, appname, "CollapseFirst", &fCollapseFirst,
+                          sizeof(BOOL));
+      fSwitchTreeOnFocus = WinQueryButtonCheckstate(hwnd,
+                                                    CFGT_SWITCHTREEONFOCUS);
+      PrfWriteProfileData(fmprof, appname, "SwitchTreeOnFocus",
+                          &fSwitchTreeOnFocus, sizeof(BOOL));
+      fSwitchTreeExpand = WinQueryButtonCheckstate(hwnd, CFGT_SWITCHTREEEXPAND);
+      PrfWriteProfileData(fmprof, appname, "SwitchTreeExpand",
+                          &fSwitchTreeExpand, sizeof(BOOL));
+      fSwitchTree = WinQueryButtonCheckstate(hwnd, CFGT_SWITCHTREE);
+      PrfWriteProfileData(fmprof, appname, "SwitchTree", &fSwitchTree,
+                          sizeof(BOOL));
+      fFollowTree = WinQueryButtonCheckstate(hwnd, CFGT_FOLLOWTREE);
+      PrfWriteProfileData(fmprof, appname, "FollowTree", &fFollowTree,
+                          sizeof(BOOL));
+      fTopDir = WinQueryButtonCheckstate(hwnd, CFGT_TOPDIR);
+      PrfWriteProfileData(fmprof, appname, "TopDir", (PVOID) & fTopDir,
+                          sizeof(BOOL));
+      fDCOpens = WinQueryButtonCheckstate(hwnd, CFGT_DCOPENS);
+      PrfWriteProfileData(fmprof, FM3Str, "DoubleClickOpens", &fDCOpens,
+                          sizeof(BOOL));
+      fShowEnvChanged = (fShowEnv != WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV));
+      fShowEnv = WinQueryButtonCheckstate(hwnd, CFGT_SHOWENV);
+      PrfWriteProfileData(fmprof, appname, "ShowEnv", &fShowEnv, sizeof(BOOL));
       {
-        PCNRITEM pci = WinSendMsg(WinWindowFromID
-                (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), CM_QUERYRECORDEMPHASIS,
-                                  MPFROMLONG(CMA_FIRST),
-                                  MPFROMSHORT(CRA_SELECTED));
-        PostMsg(WinWindowFromID
-                (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), WM_COMMAND,
-                MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
-        pszTemp = xstrdup(pci->pszFileName, pszSrcFile, __LINE__);
-        if (pszTemp) {
-          if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTemp), MPVOID))
-            free(pszTemp);
-          /* pszTemp is freed in the UM_SHOWME code */
-        }
-      }
-    }
-    break;
+        char * pszTemp = xmalloc(WinQueryDlgItemTextLength(hwnd, CFGT_ENVVARLIST) + 1, pszSrcFile, __LINE__);
+        if (pszTemp) {
+          WinQueryDlgItemText(hwnd, CFGT_ENVVARLIST, MaxComLineStrg, pszTemp);
+          strupr(pszTemp);
+          if (strcmp(pszTemp, pszTreeEnvVarList)) {
+            fTreeEnvVarListChanged = TRUE;
+            strcpy(pszTreeEnvVarList, pszTemp);
+            PrfWriteProfileString(fmprof, appname, "TreeEnvVarList", pszTreeEnvVarList);
+          }
+          free(pszTemp);
+        }
+        if (hwndTree && (fShowEnvChanged || (fShowEnv && fTreeEnvVarListChanged)))
+        {
+          PCNRITEM pci = WinSendMsg(WinWindowFromID
+                  (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), CM_QUERYRECORDEMPHASIS,
+                                    MPFROMLONG(CMA_FIRST),
+                                    MPFROMSHORT(CRA_SELECTED));
+          PostMsg(WinWindowFromID
+                  (WinWindowFromID(hwndTree, FID_CLIENT), TREE_CNR), WM_COMMAND,
+                  MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+          pszTemp = xstrdup(pci->pszFileName, pszSrcFile, __LINE__);
+          if (pszTemp) {
+            if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTemp), MPVOID))
+              free(pszTemp);
+            /* pszTemp is freed in the UM_SHOWME code */
+          }
+        }
+      }
+      break;
+    }
   }
   return WinDefDlgProc(hwnd, msg, mp1, mp2);

trunk/dll/notebook.h

@@ -90 +90 @@
 extern BOOL fSeparateParms;
 extern BOOL fShowEnv;
+extern BOOL fShowLabel;
+extern BOOL fShowSysType;
 extern BOOL fShowTarget;
 extern BOOL fStartMaximized;

trunk/dll/treecnr.c

@@ -816 +816 @@
       Runtime_Error(pszSrcFile, __LINE__, NULL);
     else {
+      while (StubbyScanCount != 0)
+        DosSleep(50);
       RemoveCnrItems(dcd->hwndCnr, NULL, 0, CMA_FREE | CMA_INVALIDATE | CMA_ERASE);
       WinSendMsg(dcd->hwndCnr,
@@ -822 +824 @@
                  CM_SCROLLWINDOW,
                  MPFROMSHORT(CMA_HORIZONTAL), MPFROMLONG(-1));
-         while (StubbyScanCount != 0)
-            DosSleep(50);
       FillTreeCnr(dcd->hwndCnr, dcd->hwndParent);
       if (fOkayMinimize) {