Changeset 1424 for trunk/dll/filldir.c

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)

File:

• trunk/dll/filldir.c (modified) (15 diffs)

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;