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

Fixed few \ on code that suppose to work on linux as well. 

That most fixed something, probably some crash and some iso properties issue:)


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2536 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-03-03 10:21:13 +00:00
parent 281e6bc883
commit 87cf3e64bd
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DiscIO/Src/FileHandlerARC.cpp
View File

@ -209,11 +209,11 @@ CARCFile::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, cons
// this is a directory, build up the new szDirectory // this is a directory, build up the new szDirectory
if (_szDirectory != NULL) if (_szDirectory != NULL)
{ {
sprintf(rFileInfo.m_FullPath, "%s%s\\", _szDirectory, &_szNameTable[uOffset]); sprintf(rFileInfo.m_FullPath, "%s%s/", _szDirectory, &_szNameTable[uOffset]);
} }
else else
{ {
sprintf(rFileInfo.m_FullPath, "%s\\", &_szNameTable[uOffset]); sprintf(rFileInfo.m_FullPath, "%s/", &_szNameTable[uOffset]);
} }
CurrentIndex = BuildFilenames(CurrentIndex + 1, (size_t) rFileInfo.m_FileSize, rFileInfo.m_FullPath, _szNameTable); CurrentIndex = BuildFilenames(CurrentIndex + 1, (size_t) rFileInfo.m_FileSize, rFileInfo.m_FullPath, _szNameTable);

4
Source/Core/DiscIO/Src/FileSystemGCWii.cpp
View File

@ -225,9 +225,9 @@ size_t CFileSystemGCWii::BuildFilenames(const size_t _FirstIndex, const size_t _
{ {
// this is a directory, build up the new szDirectory // this is a directory, build up the new szDirectory
if (_szDirectory != NULL) if (_szDirectory != NULL)
CharArrayFromFormat(rFileInfo->m_FullPath, "%s%s\\", _szDirectory, filename); CharArrayFromFormat(rFileInfo->m_FullPath, "%s%s/", _szDirectory, filename);
else else
CharArrayFromFormat(rFileInfo->m_FullPath, "%s\\", filename); CharArrayFromFormat(rFileInfo->m_FullPath, "%s/", filename);
CurrentIndex = BuildFilenames(CurrentIndex + 1, (size_t) rFileInfo->m_FileSize, rFileInfo->m_FullPath, _NameTableOffset); CurrentIndex = BuildFilenames(CurrentIndex + 1, (size_t) rFileInfo->m_FileSize, rFileInfo->m_FullPath, _NameTableOffset);
} }

8
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -118,7 +118,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
// Filesystem browser/dumper // Filesystem browser/dumper
fileIter beginning = Our_Files.begin(), end = Our_Files.end(), pos = Our_Files.begin(); fileIter beginning = Our_Files.begin(), end = Our_Files.end(), pos = Our_Files.begin();
CreateDirectoryTree(RootId, beginning, end, pos, (char *)"\\"); CreateDirectoryTree(RootId, beginning, end, pos, (char *)"/");
m_Treectrl->Expand(RootId); m_Treectrl->Expand(RootId);
std::string filename, extension; std::string filename, extension;
@ -160,7 +160,7 @@ void CISOProperties::CreateDirectoryTree(wxTreeItemId& parent,
if((*iterPos)->IsDirectory()) { if((*iterPos)->IsDirectory()) {
char *dirName; char *dirName;
name[strlen(name) - 1] = '\0'; name[strlen(name) - 1] = '\0';
dirName = strrchr(name, '\\'); dirName = strrchr(name, DIR_SEP_CHR);
if(!dirName) if(!dirName)
dirName = name; dirName = name;
else else
@ -169,7 +169,7 @@ void CISOProperties::CreateDirectoryTree(wxTreeItemId& parent,
wxTreeItemId item = m_Treectrl->AppendItem(parent, wxString::FromAscii(dirName)); wxTreeItemId item = m_Treectrl->AppendItem(parent, wxString::FromAscii(dirName));
CreateDirectoryTree(item, begin, end, ++iterPos, name); CreateDirectoryTree(item, begin, end, ++iterPos, name);
} else { } else {
char *fileName = strrchr(name, '\\'); char *fileName = strrchr(name, DIR_SEP_CHR);
if(!fileName) if(!fileName)
fileName = name; fileName = name;
else else
@ -475,7 +475,7 @@ void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event))
{ {
wxString temp; wxString temp;
temp = m_Treectrl->GetItemText(m_Treectrl->GetItemParent(m_Treectrl->GetSelection())); temp = m_Treectrl->GetItemText(m_Treectrl->GetItemParent(m_Treectrl->GetSelection()));
File = temp + _T("\\") + File; File = temp + _T(DIR_SEP_CHR) + File;
m_Treectrl->SelectItem(m_Treectrl->GetItemParent(m_Treectrl->GetSelection())); m_Treectrl->SelectItem(m_Treectrl->GetItemParent(m_Treectrl->GetSelection()));
} }