ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FileSystem: Use _filelengthi64 to get the file size on Windows

This commit is contained in:
Silent 2023-07-18 18:26:20 +02:00 committed by Connor McLaughlin
parent d96dea49bf
commit c82f800794
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/FileSystem.cpp
View File

@ -38,6 +38,7 @@
#if defined(_WIN32) #if defined(_WIN32)
#include "RedtapeWindows.h" #include "RedtapeWindows.h"
#include <io.h>
#include <winioctl.h> #include <winioctl.h>
#include <share.h> #include <share.h>
#include <shlobj.h> #include <shlobj.h>
@ -747,6 +748,13 @@ s64 FileSystem::FTell64(std::FILE* fp)
s64 FileSystem::FSize64(std::FILE* fp) s64 FileSystem::FSize64(std::FILE* fp)
{ {
#ifdef _WIN32
const int fd = _fileno(fp);
if (fd >= 0)
{
return _filelengthi64(fd);
}
#else
const s64 pos = FTell64(fp); const s64 pos = FTell64(fp);
if (pos >= 0) if (pos >= 0)
{ {
@ -757,6 +765,7 @@ s64 FileSystem::FSize64(std::FILE* fp)
return size; return size;
} }
} }
#endif
return -1; return -1;
} }
@ -781,12 +790,11 @@ std::optional<std::vector<u8>> FileSystem::ReadBinaryFile(const char* filename)
std::optional<std::vector<u8>> FileSystem::ReadBinaryFile(std::FILE* fp) std::optional<std::vector<u8>> FileSystem::ReadBinaryFile(std::FILE* fp)
{ {
std::fseek(fp, 0, SEEK_END); const s64 size = FSize64(fp);
const long size = std::ftell(fp);
std::fseek(fp, 0, SEEK_SET);
if (size < 0) if (size < 0)
return std::nullopt; return std::nullopt;
std::fseek(fp, 0, SEEK_SET);
std::vector<u8> res(static_cast<size_t>(size)); std::vector<u8> res(static_cast<size_t>(size));
if (size > 0 && std::fread(res.data(), 1u, static_cast<size_t>(size), fp) != static_cast<size_t>(size)) if (size > 0 && std::fread(res.data(), 1u, static_cast<size_t>(size), fp) != static_cast<size_t>(size))
return std::nullopt; return std::nullopt;
@ -805,12 +813,11 @@ std::optional<std::string> FileSystem::ReadFileToString(const char* filename)
std::optional<std::string> FileSystem::ReadFileToString(std::FILE* fp) std::optional<std::string> FileSystem::ReadFileToString(std::FILE* fp)
{ {
std::fseek(fp, 0, SEEK_END); const s64 size = FSize64(fp);
const long size = std::ftell(fp);
std::fseek(fp, 0, SEEK_SET);
if (size < 0) if (size < 0)
return std::nullopt; return std::nullopt;
std::fseek(fp, 0, SEEK_SET);
std::string res; std::string res;
res.resize(static_cast<size_t>(size)); res.resize(static_cast<size_t>(size));
// NOTE - assumes mode 'rb', for example, this will fail over missing Windows carriage return bytes // NOTE - assumes mode 'rb', for example, this will fail over missing Windows carriage return bytes