piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-26 15:49:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Changed the IOCTLV_READ_DIR function to use the replacements list.

Browse Source 
It will now decode entities of unsupported FAT32/NTSC/etc characters in filenames to be returned, so that games such as HP:HBP won't fail to find files containing such unsupported characters.

Unless there are still parts of code waiting for file name replacements, this should completely fix issue 3443...

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6791 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
dimitri_le_bon_pilote
2011-01-09 13:49:54 +00:00
parent fbd4487987
commit f634d58035
1 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
View File

@ -24,15 +24,20 @@
#include "StringUtil.h" #include "StringUtil.h"
#include "FileSearch.h" #include "FileSearch.h"
#include "FileUtil.h" #include "FileUtil.h"
#include "NandPaths.h"
#include "../VolumeHandler.h" #include "../VolumeHandler.h"
#define MAX_NAME (12) #define MAX_NAME (12)
static Common::replace_v replacements;
CWII_IPC_HLE_Device_fs::CWII_IPC_HLE_Device_fs(u32 _DeviceID, const std::string& _rDeviceName) CWII_IPC_HLE_Device_fs::CWII_IPC_HLE_Device_fs(u32 _DeviceID, const std::string& _rDeviceName)
: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName) : IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
{} {
Common::ReadReplacements(replacements);
}
CWII_IPC_HLE_Device_fs::~CWII_IPC_HLE_Device_fs() CWII_IPC_HLE_Device_fs::~CWII_IPC_HLE_Device_fs()
{} {}
@ -115,20 +120,20 @@ bool CWII_IPC_HLE_Device_fs::IOCtlV(u32 _CommandAddress)
case IOCTLV_READ_DIR: case IOCTLV_READ_DIR:
{ {
// the wii uses this function to define the type (dir or file) // the wii uses this function to define the type (dir or file)
std::string Filename(HLE_IPC_BuildFilename((const char*)Memory::GetPointer( std::string DirName(HLE_IPC_BuildFilename((const char*)Memory::GetPointer(
CommandBuffer.InBuffer[0].m_Address), CommandBuffer.InBuffer[0].m_Size)); CommandBuffer.InBuffer[0].m_Address), CommandBuffer.InBuffer[0].m_Size));
INFO_LOG(WII_IPC_FILEIO, "FS: IOCTL_READ_DIR %s", Filename.c_str()); INFO_LOG(WII_IPC_FILEIO, "FS: IOCTL_READ_DIR %s", DirName.c_str());
if (!File::Exists(Filename.c_str())) if (!File::Exists(DirName.c_str()))
{ {
WARN_LOG(WII_IPC_FILEIO, "FS: Search not found: %s", Filename.c_str()); WARN_LOG(WII_IPC_FILEIO, "FS: Search not found: %s", DirName.c_str());
ReturnValue = FS_DIRFILE_NOT_FOUND; ReturnValue = FS_DIRFILE_NOT_FOUND;
break; break;
} }
// AyuanX: what if we return "found one successfully" if it is a file? // AyuanX: what if we return "found one successfully" if it is a file?
else if (!File::IsDirectory(Filename.c_str())) else if (!File::IsDirectory(DirName.c_str()))
{ {
// It's not a directory, so error. // It's not a directory, so error.
// Games don't usually seem to care WHICH error they get, as long as it's <0 // Games don't usually seem to care WHICH error they get, as long as it's <0
@ -139,7 +144,7 @@ bool CWII_IPC_HLE_Device_fs::IOCtlV(u32 _CommandAddress)
// make a file search // make a file search
CFileSearch::XStringVector Directories; CFileSearch::XStringVector Directories;
Directories.push_back(Filename); Directories.push_back(DirName);
CFileSearch::XStringVector Extensions; CFileSearch::XStringVector Extensions;
Extensions.push_back("*.*"); Extensions.push_back("*.*");
@ -150,8 +155,7 @@ bool CWII_IPC_HLE_Device_fs::IOCtlV(u32 _CommandAddress)
if ((CommandBuffer.InBuffer.size() == 1) && (CommandBuffer.PayloadBuffer.size() == 1)) if ((CommandBuffer.InBuffer.size() == 1) && (CommandBuffer.PayloadBuffer.size() == 1))
{ {
size_t numFile = FileSearch.GetFileNames().size(); size_t numFile = FileSearch.GetFileNames().size();
INFO_LOG(WII_IPC_FILEIO, "\t%lu Files found", INFO_LOG(WII_IPC_FILEIO, "\t%lu Files found", (u32)numFile);
(unsigned long)numFile);
Memory::Write_U32((u32)numFile, CommandBuffer.PayloadBuffer[0].m_Address); Memory::Write_U32((u32)numFile, CommandBuffer.PayloadBuffer[0].m_Address);
} }
@ -169,16 +173,24 @@ bool CWII_IPC_HLE_Device_fs::IOCtlV(u32 _CommandAddress)
if (i >= MaxEntries) if (i >= MaxEntries)
break; break;
std::string filename, ext; std::string name, ext;
SplitPath(FileSearch.GetFileNames()[i], NULL, &filename, &ext); SplitPath(FileSearch.GetFileNames()[i], NULL, &name, &ext);
std::string CompleteFilename = filename + ext; std::string FileName = name + ext;
strcpy(pFilename, CompleteFilename.c_str()); // Decode entities of invalid file system characters so that
pFilename += CompleteFilename.length(); // games (such as HB:HBP) will be able to find what they expect.
for (Common::replace_v::const_iterator it = replacements.begin(); it != replacements.end(); ++it)
{
for (size_t j = 0; (j = FileName.find(it->second, j)) != FileName.npos; ++j)
FileName.replace(j, it->second.length(), 1, it->first);
}
strcpy(pFilename, FileName.c_str());
pFilename += FileName.length();
*pFilename++ = 0x00; // termination *pFilename++ = 0x00; // termination
numFiles++; numFiles++;
INFO_LOG(WII_IPC_FILEIO, "\tFound: %s", CompleteFilename.c_str()); INFO_LOG(WII_IPC_FILEIO, "\tFound: %s", FileName.c_str());
} }
Memory::Write_U32((u32)numFiles, CommandBuffer.PayloadBuffer[1].m_Address); Memory::Write_U32((u32)numFiles, CommandBuffer.PayloadBuffer[1].m_Address);