Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve code style [skip ci]

This commit is contained in:
halx99 2022-04-28 12:04:23 +08:00
parent 2bd3ce6bf2
commit 15cf113e75
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/platform/win32/CCFileUtils-win32.cpp
View File

@ -68,10 +68,10 @@ static void _checkWorkingPath()
{ {
if (s_workingDir.empty()) if (s_workingDir.empty())
{ {
WCHAR utf16Path[AX_MAX_PATH] = {0}; WCHAR utf16Path[AX_MAX_PATH + 2] = {0};
size_t nNum = GetCurrentDirectoryW(AX_MAX_PATH - 2, utf16Path); size_t nNum = GetCurrentDirectoryW(AX_MAX_PATH, utf16Path);
utf16Path[nNum++] = '\\'; utf16Path[nNum++] = '\\';
s_workingDir = ntcvt::from_chars(std::wstring_view{utf16Path, static_cast<size_t>(nNum)}); s_workingDir = ntcvt::from_chars(std::wstring_view{utf16Path, static_cast<size_t>(nNum)});
std::replace(s_workingDir.begin(), s_workingDir.end(), '\\', '/'); std::replace(s_workingDir.begin(), s_workingDir.end(), '\\', '/');
} }
} }
@ -80,8 +80,8 @@ static void _checkExePath()
{ {
if (s_exeDir.empty()) if (s_exeDir.empty())
{ {
WCHAR utf16Path[AX_MAX_PATH] = {0}; WCHAR utf16Path[AX_MAX_PATH + 1] = {0};
size_t nNum = GetModuleFileNameW(NULL, utf16Path, AX_MAX_PATH - 1); size_t nNum = GetModuleFileNameW(NULL, utf16Path, AX_MAX_PATH);
std::wstring_view u16pathsv{utf16Path, nNum}; std::wstring_view u16pathsv{utf16Path, nNum};
u16pathsv.remove_suffix(u16pathsv.length() - u16pathsv.find_last_of('\\') - 1); u16pathsv.remove_suffix(u16pathsv.length() - u16pathsv.find_last_of('\\') - 1);
s_exeDir = ntcvt::from_chars(u16pathsv); s_exeDir = ntcvt::from_chars(u16pathsv);