jyapayne/Sunshine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use Win32 APIs for UTF-16<->UTF-8 conversion

Browse source 
std::codecvt is deprecated since C++17 and broken for some characters/locales
This commit is contained in:
Cameron Gutman 2024-02-11 15:16:41 -06:00
commit 69a3edd9b0
7 changed files with 113 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/platform/windows/display_vram.cpp
View file

@ -4,8 +4,6 @@
*/
#include <cmath>
#include <codecvt>
#include <d3dcompiler.h>
#include <directxmath.h>
@ -342,9 +340,8 @@ namespace platf::dxgi {
#ifndef NDEBUG
flags |= D3DCOMPILE_DEBUG | D3DCOMPILE_SKIP_OPTIMIZATION;
#endif
std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>, wchar_t> converter;
auto wFile = converter.from_bytes(file);
auto wFile = from_utf8(file);
auto status = D3DCompileFromFile(wFile.c_str(), nullptr, D3D_COMPILE_STANDARD_FILE_INCLUDE, entrypoint, shader_model, flags, 0, &compiled_p, &msg_p);
if (msg_p) {