1 files changed, 17 insertions, 12 deletions
diff --git a/common/strutils.cpp b/common/strutils.cpp
index d0418eff..f7868e2e 100644
--- a/common/strutils.cpp
+++ b/common/strutils.cpp
@@ -10,31 +10,32 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-std::string wstr_to_utf8(const WCHAR *wstr)
+std::string wstr_to_utf8(std::wstring_view wstr)
 {
     std::string ret;
 
-    int len = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, nullptr, 0, nullptr, nullptr);
+    int len{WideCharToMultiByte(CP_UTF8, 0, wstr.data(), static_cast<int>(wstr.length()), nullptr,
+        0, nullptr, nullptr)};
     if(len > 0)
     {
         ret.resize(len);
-        WideCharToMultiByte(CP_UTF8, 0, wstr, -1, &ret[0], len, nullptr, nullptr);
-        ret.pop_back();
+        WideCharToMultiByte(CP_UTF8, 0, wstr.data(), static_cast<int>(wstr.length()), &ret[0], len,
+            nullptr, nullptr);
     }
 
     return ret;
 }
 
-std::wstring utf8_to_wstr(const char *str)
+std::wstring utf8_to_wstr(std::string_view str)
 {
     std::wstring ret;
 
-    int len = MultiByteToWideChar(CP_UTF8, 0, str, -1, nullptr, 0);
+    int len{MultiByteToWideChar(CP_UTF8, 0, str.data(), static_cast<int>(str.length()), nullptr,
+        0)};
     if(len > 0)
     {
         ret.resize(len);
-        MultiByteToWideChar(CP_UTF8, 0, str, -1, &ret[0], len);
-        ret.pop_back();
+        MultiByteToWideChar(CP_UTF8, 0, str.data(), static_cast<int>(str.length()), &ret[0], len);
     }
 
     return ret;
@@ -43,21 +44,25 @@ std::wstring utf8_to_wstr(const char *str)
 
 namespace al {
 
-al::optional<std::string> getenv(const char *envname)
+std::optional<std::string> getenv(const char *envname)
 {
+#ifdef _GAMING_XBOX
+    const char *str{::getenv(envname)};
+#else
     const char *str{std::getenv(envname)};
+#endif
     if(str && str[0] != '\0')
         return str;
-    return al::nullopt;
+    return std::nullopt;
 }
 
 #ifdef _WIN32
-al::optional<std::wstring> getenv(const WCHAR *envname)
+std::optional<std::wstring> getenv(const WCHAR *envname)
 {
     const WCHAR *str{_wgetenv(envname)};
     if(str && str[0] != L'\0')
         return str;
-    return al::nullopt;
+    return std::nullopt;
 }
 #endif