piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some space/tab mismatches in DiscIO and InputCommon.

Browse Source 
Keeps the files consistent.
This commit is contained in:
lioncash
2013-03-19 09:59:41 -04:00
parent 019b525285
commit 0e3d8e2e9f
9 changed files with 371 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,19 +27,19 @@
namespace DiscIO
{
CARCFile::CARCFile(const std::string& _rFilename)
: m_pBuffer(NULL)
, m_Initialized(false)
: m_pBuffer(NULL)
, m_Initialized(false)
{
DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rFilename.c_str());
if (pReader != NULL)
{
u64 FileSize = pReader->GetDataSize();
m_pBuffer = new u8[(u32)FileSize];
pReader->Read(0, FileSize, m_pBuffer);
delete pReader;
DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rFilename.c_str());
if (pReader != NULL)
{
u64 FileSize = pReader->GetDataSize();
m_pBuffer = new u8[(u32)FileSize];
pReader->Read(0, FileSize, m_pBuffer);
delete pReader;
m_Initialized = ParseBuffer();
}
m_Initialized = ParseBuffer();
}
}
CARCFile::CARCFile(const std::string& _rFilename, u32 offset)

2
Source/Core/DiscIO/Src/NANDContentLoader.cpp
View File

@ -273,7 +273,7 @@ bool CNANDContentLoader::Initialize(const std::string& _rName)
continue;
}
rContent.m_pData = NULL;
rContent.m_pData = NULL;
char szFilename[1024];
if (rContent.m_Type & 0x8000) // shared app

62
Source/Core/DiscIO/Src/NANDContentLoader.h
View File

@ -32,14 +32,14 @@ namespace DiscIO
bool Add_Ticket(u64 TitleID, const u8 *p_tik, u32 tikSize);
struct SNANDContent
{
u32 m_ContentID;
u16 m_Index;
u16 m_Type;
u32 m_Size;
u8 m_SHA1Hash[20];
u8 m_Header[36]; //all of the above
u32 m_ContentID;
u16 m_Index;
u16 m_Type;
u32 m_Size;
u8 m_SHA1Hash[20];
u8 m_Header[36]; //all of the above
u8* m_pData;
u8* m_pData;
};
// pure virtual interface so just the NANDContentManager can create these files only
@ -47,34 +47,34 @@ class INANDContentLoader
{
public:
INANDContentLoader() {}
INANDContentLoader() {}
virtual ~INANDContentLoader() {}
virtual ~INANDContentLoader() {}
virtual bool IsValid() const = 0;
virtual bool IsValid() const = 0;
virtual void RemoveTitle() const = 0;
virtual u64 GetTitleID() const = 0;
virtual u16 GetIosVersion() const = 0;
virtual u32 GetBootIndex() const = 0;
virtual size_t GetContentSize() const = 0;
virtual const SNANDContent* GetContentByIndex(int _Index) const = 0;
virtual u64 GetTitleID() const = 0;
virtual u16 GetIosVersion() const = 0;
virtual u32 GetBootIndex() const = 0;
virtual size_t GetContentSize() const = 0;
virtual const SNANDContent* GetContentByIndex(int _Index) const = 0;
virtual const u8* GetTMDView() const = 0;
virtual const u8* GetTMDHeader() const = 0;
virtual u32 GetTIKSize() const = 0;
virtual const u8* GetTIK() const = 0;
virtual const std::vector<SNANDContent>& GetContent() const = 0;
virtual u16 GetTitleVersion() const = 0;
virtual u16 GetNumEntries() const = 0;
virtual DiscIO::IVolume::ECountry GetCountry() const = 0;
virtual const std::vector<SNANDContent>& GetContent() const = 0;
virtual u16 GetTitleVersion() const = 0;
virtual u16 GetNumEntries() const = 0;
virtual DiscIO::IVolume::ECountry GetCountry() const = 0;
virtual u8 GetCountryChar() const = 0;
enum
{
TMD_VIEW_SIZE = 0x58,
TMD_HEADER_SIZE = 0x1e4,
enum
{
TMD_VIEW_SIZE = 0x58,
TMD_HEADER_SIZE = 0x1e4,
CONTENT_HEADER_SIZE = 0x24,
TICKET_SIZE = 0x2A4
};
};
};
@ -83,22 +83,22 @@ class CNANDContentManager
{
public:
static CNANDContentManager& Access() { return m_Instance; }
static CNANDContentManager& Access() { return m_Instance; }
u64 Install_WiiWAD(std::string &fileName);
const INANDContentLoader& GetNANDLoader(const std::string& _rName, bool forceReload = false);
const INANDContentLoader& GetNANDLoader(const std::string& _rName, bool forceReload = false);
const INANDContentLoader& GetNANDLoader(u64 _titleId, bool forceReload = false);
bool RemoveTitle(u64 _titleID);
private:
CNANDContentManager() {};
CNANDContentManager() {};
~CNANDContentManager();
~CNANDContentManager();
static CNANDContentManager m_Instance;
static CNANDContentManager m_Instance;
typedef std::map<std::string, INANDContentLoader*> CNANDContentMap;
CNANDContentMap m_Map;
typedef std::map<std::string, INANDContentLoader*> CNANDContentMap;
CNANDContentMap m_Map;
};

2
Source/Core/DiscIO/Src/VolumeDirectory.h
View File

@ -59,7 +59,7 @@ public:
ECountry GetCountry() const;
u64 GetSize() const;
u64 GetSize() const;
void BuildFST();

28
Source/Core/DiscIO/Src/WbfsBlob.cpp
View File

@ -75,47 +75,47 @@ bool WbfsFileReader::OpenFiles(const char* filename)
delete new_entry;
return 0 != m_total_files;
}
new_entry->base_address = m_size;
new_entry->size = new_entry->file.GetSize();
m_size += new_entry->size;
m_total_files ++;
m_files.push_back(new_entry);
m_files.push_back(new_entry);
}
}
bool WbfsFileReader::ReadHeader()
{
m_files[0]->file.Seek(4, SEEK_SET);
// Read hd size info
m_files[0]->file.ReadBytes(&hd_sector_count, 4);
hd_sector_count = Common::swap32(hd_sector_count);
m_files[0]->file.ReadBytes(&hd_sector_shift, 1);
hd_sector_size = 1 << hd_sector_shift;
if(m_size != hd_sector_count * hd_sector_size)
{
//printf("File size doesn't match expected size\n");
return false;
}
// Read wbfs cluster info
m_files[0]->file.ReadBytes(&wbfs_sector_shift, 1);
wbfs_sector_size = 1 << wbfs_sector_shift;
wbfs_sector_count = m_size / wbfs_sector_size;
if(wbfs_sector_size < wii_sector_size)
{
//Setting this too low would case a very large memory allocation
return false;
}
m_blocks_per_disc = (wii_sector_count * wii_sector_size) / wbfs_sector_size;
m_disc_info_size = align(wii_disc_header_size + m_blocks_per_disc * 2, hd_sector_size);
// Read disc table
m_files[0]->file.Seek(2, SEEK_CUR);
m_files[0]->file.ReadBytes(disc_table, 500);
@ -125,7 +125,7 @@ bool WbfsFileReader::ReadHeader()
//printf("Game must be in 'slot 0'\n");
return false;
}
return true;
}
@ -143,7 +143,7 @@ bool WbfsFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
nbytes -= read_size;
offset += read_size;
}
return true;
}
@ -172,16 +172,16 @@ File::IOFile& WbfsFileReader::SeekToCluster(u64 offset, u64* available)
}
}
}
PanicAlert("Read beyond end of disc");
m_files[0]->file.Seek(0, SEEK_SET);
return m_files[0]->file;
}
WbfsFileReader* WbfsFileReader::Create(const char* filename)
{
{
WbfsFileReader* reader = new WbfsFileReader(filename);
if(reader->IsGood())
{
return reader;

2
Source/Core/DiscIO/Src/WbfsBlob.h
View File

@ -63,7 +63,7 @@ class WbfsFileReader : public IBlobReader
u16* m_wlba_table;
u64 m_blocks_per_disc;
bool m_good;
public:

112
Source/Core/DiscIO/Src/WiiWad.cpp
View File

@ -45,12 +45,12 @@ private:
WiiWAD::WiiWAD(const std::string& _rName)
{
DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
if (pReader == NULL || File::IsDirectory(_rName))
DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
if (pReader == NULL || File::IsDirectory(_rName))
{
m_Valid = false;
if(pReader) delete pReader;
return;
if(pReader) delete pReader;
return;
}
m_Valid = ParseWAD(*pReader);
@ -71,87 +71,87 @@ WiiWAD::~WiiWAD()
u8* WiiWAD::CreateWADEntry(DiscIO::IBlobReader& _rReader, u32 _Size, u64 _Offset)
{
if (_Size > 0)
{
u8* pTmpBuffer = new u8[_Size];
_dbg_assert_msg_(BOOT, pTmpBuffer!=0, "WiiWAD: Cant allocate memory for WAD entry");
if (_Size > 0)
{
u8* pTmpBuffer = new u8[_Size];
_dbg_assert_msg_(BOOT, pTmpBuffer!=0, "WiiWAD: Cant allocate memory for WAD entry");
if (!_rReader.Read(_Offset, _Size, pTmpBuffer))
{
if (!_rReader.Read(_Offset, _Size, pTmpBuffer))
{
ERROR_LOG(DISCIO, "WiiWAD: Could not read from file");
PanicAlertT("WiiWAD: Could not read from file");
}
return pTmpBuffer;
}
PanicAlertT("WiiWAD: Could not read from file");
}
return pTmpBuffer;
}
return NULL;
}
bool WiiWAD::ParseWAD(DiscIO::IBlobReader& _rReader)
{
CBlobBigEndianReader ReaderBig(_rReader);
CBlobBigEndianReader ReaderBig(_rReader);
// get header size
// get header size
u32 HeaderSize = ReaderBig.Read32(0);
if (HeaderSize != 0x20)
{
_dbg_assert_msg_(BOOT, (HeaderSize==0x20), "WiiWAD: Header size != 0x20");
return false;
}
if (HeaderSize != 0x20)
{
_dbg_assert_msg_(BOOT, (HeaderSize==0x20), "WiiWAD: Header size != 0x20");
return false;
}
// get header
u8 Header[0x20];
_rReader.Read(0, HeaderSize, Header);
// get header
u8 Header[0x20];
_rReader.Read(0, HeaderSize, Header);
u32 HeaderType = ReaderBig.Read32(0x4);
if ((0x49730000 != HeaderType) && (0x69620000 != HeaderType))
return false;
if ((0x49730000 != HeaderType) && (0x69620000 != HeaderType))
return false;
m_CertificateChainSize = ReaderBig.Read32(0x8);
u32 Reserved = ReaderBig.Read32(0xC);
m_TicketSize = ReaderBig.Read32(0x10);
m_TMDSize = ReaderBig.Read32(0x14);
m_DataAppSize = ReaderBig.Read32(0x18);
m_FooterSize = ReaderBig.Read32(0x1C);
m_CertificateChainSize = ReaderBig.Read32(0x8);
u32 Reserved = ReaderBig.Read32(0xC);
m_TicketSize = ReaderBig.Read32(0x10);
m_TMDSize = ReaderBig.Read32(0x14);
m_DataAppSize = ReaderBig.Read32(0x18);
m_FooterSize = ReaderBig.Read32(0x1C);
#if MAX_LOGLEVEL >= DEBUG_LEVEL
_dbg_assert_msg_(BOOT, Reserved==0x00, "WiiWAD: Reserved must be 0x00");
#else
(void)Reserved;
#endif
u32 Offset = 0x40;
m_pCertificateChain = CreateWADEntry(_rReader, m_CertificateChainSize, Offset); Offset += ROUND_UP(m_CertificateChainSize, 0x40);
m_pTicket = CreateWADEntry(_rReader, m_TicketSize, Offset); Offset += ROUND_UP(m_TicketSize, 0x40);
m_pTMD = CreateWADEntry(_rReader, m_TMDSize, Offset); Offset += ROUND_UP(m_TMDSize, 0x40);
m_pDataApp = CreateWADEntry(_rReader, m_DataAppSize, Offset); Offset += ROUND_UP(m_DataAppSize, 0x40);
m_pFooter = CreateWADEntry(_rReader, m_FooterSize, Offset); Offset += ROUND_UP(m_FooterSize, 0x40);
u32 Offset = 0x40;
m_pCertificateChain = CreateWADEntry(_rReader, m_CertificateChainSize, Offset); Offset += ROUND_UP(m_CertificateChainSize, 0x40);
m_pTicket = CreateWADEntry(_rReader, m_TicketSize, Offset); Offset += ROUND_UP(m_TicketSize, 0x40);
m_pTMD = CreateWADEntry(_rReader, m_TMDSize, Offset); Offset += ROUND_UP(m_TMDSize, 0x40);
m_pDataApp = CreateWADEntry(_rReader, m_DataAppSize, Offset); Offset += ROUND_UP(m_DataAppSize, 0x40);
m_pFooter = CreateWADEntry(_rReader, m_FooterSize, Offset); Offset += ROUND_UP(m_FooterSize, 0x40);
return true;
}
bool WiiWAD::IsWiiWAD(const std::string& _rName)
{
DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
if (pReader == NULL)
return false;
DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
if (pReader == NULL)
return false;
CBlobBigEndianReader Reader(*pReader);
bool Result = false;
CBlobBigEndianReader Reader(*pReader);
bool Result = false;
// check for wii wad
if (Reader.Read32(0x00) == 0x20)
{
u32 WADTYpe = Reader.Read32(0x04);
switch(WADTYpe)
{
case 0x49730000:
case 0x69620000:
Result = true;
}
}
// check for wii wad
if (Reader.Read32(0x00) == 0x20)
{
u32 WADTYpe = Reader.Read32(0x04);
switch(WADTYpe)
{
case 0x49730000:
case 0x69620000:
Result = true;
}
}
delete pReader;
delete pReader;
return Result;
return Result;
}

4
Source/Core/DiscIO/Src/WiiWad.h
View File

@ -33,7 +33,7 @@ class WiiWAD
{
public:
WiiWAD(const std::string& _rName);
WiiWAD(const std::string& _rName);
~WiiWAD();
@ -50,7 +50,7 @@ public:
u8* GetDataApp() const { return m_pDataApp; }
u8* GetFooter() const { return m_pFooter; }
static bool IsWiiWAD(const std::string& _rName);
static bool IsWiiWAD(const std::string& _rName);
private: