RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 10:42:36 +01:00
Code Issues Releases Wiki Activity

fs: move buf from stack to heap to silence VS warning

Browse Source
This commit is contained in:
Megamouse 2024-01-13 16:05:23 +01:00
parent 329b58c8cd
commit 3d974eed03
1 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Utilities/File.cpp
View File

@ -515,7 +515,7 @@ bool fs::get_stat(const std::string& path, stat_t& info)
// Handle drives specially // Handle drives specially
if (epath.find_first_of(delim) == umax && epath.ends_with(':')) if (epath.find_first_of(delim) == umax && epath.ends_with(':'))
{ {
WIN32_FILE_ATTRIBUTE_DATA attrs; WIN32_FILE_ATTRIBUTE_DATA attrs{};
// Must end with a delimiter // Must end with a delimiter
if (!GetFileAttributesExW(to_wchar(std::string(epath) + '/').get(), GetFileExInfoStandard, &attrs)) if (!GetFileAttributesExW(to_wchar(std::string(epath) + '/').get(), GetFileExInfoStandard, &attrs))
@ -537,8 +537,6 @@ bool fs::get_stat(const std::string& path, stat_t& info)
return true; return true;
} }
WIN32_FIND_DATA attrs;
// Allowed by FindFirstFileExW but we should not allow it // Allowed by FindFirstFileExW but we should not allow it
if (epath.ends_with("*")) if (epath.ends_with("*"))
{ {
@ -546,6 +544,8 @@ bool fs::get_stat(const std::string& path, stat_t& info)
return false; return false;
} }
WIN32_FIND_DATA attrs{};
const auto wchar_ptr = to_wchar(std::string(epath)); const auto wchar_ptr = to_wchar(std::string(epath));
const std::wstring_view wpath_view = wchar_ptr.get(); const std::wstring_view wpath_view = wchar_ptr.get();
@ -781,17 +781,15 @@ bool fs::remove_dir(const std::string& path)
g_tls_error = to_error(GetLastError()); g_tls_error = to_error(GetLastError());
return false; return false;
} }
return true;
#else #else
if (::rmdir(path.c_str()) != 0) if (::rmdir(path.c_str()) != 0)
{ {
g_tls_error = to_error(errno); g_tls_error = to_error(errno);
return false; return false;
} }
#endif
return true; return true;
#endif
} }
bool fs::rename(const std::string& from, const std::string& to, bool overwrite) bool fs::rename(const std::string& from, const std::string& to, bool overwrite)
@ -1908,16 +1906,44 @@ const std::string& fs::get_config_dir()
std::string dir; std::string dir;
#ifdef _WIN32 #ifdef _WIN32
wchar_t buf[32768]; std::vector<wchar_t> buf;
constexpr DWORD size = static_cast<DWORD>(std::size(buf));
if (GetEnvironmentVariable(L"RPCS3_CONFIG_DIR", buf, size) - 1 >= size - 1 && // Check if RPCS3_CONFIG_DIR is set and get the required buffer size
GetModuleFileName(nullptr, buf, size) - 1 >= size - 1) DWORD size = GetEnvironmentVariable(L"RPCS3_CONFIG_DIR", nullptr, 0);
if (size > 0)
{
// Resize buffer and fetch RPCS3_CONFIG_DIR
buf.resize(size);
if (GetEnvironmentVariable(L"RPCS3_CONFIG_DIR", buf.data(), size) != (size - 1))
{
// Clear buffer on failure and notify user
MessageBoxA(nullptr, fmt::format("GetEnvironmentVariable(RPCS3_CONFIG_DIR) failed: error: %s", fmt::win_error{GetLastError(), nullptr}).c_str(), "fs::get_config_dir()", MB_ICONERROR);
buf.clear();
}
}
// Fallback to executable path if needed
for (DWORD buf_size = MAX_PATH; size == 0; buf_size += MAX_PATH)
{
buf.resize(buf_size);
size = GetModuleFileName(nullptr, buf.data(), buf_size);
if (size == 0)
{ {
MessageBoxA(nullptr, fmt::format("GetModuleFileName() failed: error: %s", fmt::win_error{GetLastError(), nullptr}).c_str(), "fs::get_config_dir()", MB_ICONERROR); MessageBoxA(nullptr, fmt::format("GetModuleFileName() failed: error: %s", fmt::win_error{GetLastError(), nullptr}).c_str(), "fs::get_config_dir()", MB_ICONERROR);
return dir; // empty return dir; // empty
} }
dir = wchar_to_utf8(buf); if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
{
// Try again with increased buffer size
size = 0;
continue;
}
}
dir = wchar_to_utf8(buf.data());
std::replace(dir.begin(), dir.end(), '\\', '/'); std::replace(dir.begin(), dir.end(), '\\', '/');