Changeset 1446 for trunk/dll

Timestamp:

Jul 23, 2009, 3:33:18 AM (16 years ago)

Author:

Gregg Young

Message:

Fix problem with NOPRESCANDRIVES updating subdirectories with drive icon and full pathname. More streamlining of Tree container scan code

Location:

trunk/dll

Files:

• filldir.c (modified) (3 diffs)
• treecnr.c (modified) (3 diffs)

trunk/dll/filldir.c

@@ -1217 +1217 @@
   FILESTATUS4L fsa4;
   APIRET rc;
-  BOOL drivesbuilt = FALSE;
+  //BOOL drivesbuilt = FALSE;
   ULONG startdrive = 3;
   static BOOL didonce;
@@ -1415 +1415 @@
   } // for drives
 
-  PostMsg(hwndMain, UM_BUILDDRIVEBAR, MPVOID, MPVOID);
-  drivesbuilt = TRUE;
+  //PostMsg(hwndMain, UM_BUILDDRIVEBAR, MPVOID, MPVOID);
+  //drivesbuilt = TRUE;
 
   // insert the drives
@@ -1632 +1632 @@
   }
 
-  if (!drivesbuilt && hwndMain)
+  if (hwndMain)
     PostMsg(hwndMain, UM_BUILDDRIVEBAR, MPVOID, MPVOID);
   DosSleep(16);                         // 05 Aug 07 GKY 33

trunk/dll/treecnr.c

@@ -1976 +1976 @@
             if (!pciL)
               Flesh(hwnd, pciP);
-            if (fShowFSTypeInTree || fShowDriveLabelInTree) {
-              strcpy(szBuf, pci->pszFileName);
+            if ((fShowFSTypeInTree || fShowDriveLabelInTree) &&
+                strlen(pciP->pszFileName) < 4) {
+              strcpy(szBuf, pciP->pszFileName);
               strcat(szBuf, " [");
               strcat(szBuf, fShowFSTypeInTree ? FileSystem : volser.volumelabel);
               strcat(szBuf, "]");
-              pci->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
+              pciP->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
+              pciP->rc.pszIcon = pciP->pszDisplayName;
             }
-            pciP->rc.pszIcon = pciP->pszDisplayName;
             WinSendMsg(hwnd,
                        CM_INVALIDATERECORD,
@@ -2766 +2767 @@
                 if (driveflag & DRIVE_INVALID)
                   pci->rc.hptrIcon = hptrDunno;
-                else {
+                else  if (strlen(pci->pszFileName) < 4) {
                   SelectDriveIcon(pci);
                 }
-                if (fShowFSTypeInTree || fShowDriveLabelInTree) {
+                if ((fShowFSTypeInTree || fShowDriveLabelInTree) &&
+                    strlen(pci->pszFileName) < 4) {
                   strcpy(szBuf, pci->pszFileName);
                   strcat(szBuf, " [");
@@ -2775 +2777 @@
                   strcat(szBuf, "]");
                   pci->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
+                  pci->rc.pszIcon = pci->pszDisplayName;
                 }
-                pci->rc.pszIcon = pci->pszDisplayName;
                 WinSendMsg(hwnd,
                            CM_INVALIDATERECORD,