Skip to content

Fix regression in Xaml apps #485

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 3 commits into from
Jan 17, 2020
Merged

Fix regression in Xaml apps #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2db19c
fix
kennykerr Jan 17, 2020
68543ca
space
kennykerr Jan 17, 2020
a599388
Merge branch 'master' into kennykerr-exports
kennykerr Jan 17, 2020
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
4 changes: 2 additions & 2 deletions strings/base_extern.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ extern "C"
int32_t __stdcall WINRT_IMPL_SetThreadpoolThreadMinimum(winrt::impl::ptp_pool pool, uint32_t value) noexcept;
void __stdcall WINRT_IMPL_CloseThreadpool(winrt::impl::ptp_pool pool) noexcept;

int32_t __stdcall WINRT_IMPL_CanUnloadNow() noexcept;
int32_t __stdcall WINRT_IMPL_GetActivationFactory(void* classId, void** factory) noexcept;
int32_t __stdcall WINRT_CanUnloadNow() noexcept;
int32_t __stdcall WINRT_GetActivationFactory(void* classId, void** factory) noexcept;
}

#ifdef _M_HYBRID
Expand Down
2 changes: 1 addition & 1 deletion strings/base_string.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ namespace winrt::impl
inline shared_hstring_header* precreate_hstring_on_heap(uint32_t length)
{
WINRT_ASSERT(length != 0);
uint64_t bytes_required = sizeof(shared_hstring_header) + sizeof(wchar_t) * length;
uint64_t bytes_required = static_cast<uint64_t>(sizeof(shared_hstring_header)) + static_cast<uint64_t>(sizeof(wchar_t)) * static_cast<uint64_t>(length);

if (bytes_required > UINT_MAX)
{
Expand Down