Sync with the OS (#319)

* Sync with OS commit b58d62a22e8b065355e83f17d32f446bac7d5e75 * Fix build issues * Fix test * Merge with OS commit 2f20a1d7f273c9242cff4bb642ac0536833c0e75 * Preprocessor fix for Tracelogging.h * EBO to make UBSan happy * Some existing consumers can't consume win32_helpers * Build issue; apparently [[nodiscard]] causes issues with coroutines
microsoft · Apr 11, 2023 · 9db6276 · 9db6276
1 parent 70155eb
commit 9db6276
Show file tree

Hide file tree

Showing 6 changed files with 128 additions and 94 deletions.
diff --git a/include/wil/Tracelogging.h b/include/wil/Tracelogging.h
diff --git a/include/wil/cppwinrt_helpers.h b/include/wil/cppwinrt_helpers.h
@@ -115,7 +115,7 @@ namespace wil
                 m_priority(priority)
             {
             }
-            WI_NODISCARD bool await_ready() const noexcept { return false; }
+            bool await_ready() const noexcept { return false; }
 
             void await_suspend(details::coroutine_handle<> handle)
             {

diff --git a/include/wil/token_helpers.h b/include/wil/token_helpers.h
@@ -133,6 +133,7 @@ namespace wil
 #endif // WIL_ENABLE_EXCEPTIONS
 
 #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
+
     // Returns tokenHandle or the effective thread token if tokenHandle is null.
     // Note, this returns an token handle who's lifetime is managed independently
     // and it may be a pseudo token, don't free it!

diff --git a/tests/ComTests.cpp b/tests/ComTests.cpp
@@ -637,7 +637,7 @@ IAlways : public IUnknown
    STDMETHOD_(void, Always)() = 0;
 };
 
-class __declspec(uuid("ececcc6a-5193-4d14-b38e-ed1460c20b00")) // non-implemented to allow QI for the class to be attempted (and fail)
+class __declspec(empty_bases) __declspec(uuid("ececcc6a-5193-4d14-b38e-ed1460c20b00")) // non-implemented to allow QI for the class to be attempted (and fail)
 ComObject : witest::AllocatedObject,
     public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::RuntimeClassType::ClassicCom>,
                                         Microsoft::WRL::ChainInterfaces<IDerivedTest, ITest>,
@@ -648,7 +648,7 @@ ComObject : witest::AllocatedObject,
     COM_DECLSPEC_NOTHROW IFACEMETHODIMP_(void) Always() {}
 };
 
-class __declspec(uuid("ececcc6a-5193-4d14-b38e-ed1460c20b01")) // non-implemented to allow QI for the class to be attempted (and fail)
+class __declspec(empty_bases) __declspec(uuid("ececcc6a-5193-4d14-b38e-ed1460c20b01")) // non-implemented to allow QI for the class to be attempted (and fail)
 WinRtObject : witest::AllocatedObject,
     public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::RuntimeClassType::WinRtClassicComMix>,
                                         ITest, IDerivedTest, ITestInspectable, IDerivedTestInspectable, IAlways, Microsoft::WRL::FtmBase>
@@ -661,7 +661,7 @@ WinRtObject : witest::AllocatedObject,
     COM_DECLSPEC_NOTHROW IFACEMETHODIMP_(void) Always() {}
 };
 
-class NoCom : witest::AllocatedObject
+class __declspec(empty_bases) NoCom : witest::AllocatedObject
 {
 public:
     ULONG __stdcall AddRef()

diff --git a/tests/ResourceTests.cpp b/tests/ResourceTests.cpp
@@ -124,7 +124,7 @@ ITest : public IUnknown
    STDMETHOD_(void, Test)() = 0;
 };
 
-class PointerTestObject : witest::AllocatedObject,
+class __declspec(empty_bases) PointerTestObject : witest::AllocatedObject,
     public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::RuntimeClassType::ClassicCom>, ITest>
 {
 public:

diff --git a/tests/wiTest.cpp b/tests/wiTest.cpp
@@ -2870,7 +2870,7 @@ interface __declspec(uuid("EDCA4ADC-DF46-442A-A69D-FDFD8BC37B31")) IFakeObject :
    STDMETHOD_(void, DoStuff)() = 0;
 };
 
-class ArrayTestObject : witest::AllocatedObject,
+class __declspec(empty_bases) ArrayTestObject : witest::AllocatedObject,
     public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::RuntimeClassType::ClassicCom>, IFakeObject>
 {
 public: