From e2db19c649e966a52c326edc57883bc0ae34c54f Mon Sep 17 00:00:00 2001 From: Kenny Kerr Date: Fri, 17 Jan 2020 11:22:30 -0800 Subject: [PATCH 1/2] fix --- strings/base_extern.h | 4 ++-- strings/base_string.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/strings/base_extern.h b/strings/base_extern.h index d78b9c3f1..39af7e557 100644 --- a/strings/base_extern.h +++ b/strings/base_extern.h @@ -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 diff --git a/strings/base_string.h b/strings/base_string.h index 933f73f25..0caa777ec 100644 --- a/strings/base_string.h +++ b/strings/base_string.h @@ -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(sizeof(shared_hstring_header)) + static_cast(sizeof(wchar_t))* static_cast(length); if (bytes_required > UINT_MAX) { From 68543ca0a37fd37dfb1a5e6a1e67b04c608b095b Mon Sep 17 00:00:00 2001 From: Kenny Kerr Date: Fri, 17 Jan 2020 11:24:51 -0800 Subject: [PATCH 2/2] space --- strings/base_string.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strings/base_string.h b/strings/base_string.h index 0caa777ec..5f389a314 100644 --- a/strings/base_string.h +++ b/strings/base_string.h @@ -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 = static_cast(sizeof(shared_hstring_header)) + static_cast(sizeof(wchar_t))* static_cast(length); + uint64_t bytes_required = static_cast(sizeof(shared_hstring_header)) + static_cast(sizeof(wchar_t)) * static_cast(length); if (bytes_required > UINT_MAX) {