From e8929e5e43fa57ef7fb75afca42f5598455c9bc8 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Sun, 13 Dec 2020 13:53:53 +0100 Subject: [PATCH] Make the UTF-16 conversion a bit safer --- src/common/serialization/vst3/host-application.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/serialization/vst3/host-application.cpp b/src/common/serialization/vst3/host-application.cpp index d270e277..30f9a14e 100644 --- a/src/common/serialization/vst3/host-application.cpp +++ b/src/common/serialization/vst3/host-application.cpp @@ -26,9 +26,11 @@ YaHostApplication::ConstructArgs::ConstructArgs( if (context->getName(name_array) == Steinberg::kResultOk) { #ifdef __WINE__ // Who even invented UTF-16 - static_assert(sizeof(wchar_t) == sizeof(char16_t)); -#endif + static_assert(sizeof(Steinberg::Vst::TChar) == sizeof(char16_t)); name = std::u16string(reinterpret_cast(name_array)); +#else + name = std::u16string(static_cast(name_array)); +#endif } }