Merge branch 'ms/master' into unc_path_support

Author: schinagl

src/wfcomman.c

@@ -551,6 +551,8 @@ CreateDirWindow(
       return hwndT;
    }
 
+   BOOLEAN bDriveChanged = FALSE;
+
    //
    // Are we replacing the contents of the currently active child?
    //
@@ -561,6 +563,7 @@ CreateDirWindow(
             // if not already selected, do so now
             if (i != SendMessage(hwndDriveList, CB_GETCURSEL, i, 0L)) {
                SelectToolbarDrive(i);
+               bDriveChanged = TRUE;
             }
             break;
          }
@@ -579,7 +582,7 @@ CreateDirWindow(
       //
       // update the tree if necessary
       //
-      ;
+
       if (hwndT = HasTreeWindow(hwndActive)) {
          SendMessage(hwndT, TC_SETDRIVE, 0, (LPARAM)(szPath));
       }
@@ -588,6 +591,10 @@ CreateDirWindow(
       // Update the status in case we are "reading"
       //
       UpdateStatus(hwndActive);
+      if (bDriveChanged) {
+         InvalidateRect(hwndDriveBar, NULL, TRUE);
+         UpdateWindow(hwndDriveBar);
+      }
 
       return hwndActive;
    }
@@ -1163,10 +1170,10 @@ AppCommandProc(DWORD id)
 		break;
 
    case IDM_CLOSEWINDOW:
-      {
-         HWND      hwndActive;
+       {
+           HWND      hwndActive;
 
-         hwndActive = (HWND)SendMessage(hwndMDIClient, WM_MDIGETACTIVE, 0, 0L);
+           hwndActive = (HWND)SendMessage(hwndMDIClient, WM_MDIGETACTIVE, 0, 0L);
 
          SendMessage(hwndActive, FS_GETDIRECTORY, COUNTOF(szPath), (LPARAM)szPath);
          if (ISUNCPATH(szPath))
@@ -1176,9 +1183,9 @@ AppCommandProc(DWORD id)
 
          }
          else
-            PostMessage(hwndActive, WM_CLOSE, 0, 0L);
-      }
-      break;
+           PostMessage(hwndActive, WM_CLOSE, 0, 0L);
+       }
+       break;
 
    case IDM_SELECT:
 

src/wfgoto.cpp

@@ -334,7 +334,7 @@ BOOL BuildDirectoryBagOValues(BagOValues<PDNODE> *pbov, vector<PDNODE> *pNodes,
 	// add *.* to end of path
 	lstrcat(szPath, szStarDotStar);
 
-	BOOL bFound = WFFindFirst(&lfndta, szPath, ATTR_DIR);
+	BOOL bFound = WFFindFirst(&lfndta, szPath, bIndexHiddenSystem ? ATTR_DIR | ATTR_HS : ATTR_DIR);
 
 	while (bFound)
 	{
@@ -346,7 +346,7 @@ BOOL BuildDirectoryBagOValues(BagOValues<PDNODE> *pbov, vector<PDNODE> *pNodes,
 		}
 
 		// for all directories at this level, insert into BagOValues
-        // do not insert the directories '.' or '..'; or insert empty directory names (cf. issue #194)
+		// do not insert the directories '.' or '..'; or insert empty directory names (cf. issue #194)
 
 		if ((lfndta.fd.dwFileAttributes & ATTR_DIR) == 0 || ISDOTDIR(lfndta.fd.cFileName) || lfndta.fd.cFileName[0] == CHAR_NULL)
 		{

src/wfinit.c

@@ -218,6 +218,7 @@ GetSettings()
    /* Get the flags out of the INI file. */
    bMinOnRun            = GetPrivateProfileInt(szSettings, szMinOnRun,            bMinOnRun,            szTheINIFile);
    bIndexOnLaunch       = GetPrivateProfileInt(szSettings, szIndexOnLaunch,       bIndexOnLaunch,       szTheINIFile);
+   bIndexHiddenSystem   = GetPrivateProfileInt(szSettings, szIndexHiddenSystem,   bIndexHiddenSystem,   szTheINIFile);
    wTextAttribs         = (WORD)GetPrivateProfileInt(szSettings, szLowerCase,     wTextAttribs,         szTheINIFile);
    bStatusBar           = GetPrivateProfileInt(szSettings, szStatusBar,           bStatusBar,           szTheINIFile);
    bDisableVisualStyles = GetPrivateProfileInt(szSettings, szDisableVisualStyles, bDisableVisualStyles, szTheINIFile);

src/winfile.h

@@ -1236,6 +1236,7 @@ JAPANEND
 
 Extern BOOL bMinOnRun            EQ( FALSE );
 Extern BOOL bIndexOnLaunch       EQ( TRUE );
+Extern BOOL bIndexHiddenSystem   EQ( FALSE );
 Extern BOOL bStatusBar           EQ( TRUE );
 
 Extern BOOL bDriveBar            EQ( TRUE );
@@ -1281,6 +1282,7 @@ Extern TCHAR        szPunctuation[MAXPATHLEN];
 
 Extern TCHAR        szMinOnRun[]            EQ( TEXT("MinOnRun") );
 Extern TCHAR        szIndexOnLaunch[]       EQ( TEXT("IndexOnLaunch") );
+Extern TCHAR        szIndexHiddenSystem[]   EQ( TEXT("IndexHiddenSystem") );
 Extern TCHAR        szStatusBar[]           EQ( TEXT("StatusBar") );
 Extern TCHAR        szSaveSettings[]        EQ( TEXT("Save Settings") );
 Extern TCHAR        szScrollOnExpand[]      EQ( TEXT("ScrollOnExpand"));