diff --git a/strings/base_activation.h b/strings/base_activation.h index 37c70aaa9..e6bf74c74 100644 --- a/strings/base_activation.h +++ b/strings/base_activation.h @@ -39,7 +39,7 @@ namespace winrt::impl if (hr == impl::error_not_initialized) { - auto usage = static_cast(WINRT_IMPL_GetProcAddress(WINRT_IMPL_LoadLibraryW(L"combase.dll"), "CoIncrementMTAUsage")); + auto usage = reinterpret_cast(WINRT_IMPL_GetProcAddress(WINRT_IMPL_LoadLibraryW(L"combase.dll"), "CoIncrementMTAUsage")); if (!usage) { @@ -59,7 +59,7 @@ namespace winrt::impl std::wstring path{ static_cast(name) }; std::size_t count{}; - while (-1 != (count = path.rfind('.'))) + while (std::wstring::npos != (count = path.rfind('.'))) { path.resize(count); path += L".dll"; diff --git a/strings/base_agile_ref.h b/strings/base_agile_ref.h index 1f8cd1161..dc809e489 100644 --- a/strings/base_agile_ref.h +++ b/strings/base_agile_ref.h @@ -109,7 +109,7 @@ namespace winrt::impl return; } - result = static_cast(WINRT_IMPL_GetProcAddress(WINRT_IMPL_LoadLibraryW(L"combase.dll"), name)); + result = reinterpret_cast(WINRT_IMPL_GetProcAddress(WINRT_IMPL_LoadLibraryW(L"combase.dll"), name)); if (result) { @@ -119,20 +119,20 @@ namespace winrt::impl result = fallback; } - inline hresult get_agile_reference(winrt::guid const& iid, void* object, void** result) noexcept + inline hresult get_agile_reference(winrt::guid const& iid, void* object, void** reference) noexcept { - static int32_t(__stdcall * handler)(uint32_t options, winrt::guid const& iid, void* object, void** result) noexcept; + static int32_t(__stdcall * handler)(uint32_t options, winrt::guid const& iid, void* object, void** reference) noexcept; load_runtime_function("RoGetAgileReference", handler, - [](uint32_t, winrt::guid const& iid, void* object, void** result) noexcept -> int32_t + [](uint32_t, winrt::guid const& iid, void* object, void** reference) noexcept -> int32_t { - *result = nullptr; + *reference = nullptr; static constexpr guid git_clsid{ 0x00000323, 0x0000, 0x0000, { 0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46 } }; com_ptr git; hresult hr = WINRT_IMPL_CoCreateInstance(git_clsid, nullptr, 1 /*CLSCTX_INPROC_SERVER*/, guid_of(), git.put_void()); - if (result < 0) + if (hr < 0) { return hr; } @@ -140,16 +140,16 @@ namespace winrt::impl uint32_t cookie{}; hr = git->RegisterInterfaceInGlobal(object, iid, &cookie); - if (result < 0) + if (hr < 0) { return hr; } - *result = new agile_ref_fallback(std::move(git), cookie); + *reference = new agile_ref_fallback(std::move(git), cookie); return 0; }); - return handler(0, iid, object, result); + return handler(0, iid, object, reference); } } diff --git a/strings/base_error.h b/strings/base_error.h index 8a3a02762..f75dbbdd1 100644 --- a/strings/base_error.h +++ b/strings/base_error.h @@ -560,7 +560,7 @@ WINRT_EXPORT namespace winrt return pointer; } - [[noreturn]] inline void terminate() noexcept + inline void terminate() noexcept { static void(__stdcall * handler)(int32_t) noexcept;