Fix regression in Xaml apps (#485)

kennykerr · web-flow · commit f17f9555240c · 2020-01-17T12:19:25.000-08:00
diff --git 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
@@ -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)
         {

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ extern "C"`
`76`	`76`	`int32_t __stdcall WINRT_IMPL_SetThreadpoolThreadMinimum(winrt::impl::ptp_pool pool, uint32_t value) noexcept;`
`77`	`77`	`void __stdcall WINRT_IMPL_CloseThreadpool(winrt::impl::ptp_pool pool) noexcept;`
`78`	`78`
`79`		`- int32_t __stdcall WINRT_IMPL_CanUnloadNow() noexcept;`
`80`		`- int32_t __stdcall WINRT_IMPL_GetActivationFactory(void* classId, void** factory) noexcept;`
	`79`	`+ int32_t __stdcall WINRT_CanUnloadNow() noexcept;`
	`80`	`+ int32_t __stdcall WINRT_GetActivationFactory(void* classId, void** factory) noexcept;`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`#ifdef _M_HYBRID`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ namespace winrt::impl`
`75`	`75`	`inline shared_hstring_header* precreate_hstring_on_heap(uint32_t length)`
`76`	`76`	`{`
`77`	`77`	`WINRT_ASSERT(length != 0);`
`78`		`- uint64_t bytes_required = sizeof(shared_hstring_header) + sizeof(wchar_t) * length;`
	`78`	`+ uint64_t bytes_required = static_cast<uint64_t>(sizeof(shared_hstring_header)) + static_cast<uint64_t>(sizeof(wchar_t)) * static_cast<uint64_t>(length);`
`79`	`79`
`80`	`80`	`if (bytes_required > UINT_MAX)`
`81`	`81`	`{`