mirror of
https://github.com/yuzu-emu/yuzu-mainline.git
synced 2024-12-12 17:44:26 +01:00
Merge pull request #1672 from wwylele/win-driver-fix
Fix driver root identification on Windows
This commit is contained in:
commit
6d29c20208
@ -69,9 +69,10 @@ static void StripTailDirSlashes(std::string &fname)
|
|||||||
{
|
{
|
||||||
if (fname.length() > 1)
|
if (fname.length() > 1)
|
||||||
{
|
{
|
||||||
size_t i = fname.length() - 1;
|
size_t i = fname.length();
|
||||||
while (fname[i] == DIR_SEP_CHR)
|
while (i > 0 && fname[i - 1] == DIR_SEP_CHR)
|
||||||
fname[i--] = '\0';
|
--i;
|
||||||
|
fname.resize(i);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -85,6 +86,10 @@ bool Exists(const std::string &filename)
|
|||||||
StripTailDirSlashes(copy);
|
StripTailDirSlashes(copy);
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
// Windows needs a slash to identify a driver root
|
||||||
|
if (copy.size() != 0 && copy.back() == ':')
|
||||||
|
copy += DIR_SEP_CHR;
|
||||||
|
|
||||||
int result = _wstat64(Common::UTF8ToUTF16W(copy).c_str(), &file_info);
|
int result = _wstat64(Common::UTF8ToUTF16W(copy).c_str(), &file_info);
|
||||||
#else
|
#else
|
||||||
int result = stat64(copy.c_str(), &file_info);
|
int result = stat64(copy.c_str(), &file_info);
|
||||||
@ -102,6 +107,10 @@ bool IsDirectory(const std::string &filename)
|
|||||||
StripTailDirSlashes(copy);
|
StripTailDirSlashes(copy);
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
// Windows needs a slash to identify a driver root
|
||||||
|
if (copy.size() != 0 && copy.back() == ':')
|
||||||
|
copy += DIR_SEP_CHR;
|
||||||
|
|
||||||
int result = _wstat64(Common::UTF8ToUTF16W(copy).c_str(), &file_info);
|
int result = _wstat64(Common::UTF8ToUTF16W(copy).c_str(), &file_info);
|
||||||
#else
|
#else
|
||||||
int result = stat64(copy.c_str(), &file_info);
|
int result = stat64(copy.c_str(), &file_info);
|
||||||
|
Loading…
Reference in New Issue
Block a user