[EXPLORER_OLD]

Disable ScanNTFSStreams calls because this function exclusively calls BackupRead that is not implemented on ReactOS, and as a consequence makes lots of debug spam when browsing the start (sub-)menus.

svn path=/trunk/; revision=63914

diff --git a/reactos/base/shell/explorer/shell/shellfs.cpp b/reactos/base/shell/explorer/shell/shellfs.cpp
index 1243a0d..6c243e4 100644 (file)
--- a/reactos/base/shell/explorer/shell/shellfs.cpp
+++ b/reactos/base/shell/explorer/shell/shellfs.cpp
@@ -313,8 +313,10 @@ void ShellDirectory::read_directory(int scan_flags)
                                                if (GetFileInformationByHandle(hFile, &entry->_bhfi))
                                                        entry->_bhfi_valid = true;
 
                                                if (GetFileInformationByHandle(hFile, &entry->_bhfi))
                                                        entry->_bhfi_valid = true;
 

+#ifdef BACKUP_READ_IMPLEMENTED

                                                if (ScanNTFSStreams(entry, hFile))
                                                        entry->_scanned = true; // There exist named NTFS sub-streams in this file.
                                                if (ScanNTFSStreams(entry, hFile))
                                                        entry->_scanned = true; // There exist named NTFS sub-streams in this file.

+#endif

 
                                                CloseHandle(hFile);
                                        }
 
                                                CloseHandle(hFile);
                                        }

diff --git a/reactos/base/shell/explorer/shell/winfs.cpp b/reactos/base/shell/explorer/shell/winfs.cpp
index b3ed576..6415d28 100644 (file)
--- a/reactos/base/shell/explorer/shell/winfs.cpp
+++ b/reactos/base/shell/explorer/shell/winfs.cpp
@@ -33,6 +33,7 @@
 //#include "winfs.h"
 
 
 //#include "winfs.h"
 
 

+#ifdef BACKUP_READ_IMPLEMENTED

 int ScanNTFSStreams(Entry* entry, HANDLE hFile)
 {
        PVOID ctx = 0;
 int ScanNTFSStreams(Entry* entry, HANDLE hFile)
 {
        PVOID ctx = 0;


@@ -116,6 +117,7 @@ int ScanNTFSStreams(Entry* entry, HANDLE hFile)
 
        return cnt;
 }
 
        return cnt;
 }

+#endif

 
 
 void WinDirectory::read_directory(int scan_flags)
 
 
 void WinDirectory::read_directory(int scan_flags)


@@ -167,8 +169,10 @@ void WinDirectory::read_directory(int scan_flags)
                                        if (GetFileInformationByHandle(hFile, &entry->_bhfi))
                                                entry->_bhfi_valid = true;
 
                                        if (GetFileInformationByHandle(hFile, &entry->_bhfi))
                                                entry->_bhfi_valid = true;
 

+#ifdef BACKUP_READ_IMPLEMENTED

                                        if (ScanNTFSStreams(entry, hFile))
                                                entry->_scanned = true; // There exist named NTFS sub-streams in this file.
                                        if (ScanNTFSStreams(entry, hFile))
                                                entry->_scanned = true; // There exist named NTFS sub-streams in this file.

+#endif

 
                                        CloseHandle(hFile);
                                }
 
                                        CloseHandle(hFile);
                                }

diff --git a/reactos/base/shell/explorer/shell/winfs.h b/reactos/base/shell/explorer/shell/winfs.h
index b588035..893b49b 100644 (file)
--- a/reactos/base/shell/explorer/shell/winfs.h
+++ b/reactos/base/shell/explorer/shell/winfs.h
@@ -25,6 +25,8 @@
  // Martin Fuchs, 23.07.2003
  //
 
  // Martin Fuchs, 23.07.2003
  //
 

+/* Enable this when the BackupRead API is implemented */
+// #define BACKUP_READ_IMPLEMENTED

 
  /// Windows file system file-entry
 struct WinEntry : public Entry
 
  /// Windows file system file-entry
 struct WinEntry : public Entry


@@ -65,4 +67,6 @@ struct WinDirectory : public WinEntry, public Directory
        virtual Entry* find_entry(const void*);
 };
 
        virtual Entry* find_entry(const void*);
 };
 

+#ifdef BACKUP_READ_IMPLEMENTED

 extern int ScanNTFSStreams(Entry* entry, HANDLE hFile);
 extern int ScanNTFSStreams(Entry* entry, HANDLE hFile);

+#endif