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

Merge pull request #2971 from unknownbrackets/virtfs

Browse source 
Fix VirtualDiscFileSystem handlers on Linux/Mac
This commit is contained in:
Henrik Rydgård 2013-07-29 09:30:58 -07:00
commit 27d1f81805
1 changed files with 33 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
Core/FileSystems/VirtualDiscFileSystem.cpp
View file

@ -31,6 +31,7 @@
#include <unistd.h>
#include <sys/stat.h>
#include <ctype.h>
#include <dlfcn.h>
#endif
const std::string INDEX_FILENAME = ".ppsspp-index.lst";
@ -73,11 +74,13 @@ void VirtualDiscFileSystem::LoadFileListIndex() {
return;
}
std::string line;
std::string buf;
static const int MAX_LINE_SIZE = 1024;
while (!in.eof()) {
line.resize(MAX_LINE_SIZE, '\0');
in.getline(&line[0], MAX_LINE_SIZE);
buf.resize(MAX_LINE_SIZE, '\0');
in.getline(&buf[0], MAX_LINE_SIZE);
std::string line = buf.data();
// Ignore any UTF-8 BOM.
if (line.substr(0, 3) == "\xEF\xBB\xBF") {
@ -101,13 +104,19 @@ void VirtualDiscFileSystem::LoadFileListIndex() {
size_t handler_pos = line.find(':', filename_pos);
if (handler_pos != line.npos) {
entry.fileName = line.substr(filename_pos + 1, handler_pos - filename_pos - 1);
std::string handler = line.substr(handler_pos + 1);
std::string handler = line.substr(handler_pos + 1).c_str();
size_t trunc = handler.find_last_not_of("\r\n");
if (trunc != handler.npos && trunc != handler.size())
handler.resize(trunc + 1);
if (handlers.find(handler) == handlers.end())
handlers[handler] = new Handler(handler.c_str(), this);
entry.handler = handlers[handler];
} else {
entry.fileName = line.substr(filename_pos + 1);
entry.fileName = line.substr(filename_pos + 1).c_str();
}
size_t trunc = entry.fileName.find_last_not_of("\r\n");
if (trunc != entry.fileName.npos && trunc != entry.fileName.size())
entry.fileName.resize(trunc + 1);
entry.firstBlock = strtol(line.c_str(), NULL, 16);
if (entry.handler != NULL && entry.handler->IsValid()) {
@ -421,7 +430,7 @@ size_t VirtualDiscFileSystem::ReadFile(u32 handle, u8 *pointer, s64 size) {
int fileIndex = getFileListIndex(iter->second.curOffset,size*2048,true);
if (fileIndex == -1)
{
ERROR_LOG(HLE,"VirtualDiscFileSystem: Reading from unknown address %08x", handle);
ERROR_LOG(HLE,"VirtualDiscFileSystem: Reading from unknown address in %08x at %08x", handle, iter->second.curOffset);
return 0;
}
@ -709,30 +718,34 @@ void VirtualDiscFileSystem::HandlerLogger(void *arg, HandlerHandle handle, LogTy
VirtualDiscFileSystem::Handler::Handler(const char *filename, VirtualDiscFileSystem *const sys) {
#ifdef _WIN32
HMODULE mod = LoadLibrary(filename);
#define dlopen(name, ignore) (void *)LoadLibrary(name)
#define dlsym(mod, name) GetProcAddress((HMODULE)mod, name)
#define dlclose(mod) FreeLibrary((HMODULE)mod)
#endif
library = (void *)mod;
library = dlopen(filename, RTLD_LOCAL | RTLD_NOW);
if (library != NULL) {
Init = (InitFunc)GetProcAddress(mod, "Init");
Shutdown = (ShutdownFunc)GetProcAddress(mod, "Shutdown");
Open = (OpenFunc)GetProcAddress(mod, "Open");
Seek = (SeekFunc)GetProcAddress(mod, "Seek");
Read = (ReadFunc)GetProcAddress(mod, "Read");
Close = (CloseFunc)GetProcAddress(mod, "Close");
Init = (InitFunc)dlsym(library, "Init");
Shutdown = (ShutdownFunc)dlsym(library, "Shutdown");
Open = (OpenFunc)dlsym(library, "Open");
Seek = (SeekFunc)dlsym(library, "Seek");
Read = (ReadFunc)dlsym(library, "Read");
Close = (CloseFunc)dlsym(library, "Close");
if (Init == NULL || Shutdown == NULL || Open == NULL || Seek == NULL || Read == NULL || Close == NULL) {
ERROR_LOG(FILESYS, "Unable to find all handler functions: %s", filename);
FreeLibrary(mod);
dlclose(library);
library = NULL;
} else if (!Init(&HandlerLogger, sys)) {
ERROR_LOG(FILESYS, "Unable to initialize handler: %s", filename);
FreeLibrary(mod);
dlclose(library);
library = NULL;
}
}
#else
ERROR_LOG(FILESYS, "VirtualDiscFileSystem handlers not implemented yet.");
library = NULL;
#ifdef _WIN32
#undef dlopen
#undef dlsym
#undef dlclose
#endif
}
@ -743,7 +756,7 @@ VirtualDiscFileSystem::Handler::~Handler() {
#ifdef _WIN32
FreeLibrary((HMODULE)library);
#else
ERROR_LOG(FILESYS, "VirtualDiscFileSystem handlers not implemented yet.");
dlclose(library);
#endif
}
}