Merge branch 'master' into to_array_view

Author: jonwis

include/wil/filesystem.h

@@ -19,6 +19,7 @@
 #include <combaseapi.h> // Needed for CoTaskMemFree() used in output of some helpers.
 #include <winbase.h> // LocalAlloc
 #include <PathCch.h>
+#include "wistd_type_traits.h"
 #include "result.h"
 #include "win32_helpers.h"
 #include "resource.h"
@@ -197,6 +198,7 @@ namespace wil
     };
     DEFINE_ENUM_FLAG_OPERATORS(RemoveDirectoryOptions);
 
+    /// @cond
     namespace details
     {
         // Reparse points should not be traversed in most recursive walks of the file system,
@@ -208,6 +210,7 @@ namespace wil
                     (IsReparseTagDirectory(info.ReparseTag) || (info.ReparseTag == IO_REPARSE_TAG_WCI))));
         }
     }
+    /// @endcond
 
     // Retrieve a handle to a directory only if it is safe to recurse into.
     inline wil::unique_hfile TryCreateFileCanRecurseIntoDirectory(PCWSTR path, PWIN32_FIND_DATAW fileFindData, DWORD access = GENERIC_READ | /*DELETE*/ 0x00010000L, DWORD share = FILE_SHARE_READ)
@@ -716,10 +719,10 @@ namespace wil
             {
                 for (auto const& info : create_next_entry_offset_iterator(reinterpret_cast<FILE_NOTIFY_INFORMATION *>(readerState->m_readBuffer)))
                 {
-                    wchar_t realtiveFileName[MAX_PATH];
-                    StringCchCopyNW(realtiveFileName, ARRAYSIZE(realtiveFileName), info.FileName, info.FileNameLength / sizeof(info.FileName[0]));
+                    wchar_t relativeFileName[MAX_PATH];
+                    StringCchCopyNW(relativeFileName, ARRAYSIZE(relativeFileName), info.FileName, info.FileNameLength / sizeof(info.FileName[0]));
 
-                    readerState->m_callback(static_cast<FolderChangeEvent>(info.Action), realtiveFileName);
+                    readerState->m_callback(static_cast<FolderChangeEvent>(info.Action), relativeFileName);
                 }
             }
             else if (result == ERROR_NOTIFY_ENUM_DIR)
@@ -1047,8 +1050,217 @@ namespace wil
         THROW_IF_FAILED(GetFileInfoNoThrow<infoClass>(fileHandle, result));
         return result;
     }
+
+    // Helpers to make the CreateFileW API easier to use.
+    // https://learn.microsoft.com/windows/win32/api/fileapi/nf-fileapi-createfilew
+
+    struct file_and_error_result
+    {
+        file_and_error_result(HANDLE file_handle, DWORD error) : file(file_handle), last_error(error)
+        {
+        }
+
+        wil::unique_hfile file;
+        DWORD last_error{};
+    };
+
+    /** Non-throwing open existing using OPEN_EXISTING.
+    ~~~
+    auto handle = wil::try_open_file(filePath.c_str());
+    ~~~
+    */
+    inline file_and_error_result try_open_file(PCWSTR path, DWORD dwDesiredAccess = FILE_READ_ACCESS,
+        DWORD dwShareMode = FILE_SHARE_READ, DWORD dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL,
+        bool inheritHandle = false) noexcept
+    {
+        SECURITY_ATTRIBUTES secAttributes{ sizeof(secAttributes) };
+        secAttributes.bInheritHandle = inheritHandle;
+        auto handle = CreateFileW(path, dwDesiredAccess, dwShareMode, &secAttributes, OPEN_EXISTING, dwFlagsAndAttributes, nullptr);
+        return { handle, ::GetLastError() };
+    }
+
+    /** open existing using OPEN_EXISTING, throws on error.
+    ~~~
+    auto handle = wil::open_file(filePath.c_str());
+    ~~~
+    */
+    inline wil::unique_hfile open_file(PCWSTR path, DWORD dwDesiredAccess = FILE_READ_ACCESS,
+        DWORD dwShareMode = FILE_SHARE_READ, DWORD dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL,
+        bool inheritHandle = false) noexcept
+    {
+        auto result = try_open_file(path, dwDesiredAccess, dwShareMode, inheritHandle, dwFlagsAndAttributes);
+        THROW_WIN32_IF(result.last_error, !result.file.is_valid());
+        return std::move(result.file);
+    }
+
+    /// @cond
+    namespace details
+    {
+        template<DWORD dwCreateDisposition>
+        file_and_error_result create_file(PCWSTR path, DWORD dwDesiredAccess,
+            DWORD dwShareMode,
+            LPSECURITY_ATTRIBUTES lpSecurityAttributes,
+            DWORD dwFlagsAndAttributes,
+            HANDLE hTemplateFile) noexcept
+        {
+            auto handle = CreateFileW(
+                path, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwCreateDisposition, dwFlagsAndAttributes, hTemplateFile);
+            return { handle, ::GetLastError() };
+        }
+    }
+    /// @endcond
+
+
+    /** create using CREATE_NEW, returns handle and error code.
+    ~~~
+    auto [handle, error = wil::try_create_new_file(filePath.c_str());
+    ~~~
+    */
+    inline file_and_error_result try_create_new_file(PCWSTR path,
+        DWORD dwDesiredAccess = FILE_READ_ACCESS | FILE_WRITE_ACCESS,
+        DWORD dwShareMode = FILE_SHARE_READ,
+        LPSECURITY_ATTRIBUTES lpSecurityAttributes = nullptr,
+        DWORD dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL,
+        HANDLE hTemplateFile = nullptr) noexcept
+    {
+        return details::create_file<CREATE_NEW>(
+            path, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwFlagsAndAttributes, hTemplateFile);
+    }
+
+    /** create using OPEN_ALWAYS, returns handle and error code.
+    ~~~
+    auto [handle, error = wil::try_open_or_create_file(filePath.c_str());
+    ~~~
+    */
+    inline file_and_error_result try_open_or_create_file(PCWSTR path,
+        DWORD dwDesiredAccess = FILE_READ_ACCESS | FILE_WRITE_ACCESS,
+        DWORD dwShareMode = FILE_SHARE_READ,
+        LPSECURITY_ATTRIBUTES lpSecurityAttributes = nullptr,
+        DWORD dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL,
+        HANDLE hTemplateFile = nullptr) noexcept
+    {
+        return details::create_file<OPEN_ALWAYS>(
+            path, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwFlagsAndAttributes, hTemplateFile);
+    }
+
+    /** create using CREATE_ALWAYS, returns handle and error code.
+    ~~~
+    auto [handle, error = wil::try_open_or_truncate_existing_file(filePath.c_str());
+    ~~~
+    */
+    inline file_and_error_result try_open_or_truncate_existing_file(PCWSTR path,
+        DWORD dwDesiredAccess = FILE_READ_ACCESS | FILE_WRITE_ACCESS,
+        DWORD dwShareMode = FILE_SHARE_READ,
+        LPSECURITY_ATTRIBUTES lpSecurityAttributes = nullptr,
+        DWORD dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL,
+        HANDLE hTemplateFile = nullptr) noexcept
+    {
+        return details::create_file<CREATE_ALWAYS>(
+            path, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwFlagsAndAttributes, hTemplateFile);
+    }
+
+    /** create using TRUNCATE_EXISTING, returns handle and error code.
+    ~~~
+    auto [handle, error = wil::try_truncate_existing_file(filePath.c_str());
+    ~~~
+    */
+    inline file_and_error_result try_truncate_existing_file(PCWSTR path,
+        DWORD dwDesiredAccess = FILE_READ_ACCESS | FILE_WRITE_ACCESS | GENERIC_WRITE,
+        DWORD dwShareMode = FILE_SHARE_READ,
+        LPSECURITY_ATTRIBUTES lpSecurityAttributes = nullptr,
+        DWORD dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL,
+        HANDLE hTemplateFile = nullptr) noexcept
+    {
+        return details::create_file<TRUNCATE_EXISTING>(
+            path, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwFlagsAndAttributes, hTemplateFile);
+    }
+
+    /** create using CREATE_NEW, returns the file handle, throws on error.
+    ~~~
+    auto handle = wil::create_new_file(filePath.c_str());
+    ~~~
+    */
+    inline wil::unique_hfile create_new_file(PCWSTR path,
+        DWORD dwDesiredAccess = FILE_READ_ACCESS | FILE_WRITE_ACCESS,
+        DWORD dwShareMode = FILE_SHARE_READ,
+        LPSECURITY_ATTRIBUTES lpSecurityAttributes = nullptr,
+        DWORD dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL,
+        HANDLE hTemplateFile = nullptr) noexcept
+    {
+        auto result = try_create_new_file(
+            path, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwFlagsAndAttributes, hTemplateFile);
+        THROW_WIN32_IF(result.last_error, !result.file.is_valid());
+        return std::move(result.file);
+    }
+
+    /** create using OPEN_ALWAYS, returns the file handle, throws on error.
+    ~~~
+    auto handle = wil::open_or_create_file(filePath.c_str());
+    ~~~
+    */
+    inline wil::unique_hfile open_or_create_file(PCWSTR path,
+        DWORD dwDesiredAccess = FILE_READ_ACCESS | FILE_WRITE_ACCESS,
+        DWORD dwShareMode = FILE_SHARE_READ,
+        LPSECURITY_ATTRIBUTES lpSecurityAttributes = nullptr,
+        DWORD dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL,
+        HANDLE hTemplateFile = nullptr) noexcept
+    {
+        auto result = try_open_or_create_file(
+            path, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwFlagsAndAttributes, hTemplateFile);
+        THROW_WIN32_IF(result.last_error, !result.file.is_valid());
+        return std::move(result.file);
+    }
+
+    /** create using CREATE_ALWAYS, returns the file handle, throws on error.
+    ~~~
+    auto handle = wil::open_or_truncate_existing_file(filePath.c_str());
+    ~~~
+    */
+    inline wil::unique_hfile open_or_truncate_existing_file(PCWSTR path,
+        DWORD dwDesiredAccess = FILE_READ_ACCESS | FILE_WRITE_ACCESS,
+        DWORD dwShareMode = FILE_SHARE_READ,
+        LPSECURITY_ATTRIBUTES lpSecurityAttributes = nullptr,
+        DWORD dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL,
+        HANDLE hTemplateFile = nullptr) noexcept
+    {
+        auto result = try_open_or_truncate_existing_file(
+            path, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwFlagsAndAttributes, hTemplateFile);
+        THROW_WIN32_IF(result.last_error, !result.file.is_valid());
+        return std::move(result.file);
+    }
+
+    /** create using TRUNCATE_EXISTING, returns the file handle, throws on error.
+    ~~~
+    auto handle = wil::truncate_existing_file(filePath.c_str());
+    ~~~
+    */
+    inline wil::unique_hfile truncate_existing_file(PCWSTR path,
+        DWORD dwDesiredAccess = FILE_READ_ACCESS | FILE_WRITE_ACCESS,
+        DWORD dwShareMode = FILE_SHARE_READ,
+        LPSECURITY_ATTRIBUTES lpSecurityAttributes = nullptr,
+        DWORD dwFlagsAndAttributes = FILE_ATTRIBUTE_NORMAL,
+        HANDLE hTemplateFile = nullptr) noexcept
+    {
+        auto result = try_truncate_existing_file(
+            path, dwDesiredAccess, dwShareMode, lpSecurityAttributes, dwFlagsAndAttributes, hTemplateFile);
+        THROW_WIN32_IF(result.last_error, !result.file.is_valid());
+        return std::move(result.file);
+    }
+
 #endif // _CPPUNWIND
 #endif // WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && (_WIN32_WINNT >= _WIN32_WINNT_WIN7)
 }
 
+#ifndef WIL_NO_FILE_TYPE_OPERATORS
+inline bool operator==(const FILE_ID_128& left, const FILE_ID_128& right)
+{
+    return memcmp(&left, &right, sizeof(left)) == 0;
+}
+
+inline bool operator!=(const FILE_ID_128& left, const FILE_ID_128& right)
+{
+    return !operator==(left, right);
+}
+#endif
+
 #endif // __WIL_FILESYSTEM_INCLUDED

include/wil/resource.h

@@ -5597,7 +5597,7 @@ namespace wil
     /// @cond
     namespace details
     {
-        inline void __stdcall CloseWlanHandle(_Frees_ptr_ HANDLE hClientHandle)
+        inline void __stdcall CloseWlanHandle(_In_ HANDLE hClientHandle)
         {
             ::WlanCloseHandle(hClientHandle, nullptr);
         }