commit 456a82d668e1e916a962d4305952aadd503097d1
author Primiano Tucci <primiano@google.com> Wed Dec 08 14:13:08 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 08 14:13:08 2021 +0000
tree 979d659cb517557be0655760ec9a9adbbfea0ff2
parent d58fdcda64f2c83b92903f0e89bdeb420746dcba
parent 0f3d962283404c1268eb356a76c50c0a74be6026

Speculative fix of Windows build breakage am: 0f3d962283

Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/1914629

Change-Id: I5463fd0cd4ef766795b08479d6b565818661f8c8

src/base/file_utils.cc

diff --git a/src/base/file_utils.cc b/src/base/file_utils.cc
index 8f998dd..91a5fc4 100644
--- a/src/base/file_utils.cc
+++ b/src/base/file_utils.cc
@@ -238,7 +238,9 @@
       return base::ErrStatus("Directory path %s is too long", dir_path.c_str());
     WIN32_FIND_DATAA ffd;
 
-    base::ScopedResource<HANDLE, FindClose, nullptr, false,
+    // Wrap FindClose to: (1) make the return unix-style; (2) deal w/ stdcall.
+    static auto find_close = [](HANDLE h) { return FindClose(h) ? 0 : -1; };
+    base::ScopedResource<HANDLE, find_close, nullptr, false,
                          base::PlatformHandleChecker>
         hFind(FindFirstFileA(glob_path.c_str(), &ffd));
     if (!hFind) {