Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Save/restore local file handles and seek positions

Browse source
This commit is contained in:
Kentucky Compass 2013-12-28 23:43:02 -08:00
parent ff10d0b0f2
commit db77b52caa
2 changed files with 59 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
Core/FileSystems/DirectoryFileSystem.cpp
View file

@ -303,10 +303,16 @@ DirectoryFileSystem::DirectoryFileSystem(IHandleAllocator *_hAlloc, std::string
hAlloc = _hAlloc;
}
DirectoryFileSystem::~DirectoryFileSystem() {
void DirectoryFileSystem::CloseAll() {
for (auto iter = entries.begin(); iter != entries.end(); ++iter) {
iter->second.hFile.Close();
}
entries.clear();
}
DirectoryFileSystem::~DirectoryFileSystem() {
CloseAll();
}
std::string DirectoryFileSystem::GetLocalPath(std::string localpath) {
@ -466,6 +472,10 @@ u32 DirectoryFileSystem::OpenFile(std::string filename, FileAccess access, const
#endif
u32 newHandle = hAlloc->GetNewHandle();
entry.guestFilename = filename;
entry.access = access;
entries[newHandle] = entry;
return newHandle;
@ -672,9 +682,50 @@ std::vector<PSPFileInfo> DirectoryFileSystem::GetDirListing(std::string path) {
}
void DirectoryFileSystem::DoState(PointerWrap &p) {
if (!entries.empty()) {
p.SetError(p.ERROR_WARNING);
ERROR_LOG(FILESYS, "FIXME: Open files during savestate, could go badly.");
auto s = p.Section("DirectoryFileSystem", 0, 1);
if (!s)
return;
// Savestate layout:
// u32: number of entries
// per-entry:
// u32: handle number
// std::string filename (in guest's terms, untranslated)
// enum FileAccess file access mode
// u32 seek position
u32 num = (u32) entries.size();
p.Do(num);
if (p.mode == p.MODE_READ) {
CloseAll();
u32 key;
OpenFileEntry entry;
for (u32 i = 0; i < num; i++) {
p.Do(key);
p.Do(entry.guestFilename);
p.Do(entry.access);
if (! entry.hFile.Open(basePath,entry.guestFilename,entry.access)) {
ERROR_LOG(FILESYS, "Failed to reopen file while loading state: %s", entry.guestFilename.c_str());
continue;
}
u32 position;
p.Do(position);
if (position != entry.hFile.Seek(position, FILEMOVE_BEGIN)) {
ERROR_LOG(FILESYS, "Failed to restore seek position while loading state: %s", entry.guestFilename.c_str());
continue;
}
entries[key] = entry;
}
} else {
for (auto iter = entries.begin(); iter != entries.end(); ++iter) {
u32 key = iter->first;
p.Do(key);
p.Do(iter->second.guestFilename);
p.Do(iter->second.access);
u32 position = iter->second.hFile.Seek(0, FILEMOVE_CURRENT);
p.Do(position);
}
}
}

4
Core/FileSystems/DirectoryFileSystem.h
View file

@ -86,6 +86,8 @@ public:
DirectoryFileSystem(IHandleAllocator *_hAlloc, std::string _basePath);
~DirectoryFileSystem();
void CloseAll();
void DoState(PointerWrap &p);
std::vector<PSPFileInfo> GetDirListing(std::string path);
u32 OpenFile(std::string filename, FileAccess access, const char *devicename=NULL);
@ -107,6 +109,8 @@ public:
private:
struct OpenFileEntry {
DirectoryFileHandle hFile;
std::string guestFilename;
FileAccess access;
};
typedef std::map<u32, OpenFileEntry> EntryMap;