Skip to content

Reduce size of compiled base.h due to get_runtime_activation_factory #876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kennykerr merged 2 commits into from
Mar 10, 2021
Merged

Reduce size of compiled base.h due to get_runtime_activation_factory #876

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68a87a5
Reduce size of compiled base.h due to get_runtime_activation_factory
asklar Mar 10, 2021
3177c9a
format
asklar Mar 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions strings/base_activation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,18 @@ namespace winrt::impl
return error_class_not_available;
}

template <typename Interface>
hresult get_runtime_activation_factory(param::hstring const& name, void** result) noexcept

template <bool isSameInterfaceAsIActivationFactory>
__declspec(noinline) hresult get_runtime_activation_factory_impl(param::hstring const& name, winrt::guid const& guid, void** result) noexcept
{
if (winrt_activation_handler)
{
return winrt_activation_handler(*(void**)(&name), guid_of<Interface>(), result);
return winrt_activation_handler(*(void**)(&name), guid, result);
}

static int32_t(__stdcall * handler)(void* classId, guid const& iid, void** factory) noexcept;
static int32_t(__stdcall * handler)(void* classId, winrt::guid const& iid, void** factory) noexcept;
impl::load_runtime_function("RoGetActivationFactory", handler, fallback_RoGetActivationFactory);
hresult hr = handler(*(void**)(&name), guid_of<Interface>(), result);
hresult hr = handler(*(void**)(&name), guid, result);

if (hr == impl::error_not_initialized)
{
Expand All @@ -47,7 +48,7 @@ namespace winrt::impl

void* cookie;
usage(&cookie);
hr = handler(*(void**)(&name), guid_of<Interface>(), result);
hr = handler(*(void**)(&name), guid, result);
}

if (hr == 0)
Expand Down Expand Up @@ -87,13 +88,13 @@ namespace winrt::impl
continue;
}

if constexpr (std::is_same_v< Interface, Windows::Foundation::IActivationFactory>)
if constexpr (isSameInterfaceAsIActivationFactory)
{
*result = library_factory.detach();
library.detach();
return 0;
}
else if (0 == library_factory.as(guid_of<Interface>(), result))
else if (0 == library_factory.as(guid, result))
{
library.detach();
return 0;
Expand All @@ -103,6 +104,12 @@ namespace winrt::impl
WINRT_IMPL_SetErrorInfo(0, error_info.get());
return hr;
}

template <typename Interface>
hresult get_runtime_activation_factory(param::hstring const& name, void** result) noexcept
{
return get_runtime_activation_factory_impl<std::is_same_v<Interface, Windows::Foundation::IActivationFactory>>(name, guid_of<Interface>(), result);
}
}

WINRT_EXPORT namespace winrt
Expand Down