base/files/file_enumerator_win.cc - Issue 946183002: Add base_unittests to win8 trybot. Fix PEImage tests.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/files/file_enumerator_win.cc

Issue 946183002: Add base_unittests to win8 trybot. Fix PEImage tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: namespace the callbacks Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: base/files/file_enumerator_win.cc

diff --git a/base/files/file_enumerator_win.cc b/base/files/file_enumerator_win.cc

index 6da1667ed99cc27f6da735965da13936ac1ef94b..931d15498164267f0f6e68913ae88a5ad1e5f1c3 100644

--- a/base/files/file_enumerator_win.cc

+++ b/base/files/file_enumerator_win.cc

@@ -147,7 +147,8 @@ FilePath FileEnumerator::Next() {

// add it to pending_paths_ so we scan it after we finish scanning this

// directory. However, don't do recursion through reparse points or we

// may end up with an infinite cycle.

- if (!(find_data_.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT))

+ DWORD attributes = GetFileAttributes(cur_file.value().c_str());

+ if (!(attributes & FILE_ATTRIBUTE_REPARSE_POINT))

pending_paths_.push(cur_file);

}

if (file_type_ & FileEnumerator::DIRECTORIES)

« no previous file with comments | « base/base_unittests.isolate ('k') | base/win/pe_image_test.cc » ('j') | base/win/pe_image_unittest.cc » ('J')