Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 23:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FileSystem: Fix GetProgramPath() sometimes returning stale paths

Browse source 
See https://social.msdn.microsoft.com/Forums/windowshardware/en-US/4b7b3884-d0bb-4812-bc18-2078c61d4b90/queryfullprocessimagename-gives-wrong-path-for-renamed-directory?forum=windowsgeneraldevelopmentissues
This commit is contained in:
Connor McLaughlin 2020-09-21 01:20:20 +10:00
parent 2219b9aa66
commit e8e461c0a7
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/common/file_system.cpp
View file

@ -1114,16 +1114,18 @@ bool FileSystem::DeleteDirectory(const char* Path, bool Recursive)
std::string GetProgramPath() std::string GetProgramPath()
{ {
const HANDLE hProcess = GetCurrentProcess();
std::wstring buffer; std::wstring buffer;
buffer.resize(MAX_PATH); buffer.resize(MAX_PATH);
// Fall back to the main module if this fails.
HMODULE module = nullptr;
GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
reinterpret_cast<LPCWSTR>(&GetProgramPath), &module);
for (;;) for (;;)
{ {
DWORD nChars = static_cast<DWORD>(buffer.size()); DWORD nChars = GetModuleFileNameW(module, buffer.data(), static_cast<DWORD>(buffer.size()));
if (!QueryFullProcessImageNameW(GetCurrentProcess(), 0, buffer.data(), &nChars) && if (nChars == static_cast<DWORD>(buffer.size()) && GetLastError() == ERROR_INSUFFICIENT_BUFFER)
GetLastError() == ERROR_INSUFFICIENT_BUFFER)
{ {
buffer.resize(buffer.size() * 2); buffer.resize(buffer.size() * 2);
continue; continue;
@ -1315,7 +1317,7 @@ bool StatFile(const char* Path, FILESYSTEM_STAT_DATA* pStatData)
if (Path[0] == '\0') if (Path[0] == '\0')
return false; return false;
// stat file // stat file
#ifdef __HAIKU__ #ifdef __HAIKU__
struct stat sysStatData; struct stat sysStatData;
if (stat(Path, &sysStatData) < 0) if (stat(Path, &sysStatData) < 0)
@ -1349,7 +1351,7 @@ bool FileExists(const char* Path)
if (Path[0] == '\0') if (Path[0] == '\0')
return false; return false;
// stat file // stat file
#ifdef __HAIKU__ #ifdef __HAIKU__
struct stat sysStatData; struct stat sysStatData;
if (stat(Path, &sysStatData) < 0) if (stat(Path, &sysStatData) < 0)
@ -1371,13 +1373,13 @@ bool DirectoryExists(const char* Path)
if (Path[0] == '\0') if (Path[0] == '\0')
return false; return false;
// stat file // stat file
#ifdef __HAIKU__ #ifdef __HAIKU__
struct stat sysStatData; struct stat sysStatData;
if (stat(Path, &sysStatData) < 0) if (stat(Path, &sysStatData) < 0)
#else #else
struct stat64 sysStatData; struct stat64 sysStatData;
if (stat64(Path, &sysStatData) < 0) if (stat64(Path, &sysStatData) < 0)
#endif #endif
return false; return false;