games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-13 11:40:38 +02:00
Code Issues Releases Activity

fix launching server when Windows user name has non-latin characters

Browse Source
This commit is contained in:
Andrey Filipenkov 2022-09-10 16:03:54 +03:00 committed by Andrii Danylchenko
parent d44780d2ac
commit bccc658e8b
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/CServerHandler.cpp
View File

@ -47,6 +47,10 @@
#include <vcmi/events/EventBus.h> #include <vcmi/events/EventBus.h>
#ifdef VCMI_WINDOWS
#include <windows.h>
#endif
template<typename T> class CApplyOnLobby; template<typename T> class CApplyOnLobby;
#ifdef VCMI_ANDROID #ifdef VCMI_ANDROID
@ -694,7 +698,23 @@ void CServerHandler::threadRunServer()
} }
comm += " > \"" + logName + '\"'; comm += " > \"" + logName + '\"';
#ifdef VCMI_WINDOWS
int result = -1;
const auto bufSize = ::MultiByteToWideChar(CP_UTF8, 0, comm.c_str(), comm.size(), nullptr, 0);
if(bufSize > 0)
{
std::wstring wComm(bufSize, {});
const auto convertResult = ::MultiByteToWideChar(CP_UTF8, 0, comm.c_str(), comm.size(), &wComm[0], bufSize);
if(convertResult > 0)
result = ::_wsystem(wComm.c_str());
else
logNetwork->error("Error " + std::to_string(GetLastError()) + ": failed to convert server launch command to wide string: " + comm);
}
else
logNetwork->error("Error " + std::to_string(GetLastError()) + ": failed to obtain buffer length to convert server launch command to wide string : " + comm);
#else
int result = std::system(comm.c_str()); int result = std::system(comm.c_str());
#endif
if (result == 0) if (result == 0)
{ {
logNetwork->info("Server closed correctly"); logNetwork->info("Server closed correctly");