Sync with OS commit e49da3383412c8ae51acb09f6f1efdd5760a0733 (#486)

* Sync with c027f28954dcfc8ce4b9040d57b94680cfe72971

* Sync with OS commit 39bc95ee863de17875c268e451901be343c05894

* Fix break

* Sync with OS commit 6e3099ac18718043334c9e8277b772aa1c46cedd

* Format

* Use most recent version of Clang for formatting

* Apparently there was a breaking change in clang-format :(

* Print changes

* Escape parens

* Helps if I run the correct command...

* Revert "Format"

This reverts commit af192f5.

* Update with OS

* Sync with DEEP branch

* Sync with e49da3383412c8ae51acb09f6f1efdd5760a0733

* format

---------

Co-authored-by: Jon Wiswall <jonwis@microsoft.com>

Author: dunhor

include/wil/Tracelogging.h

@@ -65,7 +65,7 @@
 #define _wiltlg_STRINGIZE_imp(x) #x
 #define _wiltlg_LSTRINGIZE(x) _wiltlg_LSTRINGIZE_imp1(x)
 #define _wiltlg_LSTRINGIZE_imp1(x) _wiltlg_LSTRINGIZE_imp2(#x)
-#define _wiltlg_LSTRINGIZE_imp2(s) L##s
+#define _wiltlg_LSTRINGIZE_imp2(s) L"" #s
 
 /*
 Macro __TRACELOGGING_DEFINE_PROVIDER_STORAGE_LINK(name1, name2):
@@ -6445,7 +6445,13 @@ namespace details
 
                     if (*lastNamespaceNode)
                     {
-                        root.swap((*lastNamespaceNode)->next);
+                        // Delete everything from the current root to the lastNamespaceNode
+                        // (inclusive), considering the possibility that they are the same. Continue
+                        // processing from the node following lastNamespaceNode, if any. root will
+                        // be made to point to that.
+                        auto newRoot = wistd::move((*lastNamespaceNode)->next);
+                        const auto toDelete = wistd::move(root);
+                        root = wistd::move(newRoot);
                     }
                     else
                     {

include/wil/com.h

@@ -3322,7 +3322,7 @@ WI_NODISCARD auto make_range(IEnumXxx* enumPtr)
     return iterator_range(enumPtr);
 }
 
-template <typename TEnum, typename = std::enable_if_t<wil::details::has_next_v<TEnum*>>>
+template <typename TEnum, typename = wistd::enable_if_t<wil::details::has_next_v<TEnum*>>>
 auto make_range(const wil::com_ptr<TEnum>& e)
 {
     using Enumerated = typename wil::details::com_enumerator_traits<TEnum>::smart_result;
@@ -3352,7 +3352,7 @@ namespace details
 {
     inline void CoDisableCallCancellationNull()
     {
-        ::CoDisableCallCancellation(nullptr);
+        (void)::CoDisableCallCancellation(nullptr);
     }
 } // namespace details
 

include/wil/common.h

@@ -712,32 +712,32 @@ boolean, BOOLEAN, and classes with an explicit bool cast.
 @param val The logical bool expression
 @return A C++ bool representing the evaluation of `val`. */
 template <typename T, __R_ENABLE_IF_IS_CLASS(T)>
-_Post_satisfies_(return == static_cast<bool>(val)) __forceinline constexpr bool verify_bool(const T& val) WI_NOEXCEPT
+_Post_satisfies_(return == static_cast<bool>(val)) inline constexpr bool verify_bool(const T& val) WI_NOEXCEPT
 {
     return static_cast<bool>(val);
 }
 
 template <typename T, __R_ENABLE_IF_IS_NOT_CLASS(T)>
-__forceinline constexpr bool verify_bool(T /*val*/) WI_NOEXCEPT
+inline constexpr bool verify_bool(T /*val*/) WI_NOEXCEPT
 {
     static_assert(!wistd::is_same<T, T>::value, "Wrong Type: bool/BOOL/BOOLEAN/boolean expected");
     return false;
 }
 
 template <>
-_Post_satisfies_(return == val) __forceinline constexpr bool verify_bool<bool>(bool val) WI_NOEXCEPT
+_Post_satisfies_(return == val) inline constexpr bool verify_bool<bool>(bool val) WI_NOEXCEPT
 {
     return val;
 }
 
 template <>
-_Post_satisfies_(return == (val != 0)) __forceinline constexpr bool verify_bool<int>(int val) WI_NOEXCEPT
+_Post_satisfies_(return == (val != 0)) inline constexpr bool verify_bool<int>(int val) WI_NOEXCEPT
 {
     return (val != 0);
 }
 
 template <>
-_Post_satisfies_(return == (val != 0)) __forceinline constexpr bool verify_bool<unsigned char>(unsigned char val) WI_NOEXCEPT
+_Post_satisfies_(return == (val != 0)) inline constexpr bool verify_bool<unsigned char>(unsigned char val) WI_NOEXCEPT
 {
     return (val != 0);
 }
@@ -748,7 +748,7 @@ accept any `int` value as long as that is the underlying typedef behind `BOOL`.
 @param val The Win32 BOOL returning expression
 @return A Win32 BOOL representing the evaluation of `val`. */
 template <typename T>
-_Post_satisfies_(return == val) __forceinline constexpr int verify_BOOL(T val) WI_NOEXCEPT
+_Post_satisfies_(return == val) inline constexpr int verify_BOOL(T val) WI_NOEXCEPT
 {
     // Note: Written in terms of 'int' as BOOL is actually:  typedef int BOOL;
     static_assert((wistd::is_same<T, int>::value), "Wrong Type: BOOL expected");

include/wil/result.h

@@ -435,7 +435,7 @@ namespace details_abi
     private:
         struct Node
         {
-            DWORD threadId = 0xffffffff; // MAXDWORD
+            DWORD threadId = 0xffffffffu;
             Node* pNext = nullptr;
             T value{};
         };

include/wil/result_macros.h

@@ -2521,6 +2521,8 @@ namespace details
 #if __clang_major__ >= 13
     __WI_CLANG_DISABLE_WARNING(-Wunused-but-set-variable) // s_hrErrorLast used for debugging. We intentionally only assign to it
 #endif
+    __WI_MSVC_DISABLE_WARNING(4746) // s_hrErrorLast' is subject to /volatile:<iso|ms> setting; consider using __iso_volatile_load/store intrinsic functions
+
     __declspec(noinline) inline int RecordException(HRESULT hr) WI_NOEXCEPT
     {
         static HRESULT volatile s_hrErrorLast = S_OK;
@@ -2602,6 +2604,8 @@ namespace details
         return true;
     }
 
+    __WI_PUSH_WARNINGS
+    __WI_MSVC_DISABLE_WARNING(4746) // s_fModuleValid' is subject to /volatile:<iso|ms> setting; consider using __iso_volatile_load/store intrinsic functions
     inline PCSTR __stdcall GetCurrentModuleName() WI_NOEXCEPT
     {
         static char s_szModule[64] = {};
@@ -2613,6 +2617,7 @@ namespace details
         }
         return s_szModule;
     }
+    __WI_POP_WARNINGS
 
     inline void __stdcall DebugBreak() WI_NOEXCEPT
     {
@@ -3431,15 +3436,15 @@ class ResultException : public std::exception
     }
 
     //! Returns the failed HRESULT that this exception represents.
-    _Always_(_Post_satisfies_(return < 0)) WI_NODISCARD HRESULT GetErrorCode() const WI_NOEXCEPT
+    WI_NODISCARD _Always_(_Post_satisfies_(return < 0)) HRESULT GetErrorCode() const WI_NOEXCEPT
     {
         HRESULT const hr = m_failure.GetFailureInfo().hr;
         __analysis_assume(hr < 0);
         return hr;
     }
 
     //! Returns the failed NTSTATUS that this exception represents.
-    _Always_(_Post_satisfies_(return < 0)) WI_NODISCARD NTSTATUS GetStatusCode() const WI_NOEXCEPT
+    WI_NODISCARD _Always_(_Post_satisfies_(return < 0)) NTSTATUS GetStatusCode() const WI_NOEXCEPT
     {
         NTSTATUS const status = m_failure.GetFailureInfo().status;
         __analysis_assume(status < 0);

include/wil/win32_helpers.h

@@ -50,6 +50,8 @@
 #include "wistd_functional.h"
 #include "wistd_type_traits.h"
 
+EXTERN_C IMAGE_DOS_HEADER __ImageBase;
+
 /// @cond
 namespace wistd
 {
@@ -681,6 +683,7 @@ inline DWORD GetCurrentProcessExecutionOption(PCWSTR valueName, DWORD defaultVal
     return defaultValue;
 }
 
+#ifndef DebugBreak // Some code defines 'DebugBreak' to garbage to force build breaks in release builds
 // Waits for a debugger to attach to the current process based on registry configuration.
 //
 // Example:
@@ -712,14 +715,14 @@ inline void WaitForDebuggerPresent(bool checkRegistryConfig = true)
         Sleep(500);
     }
 }
+#endif
 #endif // WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
 
 #endif
 
 /** Retrieve the HINSTANCE for the current DLL or EXE using this symbol that
 the linker provides for every module. This avoids the need for a global HINSTANCE variable
 and provides access to this value for static libraries. */
-EXTERN_C IMAGE_DOS_HEADER __ImageBase;
 inline HINSTANCE GetModuleInstanceHandle() WI_NOEXCEPT
 {
     return reinterpret_cast<HINSTANCE>(&__ImageBase);

scripts/azure-pipelines.yml

@@ -31,6 +31,9 @@ jobs:
         echo NOTE:  As an additional note, given that different versions of 'clang-format' may have different behaviors, this
         echo        may be a false positive. If you believe that to be the case ^(e.g. none of the above resulted in modifications
         echo        to the code you have changed^), please note this in your PR.
+        echo ----------------------------------------------
+        echo See below for the file^(s^) that have changed:
+        git diff
         exit /b 1
       )
     displayName: 'Check Formatting of Changes'