originate_on_cancel(false) fails on the second co_await due to missed call, and does not work for IAsyncActions.

strings/base_coroutine_foundation.h

@@ -76,11 +76,18 @@ WINRT_EXPORT namespace winrt::impl
         return wait_for_completed(async, static_cast<std::uint32_t>(milliseconds));
     }
 
-    inline void check_status_canceled(Windows::Foundation::AsyncStatus status)
+    inline void check_status_canceled(Windows::Foundation::AsyncStatus status, bool originate = true)
     {
         if (status == Windows::Foundation::AsyncStatus::Canceled)
         {
-            throw hresult_canceled();
+            if (originate)
+            {
+                throw hresult_canceled();
+            }
+            else
+            {
+                throw hresult_canceled(hresult_error::no_originate);
+            }
         }
     }
 
@@ -184,7 +191,7 @@ WINRT_EXPORT namespace winrt::impl
         auto await_resume() const
         {
             check_hresult(failure);
-            check_status_canceled(status);
+            check_status_canceled(status, this->should_originate_on_cancel());
             return async.GetResults();
         }
 
@@ -487,7 +494,7 @@ WINRT_EXPORT namespace winrt::impl
                 if (m_status.load(std::memory_order_relaxed) == AsyncStatus::Started)
                 {
                     m_status.store(AsyncStatus::Canceled, std::memory_order_relaxed);
-                    if (cancellable_promise::originate_on_cancel())
+                    if (this->should_originate_on_cancel())
                     {
                         m_exception = std::make_exception_ptr(hresult_canceled());
                     }
@@ -638,7 +645,7 @@ WINRT_EXPORT namespace winrt::impl
         {
             if (Status() == AsyncStatus::Canceled)
             {
-                if (cancellable_promise::originate_on_cancel())
+                if (this->should_originate_on_cancel())
                 {
                     throw winrt::hresult_canceled();
                 }

strings/base_coroutine_threadpool.h

@@ -236,10 +236,18 @@ WINRT_EXPORT namespace winrt
         {
             if constexpr (std::is_base_of_v<cancellable_promise, T>)
             {
+                // Captured at suspend time so that await_resume need not reach for the
+                // promise, which may already have completed and released resources.
+                m_originate_on_cancel = handle.promise().should_originate_on_cancel();
                 set_cancellable_promise(&handle.promise());
             }
         }
 
+        bool should_originate_on_cancel() const noexcept
+        {
+            return m_originate_on_cancel;
+        }
+
     private:
         void set_cancellable_promise(cancellable_promise* promise)
         {
@@ -251,6 +259,7 @@ WINRT_EXPORT namespace winrt
         }
 
         cancellable_promise* m_promise = nullptr;
+        bool m_originate_on_cancel = true;
     };
 
     [[nodiscard]] inline auto resume_background() noexcept
@@ -405,7 +414,14 @@ WINRT_EXPORT namespace winrt::impl
         {
             if (m_state.exchange(state::idle, std::memory_order_relaxed) == state::canceled)
             {
-                throw hresult_canceled();
+                if (should_originate_on_cancel())
+                {
+                    throw hresult_canceled();
+                }
+                else
+                {
+                    throw hresult_canceled(hresult_error::no_originate);
+                }
             }
         }
 
@@ -513,7 +529,14 @@ WINRT_EXPORT namespace winrt::impl
         {
             if (m_state.exchange(state::idle, std::memory_order_relaxed) == state::canceled)
             {
-                throw hresult_canceled();
+                if (should_originate_on_cancel())
+                {
+                    throw hresult_canceled();
+                }
+                else
+                {
+                    throw hresult_canceled(hresult_error::no_originate);
+                }
             }
             return m_result == 0;
         }