From: Hermès Bélusca-Maïto Date: Thu, 21 Aug 2014 19:18:25 +0000 (+0000) Subject: [EXPLORER_OLD] X-Git-Tag: backups/0.3.17@66124~776 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=ce2f155e05e008e5a639375e7c41053a0cabd659 [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 1243a0d0055..6c243e46467 100644 --- 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; +#ifdef BACKUP_READ_IMPLEMENTED if (ScanNTFSStreams(entry, hFile)) entry->_scanned = true; // There exist named NTFS sub-streams in this file. +#endif CloseHandle(hFile); } diff --git a/reactos/base/shell/explorer/shell/winfs.cpp b/reactos/base/shell/explorer/shell/winfs.cpp index b3ed57676ff..6415d28150f 100644 --- a/reactos/base/shell/explorer/shell/winfs.cpp +++ b/reactos/base/shell/explorer/shell/winfs.cpp @@ -33,6 +33,7 @@ //#include "winfs.h" +#ifdef BACKUP_READ_IMPLEMENTED int ScanNTFSStreams(Entry* entry, HANDLE hFile) { PVOID ctx = 0; @@ -116,6 +117,7 @@ int ScanNTFSStreams(Entry* entry, HANDLE hFile) return cnt; } +#endif 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; +#ifdef BACKUP_READ_IMPLEMENTED if (ScanNTFSStreams(entry, hFile)) entry->_scanned = true; // There exist named NTFS sub-streams in this file. +#endif CloseHandle(hFile); } diff --git a/reactos/base/shell/explorer/shell/winfs.h b/reactos/base/shell/explorer/shell/winfs.h index b58803562ac..893b49b824c 100644 --- 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 // +/* Enable this when the BackupRead API is implemented */ +// #define BACKUP_READ_IMPLEMENTED /// 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*); }; +#ifdef BACKUP_READ_IMPLEMENTED extern int ScanNTFSStreams(Entry* entry, HANDLE hFile); +#endif