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

fix seeking not working, put this back to shared_ptr (no make_shared<T[]> in c++17 :( )

This commit is contained in:
CasualPokePlayer 2023-09-17 12:23:53 -07:00
parent fe3d34dbd3
commit 9c389eadf7
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/dll/melonDS.wbx.zst
View File

Binary file not shown.

20
waterbox/melon/BizPlatform/BizFile.cpp
View File

@ -23,7 +23,7 @@ void SetFileCallbacks(FileCallbackInterface& fileCallbackInterface)
struct FileHandle struct FileHandle
{ {
public: public:
FileHandle(u8* data_, size_t size_, FileMode mode_) FileHandle(std::shared_ptr<u8[]> data_, size_t size_, FileMode mode_)
: data(data_) : data(data_)
, pos(0) , pos(0)
, size(size_) , size(size_)
@ -97,7 +97,7 @@ public:
} }
count = std::min(count, (u64)(size - pos)); count = std::min(count, (u64)(size - pos));
memcpy(data_, data, count); memcpy(data_, &data[pos], count);
pos += count; pos += count;
return count; return count;
} }
@ -110,7 +110,7 @@ public:
} }
count = std::min(count, (u64)(size - pos)); count = std::min(count, (u64)(size - pos));
memcpy(data, data_, count); memcpy(&data[pos], data_, count);
pos += count; pos += count;
return count; return count;
} }
@ -121,7 +121,7 @@ public:
} }
private: private:
u8* data; std::shared_ptr<u8[]> data;
size_t pos, size; size_t pos, size;
FileMode mode; FileMode mode;
@ -136,7 +136,7 @@ private:
} }
}; };
static std::unordered_map<std::string, std::pair<std::unique_ptr<u8[]>, size_t>> FileBufferCache; static std::unordered_map<std::string, std::pair<std::shared_ptr<u8[]>, size_t>> FileBufferCache;
// TODO - I don't like this approach with NAND // TODO - I don't like this approach with NAND
// Perhaps instead it would be better to use FileFlush to write to disk // Perhaps instead it would be better to use FileFlush to write to disk
@ -172,7 +172,7 @@ FileHandle* OpenFile(const std::string& path, FileMode mode)
if (auto cache = FileBufferCache.find(path); cache != FileBufferCache.end()) if (auto cache = FileBufferCache.find(path); cache != FileBufferCache.end())
{ {
return new FileHandle(cache->second.first.get(), cache->second.second, mode); return new FileHandle(cache->second.first, cache->second.second, mode);
} }
size_t size = FileCallbacks.GetLength(path.c_str()); size_t size = FileCallbacks.GetLength(path.c_str());
@ -181,12 +181,10 @@ FileHandle* OpenFile(const std::string& path, FileMode mode)
return nullptr; return nullptr;
} }
auto data = std::make_unique<u8[]>(size); std::shared_ptr<u8[]> data(new u8[size]);
FileCallbacks.GetData(path.c_str(), data.get()); FileCallbacks.GetData(path.c_str(), data.get());
FileBufferCache.emplace(path, std::make_pair(data, size));
auto ret = new FileHandle(data.get(), size, mode); return new FileHandle(data, size, mode);
FileBufferCache.emplace(path, std::make_pair(std::move(data), size));
return ret;
} }
FileHandle* OpenLocalFile(const std::string& path, FileMode mode) FileHandle* OpenLocalFile(const std::string& path, FileMode mode)