C++/WinRT ABI interop improvements #1608
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -837,6 +837,86 @@ WINRT_IMPL_STD_EXPORT namespace std | |
| }; | ||
| } | ||
|
|
||
| WINRT_EXPORT namespace winrt::impl | ||
| { | ||
| template <typename Derived, typename AsyncInterface> | ||
| struct ready_async_base : implements<Derived, AsyncInterface, Windows::Foundation::IAsyncInfo> | ||
| { | ||
| using AsyncStatus = Windows::Foundation::AsyncStatus; | ||
|
|
||
| void Completed(async_completed_handler_t<AsyncInterface> const& handler) | ||
| { | ||
| if (m_completed_assigned.exchange(true)) | ||
| { | ||
| throw hresult_illegal_delegate_assignment(); | ||
| } | ||
|
|
||
| if (handler) | ||
| { | ||
| winrt::impl::invoke(handler, *static_cast<Derived*>(this), AsyncStatus::Completed); | ||
| } | ||
| } | ||
|
|
||
| auto Completed() noexcept | ||
| { | ||
| return async_completed_handler_t<AsyncInterface>{ nullptr }; | ||
| } | ||
|
|
||
| std::uint32_t Id() const noexcept | ||
| { | ||
| return 1; | ||
| } | ||
|
|
||
| AsyncStatus Status() const noexcept | ||
| { | ||
| return AsyncStatus::Completed; | ||
| } | ||
|
|
||
| hresult ErrorCode() const noexcept | ||
| { | ||
| return 0; | ||
| } | ||
|
|
||
| void Cancel() const noexcept | ||
| { | ||
| } | ||
|
|
||
| void Close() const noexcept | ||
| { | ||
| } | ||
|
|
||
| private: | ||
|
|
||
| std::atomic<bool> m_completed_assigned{ false }; | ||
| }; | ||
|
|
||
| template <typename TResult> | ||
| struct ready_async_operation : | ||
| ready_async_base<ready_async_operation<TResult>, Windows::Foundation::IAsyncOperation<TResult>> | ||
| { | ||
| explicit ready_async_operation(TResult value) : m_result(std::move(value)) | ||
| { | ||
| } | ||
|
|
||
| TResult GetResults() | ||
| { | ||
| return m_result; | ||
| } | ||
|
|
||
| private: | ||
|
|
||
| TResult m_result; | ||
| }; | ||
|
|
||
| struct ready_async_action : | ||
| ready_async_base<ready_async_action, Windows::Foundation::IAsyncAction> | ||
| { | ||
| void GetResults() const noexcept | ||
| { | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| WINRT_EXPORT namespace winrt | ||
| { | ||
| template <typename... T> | ||
|
|
@@ -884,5 +964,16 @@ WINRT_EXPORT namespace winrt | |
| impl::check_status_canceled(shared->status); | ||
| co_return shared->result.GetResults(); | ||
| } | ||
|
|
||
| template <typename TResult> | ||
| Windows::Foundation::IAsyncOperation<std::decay_t<TResult>> make_ready(TResult&& value) | ||
| { | ||
| return make<impl::ready_async_operation<std::decay_t<TResult>>>(std::forward<TResult>(value)); | ||
| } | ||
|
|
||
| inline Windows::Foundation::IAsyncAction make_ready() noexcept | ||
| { | ||
| return make<impl::ready_async_action>(); | ||
| } | ||
|
Member
There was a problem hiding this comment. Do we also need WithProgress variants? Also consider the versions here, which supports both with- and without progress , as well as |
||
| } | ||
| #endif | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Couldn't this go in
wil? There has been a prior desire to move the coroutine/etc stuff to wil and keep cppwinrt focused on purely projection, is this still true?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure. No particular reason to have it here.